From 8763ae8b0081f7c1239d516559127f2d20dcccda Mon Sep 17 00:00:00 2001 From: JeanBilheux Date: Wed, 24 May 2023 10:19:27 -0400 Subject: [PATCH] changed label of monitor table. this refs #58 --- src/hyperctui/__init__.py | 1 + .../autonomous_reconstruction/event_handler.py | 10 +++++----- .../autonomous_reconstruction/select_tof_regions.py | 2 -- src/hyperctui/initialization/gui_initialization.py | 3 ++- src/hyperctui/ui/main_application.ui | 6 +++--- src/hyperctui/ui/pre_processing_monitor.ui | 4 ++-- testing_environment.yml | 2 ++ 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/hyperctui/__init__.py b/src/hyperctui/__init__.py index 8cd0f97..1c0d21d 100644 --- a/src/hyperctui/__init__.py +++ b/src/hyperctui/__init__.py @@ -43,6 +43,7 @@ }, } + # main window dimensions class UiSizeSmall: width = 800 diff --git a/src/hyperctui/autonomous_reconstruction/event_handler.py b/src/hyperctui/autonomous_reconstruction/event_handler.py index 9a2b7f5..fbbf1d7 100644 --- a/src/hyperctui/autonomous_reconstruction/event_handler.py +++ b/src/hyperctui/autonomous_reconstruction/event_handler.py @@ -126,6 +126,8 @@ def init_autonomous_table(self): # output_table = nbr_angles = self.parent.ui.evaluation_frequency_spinBox.value() list_golden_ratio_angles_collected = self.parent.golden_ratio_angles[0:nbr_angles] + formatted1_list_golden_ratio_angles_collected = [f"{_value:.2f}" for _value in list_golden_ratio_angles_collected] + formatted2_list_golden_ratio = [_value.replace(".", "_") for _value in formatted1_list_golden_ratio_angles_collected] tof_regions = self.parent.tof_regions list_tof_region_collected = [] @@ -135,10 +137,8 @@ def init_autonomous_table(self): _to = str(tof_regions[_index][EvaluationRegionKeys.to_value]).replace(".", "_") list_tof_region_collected.append(f"from_{_from}Ang_to_{_to}Ang") - - - - + print(f"{formatted2_list_golden_ratio =}") + print(f"{list_tof_region_collected =}") def refresh_table_clicked(self): - pass \ No newline at end of file + pass diff --git a/src/hyperctui/autonomous_reconstruction/select_tof_regions.py b/src/hyperctui/autonomous_reconstruction/select_tof_regions.py index 8e5c045..59e0e80 100644 --- a/src/hyperctui/autonomous_reconstruction/select_tof_regions.py +++ b/src/hyperctui/autonomous_reconstruction/select_tof_regions.py @@ -395,7 +395,6 @@ def check_state_ok_button(self): else: self.ui.pushButton.setEnabled(False) - def accept(self): self.ok_clicked = True self.save_table() @@ -416,4 +415,3 @@ def sort(value1: float, value2: float): minimum_value = np.min([value1, value2]) maximum_value = np.max([value1, value2]) return minimum_value, maximum_value - diff --git a/src/hyperctui/initialization/gui_initialization.py b/src/hyperctui/initialization/gui_initialization.py index b27d13a..774b444 100644 --- a/src/hyperctui/initialization/gui_initialization.py +++ b/src/hyperctui/initialization/gui_initialization.py @@ -4,6 +4,7 @@ from qtpy.QtGui import QPixmap import numpy as np import os +import pandas as pd from hyperctui.utilities.config_handler import ConfigHandler from hyperctui.utilities.table import TableHandler @@ -28,7 +29,7 @@ def all(self): self.autonomous_reconstruction_data() def autonomous_reconstruction_data(self): - table = pd.read_csv(golden_angle_file) + table = pd.read_csv(golden_ratio_file) self.parent.golden_ratio_angles = list(table['angles']) def tabs(self): diff --git a/src/hyperctui/ui/main_application.ui b/src/hyperctui/ui/main_application.ui index b4969f1..90ec512 100644 --- a/src/hyperctui/ui/main_application.ui +++ b/src/hyperctui/ui/main_application.ui @@ -1333,7 +1333,7 @@ - File name + Folder name @@ -1434,8 +1434,8 @@ 0 0 - 100 - 30 + 98 + 28 diff --git a/src/hyperctui/ui/pre_processing_monitor.ui b/src/hyperctui/ui/pre_processing_monitor.ui index 480146b..b557a63 100644 --- a/src/hyperctui/ui/pre_processing_monitor.ui +++ b/src/hyperctui/ui/pre_processing_monitor.ui @@ -52,7 +52,7 @@ - File name + Folder name @@ -138,7 +138,7 @@ - File name + Folder name diff --git a/testing_environment.yml b/testing_environment.yml index 343084d..a67848e 100644 --- a/testing_environment.yml +++ b/testing_environment.yml @@ -15,6 +15,8 @@ dependencies: - dxchange=0.1.* - h5py=3.3.0 - tomopy + - pandas - pip: - pyqtgraph - NeuNorm + - neutronbraggedge