Changeset 098f3d2 in sasview

Timestamp:

Jul 6, 2015 1:11:55 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d3d67f0

Parents:

9989a6a

Message:

Remove print preview menu items. Fix 2D plotting from fit perspective.

Location:

src/sas

Files:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• guiframe/local_perspectives/plotting/Plotter2D.py (modified) (1 diff)
• guiframe/local_perspectives/plotting/SimplePlot.py (modified) (2 diffs)
• guiframe/report_dialog.py (modified) (1 diff)
• perspectives/fitting/fitpage.py (modified) (3 diffs)
• perspectives/fitting/fitting.py (modified) (3 diffs)
• plottools/PlotPanel.py (modified) (4 diffs)

src/sas/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -564 +564 @@
             self._slicerpop.Append(wx_id, '&Print Image', 'Print image ')
             wx.EVT_MENU(self, wx_id, self.onPrint)
-            wx_id = wx.NewId()
-            self._slicerpop.Append(wx_id, '&Print Preview', 'Print preview')
-            wx.EVT_MENU(self, wx_id, self.onPrinterPreview)
 
             wx_id = wx.NewId()

src/sas/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -300 +300 @@
 
         wx_id = wx.NewId()
-        slicerpop.Append(wx_id, '&Print Preview', 'Print preview')
-        wx.EVT_MENU(self, wx_id, self.onPrinterPreview)
-
-        wx_id = wx.NewId()
         slicerpop.Append(wx_id, '&Copy to Clipboard', 'Copy to the clipboard')
         wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu)

src/sas/guiframe/local_perspectives/plotting/SimplePlot.py

@@ -58 +58 @@
         slicerpop.Append(wx_id, '&Print Image', 'Print image')
         wx.EVT_MENU(self, wx_id, self.onPrint)
-
-        wx_id = wx.NewId()
-        slicerpop.Append(wx_id, '&Print Preview', 'Print preview')
-        wx.EVT_MENU(self, wx_id, self.onPrinterPreview)
 
         wx_id = wx.NewId()
@@ -234 +230 @@
         wx.EVT_MENU(self, id, self.on_print_image)
 
-        id = wx.NewId()
-        item = wx.MenuItem(menu, id, "&Print Preview")
-        item.SetBitmap(preview_bmp)
-        menu.AppendItem(item)
-        wx.EVT_MENU(self, id, self.on_print_preview)
-
         menu.AppendSeparator()
         id = wx.NewId()

src/sas/guiframe/report_dialog.py

@@ -66 +66 @@
         hbox.Add(button_close)
         button_close.SetFocus()
-
-        button_preview = wx.Button(self, wx.NewId(), "Preview")
-        button_preview.SetToolTipString("Print preview this report.")
-        button_preview.Bind(wx.EVT_BUTTON, self.onPreview,
-                            id=button_preview.GetId()) 
-        hbox.Add(button_preview)
 
         button_print = wx.Button(self, wx.NewId(), "Print")

src/sas/perspectives/fitting/fitpage.py

@@ -2236 +2236 @@
         """
         # compute weight for the current data
-        from sas.perspectives.fitting.utils import get_weight
         flag_weight = self.get_weight_flag()
         if is_2D == None:
             is_2D = self._is_2D()
-        weight = get_weight(data=self.data,
-                            is2d=is_2D,
-                            flag=flag_weight)
         self._manager.set_fit_weight(uid=self.uid,
                                      flag=flag_weight,
@@ -2260 +2256 @@
         self._update_paramv_on_fit()
 
-        # msg default
-        msg = None
         if event != None:
             tcrtl = event.GetEventObject()
@@ -2275 +2269 @@
         # if any value is changed
         if is_new_pinhole:
-            msg = self._set_pinhole_smear()
+            self._set_pinhole_smear()
         # hide all silt sizer
         self._hide_all_smear_info()

src/sas/perspectives/fitting/fitting.py

@@ -516 +516 @@
         selected_data_list = []
         if self.batch_on:
-            page = self.add_fit_page(data=data_list)
+            self.add_fit_page(data=data_list)
         else:
             if len(data_list) > MAX_NBR_DATA:
@@ -537 +537 @@
                         if group_id not in data.list_group_id:
                             data.list_group_id.append(group_id)
-                        page = self.add_fit_page(data=[data])
+                        self.add_fit_page(data=[data])
             except:
-                msg = "Fitting Set_data: " + str(sys.exc_value)
+                msg = "Fitting set_data: " + str(sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
 
@@ -670 +670 @@
         :param weight: current dy data
         """
+        # If we are not dealing with a specific fit problem, then
+        # there is no point setting the weights.
+        if fid is None:
+            return
         if uid in self.page_finder.keys():
             self.page_finder[uid].set_weight(flag=flag, is2d=is2d)

src/sas/plottools/PlotPanel.py

@@ -635 +635 @@
         when clicking on linear Fit on context menu , display Fitting Dialog
         """
-        list = {}
+        plot_dict = {}
         menu = event.GetEventObject()
-        id = event.GetId()
-        self.set_selected_from_menu(menu, id)
+        event_id = event.GetId()
+        self.set_selected_from_menu(menu, event_id)
         plotlist = self.graph.returnPlottable()
         if self.graph.selected_plottable is not None:
             for item in plotlist:
                 if item.id == self.graph.selected_plottable:
-                    list[item] = plotlist[item]
+                    plot_dict[item] = plotlist[item]
         else:
-            list = plotlist
+            plot_dict = plotlist
         from fitDialog import LinearFit
 
-        if len(list.keys()) > 0:
-            first_item = list.keys()[0]
+        if len(plot_dict.keys()) > 0:
+            first_item = plot_dict.keys()[0]
             dlg = LinearFit(parent=None, plottable=first_item,
                             push_data=self.onFitDisplay,
@@ -871 +871 @@
         """
         # Slicer plot popup menu
-        id = wx.NewId()
+        wx_id = wx.NewId()
         slicerpop = wx.Menu()
-        slicerpop.Append(id, '&Save image', 'Save image as PNG')
-        wx.EVT_MENU(self, id, self.onSaveImage)
-
-        id = wx.NewId()
-        slicerpop.Append(id, '&Printer setup', 'Set image size')
-        wx.EVT_MENU(self, id, self.onPrinterSetup)
-
-        id = wx.NewId()
-        slicerpop.Append(id, '&Printer Preview', 'Set image size')
-        wx.EVT_MENU(self, id, self.onPrinterPreview)
-
-        id = wx.NewId()
-        slicerpop.Append(id, '&Print image', 'Print image ')
-        wx.EVT_MENU(self, id, self.onPrint)
-
-        id = wx.NewId()
-        slicerpop.Append(id, '&Copy', 'Copy to the clipboard')
-        wx.EVT_MENU(self, id, self.OnCopyFigureMenu)
-
-        #id = wx.NewId()
-        #slicerpop.Append(id, '&Load 1D data file')
-        #wx.EVT_MENU(self, id, self._onLoad1DData)
-
-        id = wx.NewId()
+        slicerpop.Append(wx_id, '&Save image', 'Save image as PNG')
+        wx.EVT_MENU(self, wx_id, self.onSaveImage)
+
+        wx_id = wx.NewId()
+        slicerpop.Append(wx_id, '&Printer setup', 'Set image size')
+        wx.EVT_MENU(self, wx_id, self.onPrinterSetup)
+
+        wx_id = wx.NewId()
+        slicerpop.Append(wx_id, '&Print image', 'Print image ')
+        wx.EVT_MENU(self, wx_id, self.onPrint)
+
+        wx_id = wx.NewId()
+        slicerpop.Append(wx_id, '&Copy', 'Copy to the clipboard')
+        wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu)
+
+        wx_id = wx.NewId()
         slicerpop.AppendSeparator()
-        slicerpop.Append(id, '&Properties')
-        wx.EVT_MENU(self, id, self._onProperties)
-
-        id = wx.NewId()
+        slicerpop.Append(wx_id, '&Properties')
+        wx.EVT_MENU(self, wx_id, self._onProperties)
+
+        wx_id = wx.NewId()
         slicerpop.AppendSeparator()
-        slicerpop.Append(id, '&Linear Fit')
-        wx.EVT_MENU(self, id, self.onFitting)
-
-        id = wx.NewId()
+        slicerpop.Append(wx_id, '&Linear Fit')
+        wx.EVT_MENU(self, wx_id, self.onFitting)
+
+        wx_id = wx.NewId()
         slicerpop.AppendSeparator()
-        slicerpop.Append(id, '&Toggle Legend On/Off', 'Toggle Legend On/Off')
-        wx.EVT_MENU(self, id, self.onLegend)
+        slicerpop.Append(wx_id, '&Toggle Legend On/Off', 'Toggle Legend On/Off')
+        wx.EVT_MENU(self, wx_id, self.onLegend)
 
         loc_menu = wx.Menu()
         for label in self._loc_labels:
-            id = wx.NewId()
-            loc_menu.Append(id, str(label), str(label))
-            wx.EVT_MENU(self, id, self.onChangeLegendLoc)
-        id = wx.NewId()
-        slicerpop.AppendMenu(id, '&Modify Legend Location', loc_menu)
-
-        id = wx.NewId()
-        slicerpop.Append(id, '&Modify Y Axis Label')
-        wx.EVT_MENU(self, id, self._on_yaxis_label)
-        id = wx.NewId()
-        slicerpop.Append(id, '&Modify X Axis Label')
-        wx.EVT_MENU(self, id, self._on_xaxis_label)
+            wx_id = wx.NewId()
+            loc_menu.Append(wx_id, str(label), str(label))
+            wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc)
+        wx_id = wx.NewId()
+        slicerpop.AppendMenu(wx_id, '&Modify Legend Location', loc_menu)
+
+        wx_id = wx.NewId()
+        slicerpop.Append(wx_id, '&Modify Y Axis Label')
+        wx.EVT_MENU(self, wx_id, self._on_yaxis_label)
+        wx_id = wx.NewId()
+        slicerpop.Append(wx_id, '&Modify X Axis Label')
+        wx.EVT_MENU(self, wx_id, self._on_xaxis_label)
 
         try:
@@ -1923 +1915 @@
         self.xmax = xmax
         #In case need to change the range of data plotted
-        list = []
-        list = self.graph.returnPlottable()
-        for item in list:
-            #item.onFitRange(xminView,xmaxView)
+        for item in self.graph.returnPlottable():
             item.onFitRange(None, None)
         # Create new data plottable with result
@@ -1970 +1959 @@
         Reset the graph by plotting the full range of data
         """
-        list = []
-        list = self.graph.returnPlottable()
-        for item in list:
+        for item in self.graph.returnPlottable():
             item.onReset()
         self.graph.render(self)