From 923407ed57fd633f32168bbd3d4d5b18e50a8ced Mon Sep 17 00:00:00 2001 From: JeanBilheux Date: Tue, 23 Aug 2022 09:17:29 -0400 Subject: [PATCH] added widgets. this refs #7 #8 --- rockit_autoreconstruction_ui/main.py | 13 + rockit_autoreconstruction_ui/ui/mainWindow.ui | 439 +++++++++++------- 2 files changed, 279 insertions(+), 173 deletions(-) diff --git a/rockit_autoreconstruction_ui/main.py b/rockit_autoreconstruction_ui/main.py index 678a921..5875490 100644 --- a/rockit_autoreconstruction_ui/main.py +++ b/rockit_autoreconstruction_ui/main.py @@ -176,6 +176,12 @@ def read_yaml(self): except KeyError: self.ob_use_max_number_of_files = False + # automatic edge cropping + try: + self.automatic_edge_cropping = yaml_data['edge_cropping']['automatic'] + except KeyError: + self.automatic_edge_cropping = True + return Status.ok def initialize_statusbar(self): @@ -259,6 +265,9 @@ def ob_radioButton_changed(self): _ui.setEnabled(state_ob_time) self.ui.maximum_number_of_ob_spinBox.setEnabled(not state_ob_time) + def ring_removal_algorithm_checkBox_changed(self, state): + self.ui.ring_removal_algorithm_comboBox.setEnabled(state) + def ok_clicked(self): ipts_number = self.ui.ipts_spinBox.value() @@ -299,6 +308,7 @@ def ok_clicked(self): ob_minutes = self.ui.ob_minutes_spinBox.value() ob_max_number_of_files = self.ui.maximum_number_of_ob_spinBox.value() ob_use_max_number_of_files = self.ui.maximum_number_of_ob_radioButton.isChecked() + automatic_edge_cropping = self.ui.automatic_edge_cropping_checkBox.isChecked() yaml_data = {'DataPath': {'ipts': ipts_number, @@ -319,6 +329,9 @@ def ok_clicked(self): 'max_number_of_files': ob_max_number_of_files, 'use_max_number_of_files': ob_use_max_number_of_files, }, + 'edge_cropping': { + 'automatic': automatic_edge_cropping, + } } with io.open(self.autoreduce_config_file, 'w') as outfile: yaml.dump(yaml_data, outfile, default_flow_style=False, allow_unicode=True) diff --git a/rockit_autoreconstruction_ui/ui/mainWindow.ui b/rockit_autoreconstruction_ui/ui/mainWindow.ui index 160eaf1..b9af090 100644 --- a/rockit_autoreconstruction_ui/ui/mainWindow.ui +++ b/rockit_autoreconstruction_ui/ui/mainWindow.ui @@ -93,6 +93,208 @@ + + + + Qt::Horizontal + + + + + + + Automatic Open Beam (OB) file selection constraints + + + + + + + + + + + + + Only keep OBs that are within the following constraints + + + + + + + + + maximum number of OBs + + + true + + + + + + + 1 + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + maximum time difference between sample and OB time acquisition + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 10 + + + + + + + days + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 23 + + + 3 + + + + + + + hours + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 59 + + + 0 + + + + + + + minutes + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Horizontal + + + + + + + Automatic edge cropping + + + true + + + + + + + Qt::Horizontal + + + @@ -352,174 +554,48 @@ - - - Automatic Open Beam (OB) file selection constraints - - - - - - - - - - - + + + + + Ring removal algorithm: + + + + + + - Only keep OBs that are within the following constraints + Vo's - - - - - - - - maximum number of OBs - - - true - - - - - - - 1 - - - 10 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - + + - maximum different between sample and OB time acquisition + bm3d - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 10 - - - - - - - days - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 23 - - - 3 - - - - - - - hours - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 59 - - - 0 - - - - - - - minutes - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + @@ -712,7 +788,7 @@ 68 - 186 + 431 6 @@ -728,7 +804,7 @@ 390 - 235 + 479 9 @@ -744,7 +820,7 @@ 575 - 281 + 517 788 @@ -760,7 +836,7 @@ 372 - 356 + 555 483 @@ -776,7 +852,7 @@ 253 - 277 + 517 205 @@ -792,7 +868,7 @@ 50 - 413 + 202 4 @@ -807,8 +883,8 @@ ob_radioButton_changed() - 191 - 478 + 193 + 270 57 @@ -824,7 +900,7 @@ 81 - 498 + 301 97 @@ -832,6 +908,22 @@ + + ring_removal_algorithm_checkBox + clicked(bool) + MainWindow + ring_removal_algorithm_checkBox_changed() + + + 79 + 614 + + + 8 + 659 + + + ok_clicked() @@ -846,5 +938,6 @@ crop_xmax_checkBox_changed() automatic_open_beam_checkBox_changed() ob_radioButton_changed() + ring_removal_algorithm_checkBox_changed()