Changeset 7a80072 in sasview for src

Timestamp:

Apr 8, 2017 8:54:39 AM (8 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ac0578c

Parents:

377ca62f

git-author:

Jeff Krzywon <krzywon@…> (04/08/17 08:54:39)

git-committer:

krzywon <krzywon@…> (04/08/17 08:54:39)

Message:

Fitting partially works. Problem creating new pages.

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (10 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

@@ -12 +12 @@
 auto_save, EVT_AUTO_SAVE = wx.lib.newevent.NewEvent()
 
+FIT_OPTIONS = ["No fitting", "Fitting"]
+CONVERT_DICT = {"SectorInteractor": "SectorQ",
+                "AnnulusInteractor": "AnnulusPhi",
+                "BoxInteractorX": "SlabX",
+                "BoxInteractorY": "SlabY"}
 
 class SlicerParameterPanel(wx.Dialog):
@@ -36 +41 @@
         self.auto_save = None
         self.path = None
+        self.fitting_options = None
         self.type_list = []
         self.type_select = None
@@ -128 +134 @@
                               "BoxInteractorX", "BoxInteractorY"]
             self.type_select = wx.ComboBox(parent=self, choices=self.type_list)
-            self.Bind(wx.EVT_COMBOBOX, self.onChangeSlicer)
+            self.type_select.Bind(wx.EVT_COMBOBOX, self.onChangeSlicer)
             index = self.type_select.FindString(type)
             self.type_select.SetSelection(index)
@@ -187 +193 @@
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
 
-            # TODO: Fix fitting options combobox/radiobox
             # Combobox for selecting fitting options
-            # iy += 1
-            # self.fitting_radio = wx.RadioBox(parent=self, id=wx.NewId(),
-            #                                  size=(4,1))
-            # self.fitting_radio.SetString(0, "No fitting")
-            # self.fitting_radio.SetString(1, "Batch Fitting")
-            # self.fitting_radio.SetString(2, "Fitting")
-            # self.fitting_radio.SetString(3, "Simultaneous and Constrained Fit")
-            # self.fitting_radio.SetValue(0)
-            # self.bck.Add(self.fitting_radio, (iy, ix), (1, 1),
-            #              wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            iy += 1
+            fit_text = "Fitting Options:"
+            fit_text_item = wx.StaticText(self, -1, fit_text, style=wx.ALIGN_LEFT)
+            self.bck.Add(fit_text_item, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            self.fitting_options = wx.ComboBox(parent=self, choices=FIT_OPTIONS)
+            self.fitting_options.SetSelection(0)
+            self.bck.Add(self.fitting_options, (iy, 1), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            self.fitting_options.Enable(False)
+            self.fitting_options.Bind(wx.EVT_COMBOBOX, None)
 
             # Button to start batch slicing
@@ -262 +268 @@
         append = self.append_name.GetValue()
         path = self.path.GetPath()
+        fit = self.fitting_options.GetValue()
 
         # Find desired 2D data panels
@@ -274 +281 @@
         # Post an event to apply appropriate slicer params to each slicer
         event_params = apply_params(params=params, apply_to_list=apply_to_list,
-                             auto_save=save, append=append,
+                             auto_save=save, append=append, fit=fit,
                              path=path, type=type)
         wx.PostEvent(self, event_params)
@@ -354 +361 @@
         # Post an event to save each data set to file
         if evt.auto_save:
-            event = auto_save(append_to_name=evt.append,
-                              file_list=evt.apply_to_list,
-                              path=evt.path, type=evt.type)
+            event = auto_save(append_to_name=evt.append, path=evt.path,
+                              type=evt.type, file_list=evt.apply_to_list,
+                              fit=evt.fit)
             wx.PostEvent(self, event)
 
@@ -364 +371 @@
         :param evt: Event that triggered the call to the method
         """
+
+        # Send the event to the end of the wx event queue
         if self.iter == 0:
-            # Forces the event to be processed after dynamically generated evts
             clone = evt.Clone()
             wx.PostEvent(self, clone)
@@ -379 +387 @@
         append = evt.append_to_name
         names = []
-        file_list = []
-        convert_dict = {"SectorInteractor": "SectorQ",
-                        "AnnulusInteractor": "AnnulusPhi",
-                        "BoxInteractorX": "SlabX",
-                        "BoxInteractorY": "SlabY"}
+        f_name_list = []
+        f_path_list = []
+
         # Get list of 2D data names for saving
         for f_name in evt.file_list:
             names.append(f_name.data2D.label)
+
         # Find the correct plots to save
         for key, plot in main_window.plot_panels.iteritems():
             if not hasattr(plot, "data2D"):
                 for item in plot.plots:
-                    base = item.replace(convert_dict[evt.type], "")
+                    base = item.replace(CONVERT_DICT[evt.type], "")
                     if base in names:
                         data_dic[item] = plot.plots[item]
+
         # Save files as XML
         for item, data1d in data_dic.iteritems():
             base = ('.').join(item.split('.')[:-1])
-            save_to = evt.path + "\\" + base + append + ".xml"
+            file_name = base + append + ".xml"
+            save_to = evt.path + "\\" + file_name
             writer.write(save_to, data1d)
-            file_list.append(save_to)
+            f_path_list.append(save_to)
+            f_name_list.append(file_name)
+
         # Load files into GUI
-        for item in file_list:
-            self.parent.parent.load_data(item)
+        for item in f_path_list:
+            main_window.load_data(item)
+
+        # Send to fitting
+        self.send_to_fitting(evt.fit, f_name_list)
+
+    def send_to_fitting(self, fit=FIT_OPTIONS[0], file_list=None):
+        """
+        Send a list of data to the fitting perspective
+        :param fit: fit type desired 
+        :param file_list: list of loaded file names to send to fit
+        """
+        if fit != FIT_OPTIONS[0] and file_list is not None:
+            # Method variable definitions
+            main_window = self.parent.parent
+            datapanel = main_window._data_panel
+            # Set perspective to fitting
+            int = datapanel.perspective_cbox.FindString("Fitting")
+            datapanel.perspective_cbox.SetSelection(int)
+            datapanel._on_perspective_selection(None)
+            # Unselect all loaded data
+            datapanel.selection_cbox.SetValue('Unselect all Data')
+            datapanel._on_selection_type(None)
+            # Click each sliced data file
+            for f_name in file_list:
+                num = len(f_name)
+                data_list = datapanel.list_cb_data
+                for key in data_list:
+                    loaded_key = (key[:num]) if len(key) > num else key
+                    if loaded_key == f_name:
+                        selection = key
+                        data_ctrl = data_list[selection][0]
+                        self.check_item_and_children(data_ctrl=data_ctrl,
+                                                     check_value=True)
+            # TODO: Batch fitting
+            # # Switch to batch mode if selected
+            # if fit == FIT_OPTIONS[2]:
+            #     datapanel.rb_single_mode.SetValue(False)
+            #     datapanel.rb_batch_mode.SetValue(True)
+            #     evt = wx.PyCommandEvent(wx.EVT_RADIOBUTTON.typeId,
+            #                             datapanel.rb_batch_mode.GetId())
+            #     wx.PostEvent(datapanel, evt)
+            # else:
+            #     datapanel.rb_single_mode.SetValue(True)
+            #     datapanel.rb_batch_mode.SetValue(False)
+            #     evt = wx.PyCommandEvent(wx.EVT_RADIOBUTTON.typeId,
+            #                             datapanel.rb_single_mode.GetId())
+            #     wx.PostEvent(datapanel, evt)
+
+            # Post button click event to send data to fitting
+            evt = wx.PyCommandEvent(wx.EVT_BUTTON.typeId,
+                                    datapanel.bt_import.GetId())
+            wx.PostEvent(datapanel, evt)
+
+            # TODO: Simultaneous/Constrained fitting
+            # # Create event to open simfitpage if selected
+            # if fit == FIT_OPTIONS[3]:
+            #     fit_pers = main_window._current_perspective
+            #     evt = wx.PyCommandEvent(wx.EVT_MENU.typeId,
+            #                         fit_pers.id_simfit)
+            #     wx.PostEvent(datapanel, evt)
 
     def on_auto_save_checked(self, evt=None):
@@ -411 +481 @@
         self.append_name.Enable(self.auto_save.IsChecked())
         self.path.Enable(self.auto_save.IsChecked())
+        self.fitting_options.Enable(self.auto_save.IsChecked())
+
+    def check_item_and_children(self, data_ctrl, check_value=True):
+        self.parent.parent._data_panel.tree_ctrl.CheckItem(data_ctrl,
+                                                           check_value)
+        if data_ctrl.HasChildren():
+            if check_value and not data_ctrl.IsExpanded():
+                # Only select children if control is expanded
+                # Always deselect children, regardless (see ticket #259)
+                return
+            for child_ctrl in data_ctrl.GetChildren():
+                self.tree_ctrl.CheckItem(child_ctrl, check_value)