Skip to content

Commit 922b4e1

Browse files
bugfixes (single station + raw strings for windows)
1 parent 98f34d3 commit 922b4e1

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

metobs_gui/path_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Main folders
1919
# =============================================================================
2020

21-
GUI_dir = str( Path(__file__).resolve().parents[0])
21+
GUI_dir = r'{}'.format(str( Path(__file__).resolve().parents[0]))
2222
REPO_dir = Path(GUI_dir).parent
2323

2424
# =============================================================================

metobs_gui/template_page/template_mapping.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def _init_data_mapping_dialog(self):
189189
self.column_spinner.addItems(self.avail_to_map)
190190

191191
self.browse_format.clear()
192-
self.browse_format.addItems(['Long data', 'Wide data'])
192+
self.browse_format.addItems(['Long data', 'Wide data', 'Single-station'])
193193

194194
self.name_repr.clear()
195195
self.name_repr.addItems(['A single column',
@@ -231,6 +231,11 @@ def _react_data_structure(self):
231231
self.column_spinner.setEnabled(True)
232232
name_repr_options.remove('All columns represent stations')
233233
self.name_repr.addItems(name_repr_options)
234+
235+
elif datafmt == 'Single-station':
236+
self.column_spinner.setEnabled(True)
237+
self.name_repr.addItems([name_repr_options[0],
238+
name_repr_options[2]])
234239

235240
else:
236241
print(f'{datafmt} is not a valid format.')
@@ -353,6 +358,7 @@ def _map_name(self):
353358
self.name_col_spinner.setEnabled(False)
354359
self.name_repr.setEnabled(False)
355360
self.map_name_but.setEnabled(False)
361+
self.single_station_name.setEnabled(False)
356362

357363
#update template status
358364
self._print_info()
@@ -475,6 +481,9 @@ def _read_users_settings_as_template(self):
475481
self.template_dict['data_related']['structure'] = 'wide'
476482
elif datafmt == 'Long data':
477483
self.template_dict['data_related']['structure'] = 'long'
484+
485+
elif datafmt == 'Single-station':
486+
self.template_dict['data_related']['structure'] = 'single_station'
478487
else:
479488
pass
480489

metobs_gui/template_page/template_page.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
# import metobs_gui.template_func as template_func
2323
import metobs_gui.path_handler as path_handler
24-
24+
from metobs_gui.import_data_page.import_data_page import _setup_select_template_spinner
2525
from metobs_gui.errors import Error, Notification
2626

2727

@@ -97,6 +97,10 @@ def _react_to_save_template(MW):
9797
path_handler.copy_file(MW._template_json_file,
9898
trg_path)
9999

100+
#TODO: update the spinner on p
101+
_setup_select_template_spinner(MW)
102+
103+
100104
Notification(f'The template is saved as {filename}')
101105

102106

0 commit comments

Comments
 (0)