Changeset 54557b5 in sasview for src/sas

Timestamp:

Apr 6, 2017 11:04:29 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:

2df1bd1

Parents:

3444492

git-author:

Jeff Krzywon <krzywon@…> (04/06/17 11:04:29)

git-committer:

krzywon <krzywon@…> (04/06/17 11:04:29)

Message:

Integer params in manipulations to comply with numpy v1.12. Nearly completed saving 1D plots generated by slicers.

Location:

src/sas

Files:

• sascalc/dataloader/manipulations.py (modified) (2 diffs)
• sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (10 diffs)

src/sas/sascalc/dataloader/manipulations.py

@@ -430 +430 @@
             z_max = max(data2D.q_data)
             z_min = min(data2D.q_data)
-            x_max = data2D.dqx_data[data2D.q_data[z_max]]
-            x_min = data2D.dqx_data[data2D.q_data[z_min]]
-            y_max = data2D.dqy_data[data2D.q_data[z_max]]
-            y_min = data2D.dqy_data[data2D.q_data[z_min]]
+            x_max = data2D.dqx_data[numpy.where(data2D.q_data == z_max)]
+            x_min = data2D.dqx_data[numpy.where(data2D.q_data == z_min)]
+            y_max = data2D.dqy_data[numpy.where(data2D.q_data == z_max)]
+            y_min = data2D.dqy_data[numpy.where(data2D.q_data == z_min)]
             # Find qdx at q = 0
             dq_overlap_x = (x_min * z_max - x_max * z_min) / (z_max - z_min)
@@ -785 +785 @@
             z_max = max(data2D.q_data)
             z_min = min(data2D.q_data)
-            x_max = data2D.dqx_data[data2D.q_data[z_max]]
-            x_min = data2D.dqx_data[data2D.q_data[z_min]]
-            y_max = data2D.dqy_data[data2D.q_data[z_max]]
-            y_min = data2D.dqy_data[data2D.q_data[z_min]]
+            x_max = data2D.dqx_data[numpy.where(data2D.q_data == z_max)]
+            x_min = data2D.dqx_data[numpy.where(data2D.q_data == z_min)]
+            y_max = data2D.dqy_data[numpy.where(data2D.q_data == z_max)]
+            y_min = data2D.dqy_data[numpy.where(data2D.q_data == z_min)]
             # Find qdx at q = 0
             dq_overlap_x = (x_min * z_max - x_max * z_min) / (z_max - z_min)

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

@@ -4 +4 @@
 import wx.lib.newevent
 import time
+from sas.sascalc.dataloader.readers.cansas_reader import Reader
 from sas.sasgui.guiframe.events import EVT_SLICER_PARS
 from sas.sasgui.guiframe.utils import format_number
 from sas.sasgui.guiframe.events import EVT_SLICER
 from sas.sasgui.guiframe.events import SlicerParameterEvent, SlicerEvent
+from Plotter1D import ModelPanel1D
 from Plotter2D import ModelPanel2D
 from sas.sascalc.dataloader.data_info import Data1D, Data2D
-ApplyParams, EVT_APPLY_PARAMS = wx.lib.newevent.NewEvent()
+apply_params, EVT_APPLY_PARAMS = wx.lib.newevent.NewEvent()
+auto_save, EVT_AUTO_SAVE = wx.lib.newevent.NewEvent()
+auto_close, EVT_ON_CLOSE = wx.lib.newevent.NewEvent()
 
 
@@ -33 +37 @@
         self.bck = wx.GridBagSizer(5, 5)
         self.SetSizer(self.bck)
+        self.auto_save = None
+        self.path = None
+        self.type_list = ["SectorInteractor", "AnnulusInteractor",
+                          "BoxInteractorX", "BoxInteractorY"]
+        self.type_select = wx.ComboBox(parent=self, choices=self.type_list)
+        self.append_name = wx.TextCtrl(parent=self, id=wx.NewId(),
+                                       name="Append to file name:")
+        self.data_list = None
         label = "Right-click on 2D plot for slicer options"
         title = wx.StaticText(self, -1, label, style=wx.ALIGN_LEFT)
@@ -40 +52 @@
         self.parent.Bind(EVT_SLICER, self.onEVT_SLICER)
         self.parent.Bind(EVT_SLICER_PARS, self.onParamChange)
-        self.Bind(EVT_APPLY_PARAMS, self.apply_params_list)
+        self.Bind(EVT_APPLY_PARAMS, self.apply_params_list_and_process)
+        self.Bind(EVT_AUTO_SAVE, self.save_files)
+        self.Bind(EVT_ON_CLOSE, self.on_close)
 
     def onEVT_SLICER(self, event):
@@ -109 +123 @@
                     self.bck.Add(ctl, (iy, ix), (1, 1),
                                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+
+            # Change slicer within the window
             ix = 0
             iy += 1
-
-            # Change slicer within the window
-            txt = "Slicer"
+            txt = "Slicer type:"
             text = wx.StaticText(self, -1, txt, style=wx.ALIGN_LEFT)
             self.bck.Add(text, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            type_list = ["SectorInteractor", "AnnulusInteractor",
-                         "BoxInteractorX", "BoxInteractorY"]
-            self.type_select = wx.ComboBox(parent=self, choices=type_list)
             self.Bind(wx.EVT_COMBOBOX, self.onChangeSlicer)
-            index = self.type_select.FindString(self.type)
+            index = self.type_select.FindString(type)
             self.type_select.SetSelection(index)
             self.bck.Add(self.type_select, (iy, 1), (1, 1),
@@ -130 +141 @@
             title = wx.StaticText(self, -1, title_text, style=wx.ALIGN_LEFT)
             iy += 1
-            ln = wx.StaticLine(self, -1, style=wx.LI_VERTICAL)
-            ln.SetSize((60,60))
-            self.bck.Add(ln, (iy, ix), (1, 2),
+            line = wx.StaticLine(self, -1, style=wx.LI_VERTICAL)
+            line.SetSize((60, 60))
+            self.bck.Add(line, (iy, ix), (1, 2),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
             iy += 1
             self.bck.Add(title, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            iy += 1
+
             # Create a list box with all of the 2D plots
+            iy += 1
             self.process_list()
             self.bck.Add(self.data_list, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            iy += 1
+
+            # Checkbox for autosaving data
+            iy += 1
+
+            self.auto_save = wx.CheckBox(parent=self, id=wx.NewId(),
+                                         label="Auto save generated 1D:")
+            self.Bind(wx.EVT_CHECKBOX, self.on_auto_save_checked)
+            self.bck.Add(self.auto_save, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            iy += 1
+            # File browser
+            save_to = "Save files to:"
+            save = wx.StaticText(self, -1, save_to, style=wx.ALIGN_LEFT)
+            self.path = wx.DirPickerCtrl(self, id=wx.NewId(), path="",
+                                         message=save_to)
+            self.path.Enable(False)
+            self.bck.Add(save, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            self.bck.Add(self.path, (iy, 1), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            # Append to file
+            iy += 1
+            default_value = "_{0}".format(self.type)
+            for key in params:
+                default_value += "_%d.2" % params[key]
+            append_text = "Append to file name:"
+            append = wx.StaticText(self, -1, append_text, style=wx.ALIGN_LEFT)
+            self.append_name.SetValue(default_value)
+            self.append_name.Enable(False)
+            self.bck.Add(append, (iy, ix), (1, 1),
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+            self.bck.Add(self.append_name, (iy, 1), (1, 1),
+                         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)
+
             # Button to start batch slicing
+            iy += 1
             button_label = "Apply Slicer to Selected Plots"
             self.batch_slicer_button = wx.Button(parent=self,
                                                  label=button_label)
-            self.Bind(wx.EVT_BUTTON, self.onBatchSlice)
+            self.Bind(wx.EVT_BUTTON, self.on_batch_slicer)
             self.bck.Add(self.batch_slicer_button, (iy, ix), (1, 1),
-                             wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            # TODO: Check box for saving file
-            # TODO: append to file information and file type
-            # TODO: Send to fitting options
-
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
             iy += 1
             self.bck.Add((5, 5), (iy, ix), (1, 1),
@@ -196 +251 @@
             wx.PostEvent(self.parent, event)
 
-    def onBatchSlice(self, evt=None):
+    def on_batch_slicer(self, evt=None):
         """
         Method invoked with batch slicing button is pressed
@@ -205 +260 @@
         params = self.parent.slicer.get_params()
         type = self.type_select.GetStringSelection()
+        save = self.auto_save.IsChecked()
+        append = self.append_name.GetValue()
+        path = self.path.GetPath()
 
         # Find desired 2D data panels
@@ -217 +275 @@
         # Post an event to apply appropriate slicer params to each slicer
         # Event needed due to how apply_slicer_to_plot works
-        event = ApplyParams(params=params, plot_list=apply_to_list)
+        event = apply_params(params=params, plot_list=apply_to_list,
+                             auto_save=save, append=append,
+                             path=path)
         wx.PostEvent(self, event)
-        # TODO: save file (if desired)
-        # TODO: send to fitting (if desired)
+        event = auto_close()
+        wx.PostEvent(self, event)
 
     def onChangeSlicer(self, evt):
@@ -264 +324 @@
                                          choices=self.loaded_data,
                                          name="Apply Slicer to 2D Plots:")
-        # Check all items bty default
+        # Check all items by default
         for item in range(len(self.data_list.Items)):
             self.data_list.Check(item)
-        self.data_list.Bind(wx.EVT_CHECKLISTBOX, self.onCheckBoxList)
-
-    def onCheckBoxList(self, e):
+        self.data_list.Bind(wx.EVT_CHECKLISTBOX, self.on_check_box_list)
+
+    def on_check_box_list(self, evt=None):
         """
         Prevent a checkbox item from being unchecked
         :param e: Event triggered when a checkbox list item is checked
         """
-        index = e.GetSelection()
+        if evt is None:
+            return
+        index = evt.GetSelection()
         if index == self.checkme:
             self.data_list.Check(index)
 
-    def apply_params_list(self, evt=None):
+    def apply_params_list_and_process(self, evt=None):
         """
         Event based parameter setting.
@@ -288 +350 @@
             item.slicer.set_params(evt.params)
             item.slicer.base.update()
-        # Close the slicer window
+        # 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.plot_list,
+                              path=evt.path)
+            wx.PostEvent(self, event)
+
+    def save_files(self, evt=None):
+        """
+        Automatically save the sliced data to file.
+        :param evt: Event that triggered the call to the method
+        """
+        if evt is None:
+            return
+        writer = Reader()
+        main_window = self.parent.parent
+        data_list = []
+        append = evt.append_to_name
+        for key, plot in main_window.plot_panels.iteritems():
+            if not hasattr(plot, "data2D"):
+                for item in plot.plots:
+                    data_list.append(item)
+        for item in data_list:
+            data1d = item.plots
+            base = item.name.split(".")[0]
+            save_to = evt.path + base + ".xml"
+            writer.write(path, data1d)
+
+        # TODO: determine data sets
+        # TODO: generate file names
+        # TODO: link one to the other
+        # TODO: save all files
+
+    def on_auto_save_checked(self, evt=None):
+        """
+        Enable/Disable auto append when checkbox is checked
+        :param evt: Event
+        """
+        self.append_name.Enable(self.auto_save.IsChecked())
+        self.path.Enable(self.auto_save.IsChecked())
+    
+    def on_close(self, evt=None):
+        """
+        Auto close the panel
+        """
         self.Destroy()