Skip to content

Commit e5dce0f

Browse files
committed
WeatherDataGapfiller: remove data merger functionality
1 parent f9ecd93 commit e5dce0f

2 files changed

Lines changed: 1 addition & 350 deletions

File tree

cdprep/gapfill_data/gapfill_weather_gui.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
from cdprep.config.main import CONF
2626
from cdprep.config.icons import get_icon, get_iconsize
2727
from cdprep.gapfill_data.gapfill_weather_algorithm import DataGapfiller
28-
from cdprep.gapfill_data.merge_weather_data import WXDataMergerWidget
2928
from cdprep.utils.ospath import delete_file
3029
from cdprep.utils.qthelpers import datetime_from_qdatedit
3130

@@ -42,7 +41,6 @@ def __init__(self, parent=None):
4241
# Correlation calculation won't be triggered by events when
4342
# CORRFLAG is 'off'
4443
self.CORRFLAG = 'on'
45-
self.wxdata_merger = WXDataMergerWidget()
4644

4745
self.__initUI__()
4846

@@ -95,13 +93,6 @@ def __initUI__(self):
9593
self.btn_refresh_staList.setAutoRaise(True)
9694
self.btn_refresh_staList.clicked.connect(self.btn_refresh_isclicked)
9795

98-
btn_merge_data = QToolButton()
99-
btn_merge_data.setIcon(get_icon('merge_data'))
100-
btn_merge_data.setToolTip(
101-
'Tool for merging two ore more datasets together.')
102-
btn_merge_data.setAutoRaise(True)
103-
btn_merge_data.clicked.connect(self.wxdata_merger.show)
104-
10596
self.btn_delete_data = QToolButton()
10697
self.btn_delete_data.setIcon(get_icon('delete_data'))
10798
self.btn_delete_data.setEnabled(False)
@@ -119,7 +110,7 @@ def __initUI__(self):
119110
target_station_layout.setContentsMargins(0, 0, 0, 0)
120111

121112
widgets = [self.target_station, self.btn_refresh_staList,
122-
btn_merge_data, self.btn_delete_data]
113+
self.btn_delete_data]
123114
target_station_layout.addWidget(self.target_station, 1, 0)
124115
for col, widget in enumerate(widgets):
125116
target_station_layout.addWidget(widget, 1, col)
@@ -296,7 +287,6 @@ def set_workdir(self, dirname):
296287
"""
297288
self.__workdir = dirname
298289
self.gapfill_worker.inputDir = dirname
299-
self.wxdata_merger.set_workdir(os.path.join(dirname, 'Meteo', 'Input'))
300290
self.load_data_dir_content()
301291

302292
def delete_current_dataset(self):

cdprep/gapfill_data/merge_weather_data.py

Lines changed: 0 additions & 339 deletions
This file was deleted.

0 commit comments

Comments
 (0)