Changeset 3e5648b in sasview for src

Timestamp:

Apr 10, 2017 11:00:32 AM (7 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:

6e6dd4c

Parents:

6267876

git-author:

Jeff Krzywon <krzywon@…> (04/10/17 11:00:32)

git-committer:

krzywon <krzywon@…> (04/10/17 11:00:32)

Message:

Resolve merge conflicts and 2 small fixes to slicer panel. #467

Location:

src/sas

Files:

• sascalc/dataloader/manipulations.py (modified) (2 diffs)
• sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (9 diffs)
• sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (3 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/Plotter2D.py

@@ -361 +361 @@
                 if self.slicer.__class__.__name__ != "BoxSum":
                     wx_id = ids.next()
-                    slicerpop.Append(wx_id, '&Edit Slicer Parameters')
+                    name = '&Edit Slicer Parameters and Batch Slicing'
+                    slicerpop.Append(wx_id, name)
                     wx.EVT_MENU(self, wx_id, self._onEditSlicer)
             slicerpop.AppendSeparator()
@@ -532 +533 @@
 
         """
-        ## Clear current slicer
+        # Clear current slicer
         if self.slicer is not None:
             self.slicer.clear()
-        ## Create a new slicer
+        # Create a new slicer
         self.slicer_z += 1
         self.slicer = slicer(self, self.subplot, zorder=self.slicer_z)
         self.subplot.set_ylim(self.data2D.ymin, self.data2D.ymax)
         self.subplot.set_xlim(self.data2D.xmin, self.data2D.xmax)
-        ## Draw slicer
+        # Draw slicer
         self.update()
         self.slicer.update()
@@ -572 +573 @@
         npt = math.floor(npt)
         from sas.sascalc.dataloader.manipulations import CircularAverage
-        ## compute the maximum radius of data2D
+        # compute the maximum radius of data2D
         self.qmax = max(math.fabs(self.data2D.xmax),
                         math.fabs(self.data2D.xmin))
@@ -578 +579 @@
                         math.fabs(self.data2D.ymin))
         self.radius = math.sqrt(math.pow(self.qmax, 2) + math.pow(self.ymax, 2))
-        ##Compute beam width
+        # Compute beam width
         bin_width = (self.qmax + self.qmax) / npt
-        ## Create data1D circular average of data2D
+        # Create data1D circular average of data2D
         Circle = CircularAverage(r_min=0, r_max=self.radius,
                                  bin_width=bin_width)
@@ -599 +600 @@
         new_plot.name = "Circ avg " + self.data2D.name
         new_plot.source = self.data2D.source
-        #new_plot.info = self.data2D.info
+        # new_plot.info = self.data2D.info
         new_plot.interactive = True
         new_plot.detector = self.data2D.detector
 
-        ## If the data file does not tell us what the axes are, just assume...
+        # If the data file does not tell us what the axes are, just assume...
         new_plot.xaxis("\\rm{Q}", "A^{-1}")
         if hasattr(self.data2D, "scale") and \
@@ -615 +616 @@
         new_plot.id = "Circ avg " + self.data2D.name
         new_plot.is_data = True
-        self.parent.update_theory(data_id=self.data2D.id, \
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data2D.id, theory=new_plot)
         wx.PostEvent(self.parent,
                      NewPlotEvent(plot=new_plot, title=new_plot.name))
@@ -630 +630 @@
         """
         if self.slicer is not None:
-            from SlicerParameters import SlicerParameterPanel
+            from parameters_panel_slicer import SlicerParameterPanel
             dialog = SlicerParameterPanel(self, -1, "Slicer Parameters")
             dialog.set_slicer(self.slicer.__class__.__name__,
@@ -668 +668 @@
         params = self.slicer.get_params()
         ## Create a new panel to display results of summation of Data2D
-        from slicerpanel import SlicerPanel
+        from parameters_panel_boxsum import SlicerPanel
         win = MDIFrame(self.parent, None, 'None', (100, 200))
         new_panel = SlicerPanel(parent=win, id=-1,
@@ -758 +758 @@
         if default_name.count('.') > 0:
             default_name = default_name.split('.')[0]
-        #default_name += "_out"
         if self.parent is not None:
             self.parent.show_data2d(data, default_name)
 
     def modifyGraphAppearance(self, e):
-        self.graphApp = graphAppearance(self, 'Modify graph appearance', legend=False)
+        self.graphApp = graphAppearance(self, 'Modify graph appearance',
+                                        legend=False)
         self.graphApp.setDefaults(self.grid_on, self.legend_on,
                                   self.xaxis_label, self.yaxis_label,

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

@@ -14 +14 @@
 
 FIT_OPTIONS = ["No fitting", "Fitting", "Batch Fitting"]
+CONVERT_KEYS = ["SectorInteractor", "AnnulusInteractor", "BoxInteractorX",
+                "BoxInteractorY"]
 CONVERT_DICT = {"SectorInteractor": "SectorQ",
                 "AnnulusInteractor": "AnnulusPhi",
@@ -138 +140 @@
             self.bck.Add(text, (iy, ix), (1, 1),
                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-            self.type_list = CONVERT_DICT.keys()
+            self.type_list = CONVERT_KEYS
             self.type_select = wx.ComboBox(parent=self, choices=self.type_list)
             self.type_select.Bind(wx.EVT_COMBOBOX, self.on_change_slicer)
@@ -331 +333 @@
         Populate the check list from the currently plotted 2D data
         """
+        # Reinitialize loaded data list on redraw
+        self.loaded_data = []
         # Iterate over the loaded plots and find all 2D panels
         for key, value in self.main_window.plot_panels.iteritems():