started to bring back fitting tab in the config. this refs #170

environment.yml

@@ -9,7 +9,7 @@ dependencies:
   - freetype
   - libpng
   - matplotlib
-  - mkl
+#  - mkl
   - numpy
   - openssl
   - pyparsing
@@ -24,12 +24,12 @@ dependencies:
   - tk
   - wheel
   - zlib
-  - pyqtgraph=0.12.1
-  - lmfit
+  - pyqtgraph
   - qtpy
   - versioneer
   - astropy
   - pip:
       - neutronbraggedge
       - changepy
       - NeuNorm
+      - lmfit

ibeatles/fitting/fitting_handler.py

@@ -12,6 +12,7 @@
 from ibeatles.fitting import selected_color, lock_color
 from ibeatles.fitting.selected_bin_handler import SelectedBinsHandler
 from ibeatles.fitting import FittingTabSelected, KropffTabSelected
+
 from ibeatles.session import SessionSubKeys, SessionKeys
 
 
@@ -135,7 +136,7 @@ def display_locked_active_bins(self):
         self.parent.check_status_widgets()
 
     def initialize_parameters_from_session(self):
-        self.initialize_marche_dollase_parameters_from_session()
+        # self.initialize_marche_dollase_parameters_from_session()
         self.initialize_kropff_parameters_from_session()
 
     def initialize_kropff_parameters_from_session(self):
@@ -158,7 +159,7 @@ def initialize_kropff_parameters_from_session(self):
         self.grand_parent.kropff_table_dictionary = table_dictionary
 
     def initialize_marche_dollase_parameters_from_session(self):
-        session_table_dictionary = self.grand_parent.session_dict["fitting"]['march dollase']["table dictionary"]
+        session_table_dictionary = self.grand_parent.session_dict[SessionKeys.fitting][FittingTabSelected.march_dollase]["table dictionary"]
         table_dictionary = self.grand_parent.march_table_dictionary
 
         for _row in session_table_dictionary.keys():
@@ -190,7 +191,7 @@ def initialize_marche_dollase_parameters_from_session(self):
         self.parent.ui.slider.setValue(transparency)
 
         self.grand_parent.display_active_row_flag = \
-            self.grand_parent.session_dict['fitting']['march dollase']['plot active row flag']
+            self.grand_parent.session_dict[SessionKeys.fitting][FittingTabSelected.march_dollase]['plot active row flag']
         self.parent.ui.active_bins_button.setChecked(self.grand_parent.display_active_row_flag)
         self.parent.ui.locked_bins_button.setChecked(not self.grand_parent.display_active_row_flag)
 

ibeatles/fitting/fitting_launcher.py

@@ -199,7 +199,7 @@ def __init__(self, parent=None):
         o_init.run_all()
 
         self.check_status_widgets()
-        self.parent.data_metadata[DataType.fitting]['ui_accessed'] = True
+        self.parent.session_dict[DataType.fitting]['ui_accessed'] = True
 
         x_axis = self.parent.normalized_lambda_bragg_edge_x_axis
         self.bragg_edge_data['x_axis'] = x_axis

ibeatles/iBeatles.py

@@ -25,7 +25,7 @@
 
 from ibeatles.utilities.get import Get
 from ibeatles.session.load_previous_session_launcher import LoadPreviousSessionLauncher
-from ibeatles.session.session_handler import SessionHandler
+from ibeatles.session.session_handler import SessionHandler, SessionKeys, SessionSubKeys
 
 from ibeatles.step2.initialization import Initialization as Step2Initialization
 from ibeatles.step2.gui_handler import Step2GuiHandler
@@ -1041,6 +1041,7 @@ def normalized_hkl_scrollbar_changed(self, value):
     def closeEvent(self, event):
         o_session = SessionHandler(parent=self)
         o_session.save_from_ui()
+        print(f"#C: {self.session_dict[DataType.fitting][SessionSubKeys.ui_accessed] =}")
         o_session.automatic_save()
         self.check_log_file_size()
         logging.info(" #### Leaving iBeatles ####")

ibeatles/session/load_fitting_tab.py

@@ -12,8 +12,6 @@ def table_dictionary(self):
         self.parent.session_dict[SessionKeys.fitting] = self.session_dict[SessionKeys.fitting]
         self.parent.table_loaded_from_session = True
 
-        self.parent.data_metadata[DataType.bin]['ui_accessed'] = \
-            self.parent.session_dict[SessionKeys.fitting][SessionSubKeys.ui_accessed]
         self.parent.image_view_settings[DataType.fitting]['state'] = \
             self.parent.session_dict[DataType.fitting][SessionSubKeys.image_view_state]
         self.parent.image_view_settings[DataType.fitting]['histogram'] = \

ibeatles/session/load_previous_session_launcher.py

@@ -29,7 +29,6 @@ def yes_clicked(self):
         o_session.load_from_file(config_file_name=full_config_file_name)
 
         if not o_session.load_successful:
-            print("no success!")
             self.no_clicked()
             return
 

ibeatles/session/save_fitting_tab.py

@@ -15,7 +15,7 @@ class SaveFittingTab(SaveTab):
 
     def fitting(self):
 
-        if not self.parent.data_metadata[DataType.fitting][SessionSubKeys.ui_accessed]:
+        if not self.parent.session_dict[DataType.fitting][SessionSubKeys.ui_accessed]:
             return
 
         self.general_infos()
@@ -50,7 +50,7 @@ def general_infos(self):
         self.session_dict[DataType.fitting][FittingKeys.transparency] = self.parent.fitting_transparency_slider_value
         self.session_dict[DataType.fitting][FittingKeys.image_view_state] = state
         self.session_dict[DataType.fitting][FittingKeys.image_view_histogram] = histogram
-        self.session_dict[DataType.fitting][FittingKeys.ui_accessed] = self.parent.data_metadata[DataType.bin]['ui_accessed']
+        self.session_dict[DataType.fitting][FittingKeys.ui_accessed] = self.parent.session_dict[DataType.fitting][SessionSubKeys.ui_accessed]
         self.session_dict[DataType.fitting][FittingKeys.ui] = self.parent.session_dict[DataType.fitting]['ui']
 
     def march_dollase(self):
@@ -97,7 +97,7 @@ def march_dollase(self):
         if x_axis:
             logging.info(f" len(x_axis): {len(x_axis)}")
         else:
-            logging.info(f" xaxis is empty!")
+            logging.info(f" x_axis is empty!")
 
         logging.info(f" lambda range index: {self.session_dict[SessionKeys.fitting][SessionSubKeys.lambda_range_index]}")
 

ibeatles/session/session_handler.py

@@ -187,9 +187,13 @@ def __init__(self, parent=None):
         self.parent = parent
 
     def save_from_ui(self):
+
+        self.session_dict[DataType.fitting][SessionSubKeys.ui_accessed] = self.parent.session_dict[DataType.fitting][SessionSubKeys.ui_accessed]
         self.session_dict[SessionSubKeys.config_version] = self.parent.config[SessionSubKeys.config_version]
         self.session_dict[SessionSubKeys.log_buffer_size] = self.parent.session_dict[SessionSubKeys.log_buffer_size]
 
+        self.session_dict = self.parent.session_dict
+
         # Load data tab
         o_save_load_data_tab = SaveLoadDataTab(parent=self.parent,
                                                session_dict=self.session_dict)