Changeset a436b2e in sasview

Timestamp:

May 19, 2011 7:43:38 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

8960479

Parents:

accbb1b

Message:

Still working on SLDpanel

Files:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• sansview/perspectives/fitting/fitting.py (modified) (1 diff)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -307 +307 @@
         if self.graph.selected_plottable in self.plots:
             plot = self.plots[self.graph.selected_plottable]
-
-            id = wx.NewId()
-            self._slicerpop.Append(id, '&Linear Fit')
-            wx.EVT_MENU(self, id, self.onFitting)
-            self._slicerpop.AppendSeparator()
+            
             id = wx.NewId()
             name = plot.name
             self._slicerpop.Append(id, "&Save Points as a File")
-            wx.EVT_MENU(self, id, self._onSave)
-            id = wx.NewId()
-            self._slicerpop.Append(id, "Remove %s Curve" % name)
-            wx.EVT_MENU(self, id, self._onRemove)
-            if not plot.is_data:
+            self._slicerpop.AppendSeparator()
+            if plot.name != 'SLD':
+                wx.EVT_MENU(self, id, self._onSave)
                 id = wx.NewId()
-                self._slicerpop.Append(id, '&Freeze', 'Freeze')
-                wx.EVT_MENU(self, id, self.onFreeze)
-            symbol_menu = wx.Menu()
-            for label in self._symbol_labels:
+                self._slicerpop.Append(id, '&Linear Fit')
+                wx.EVT_MENU(self, id, self.onFitting)
+                self._slicerpop.AppendSeparator()
+    
                 id = wx.NewId()
-                symbol_menu.Append(id, str(label), str(label))
-                wx.EVT_MENU(self, id, self.onChangeSymbol)
-            id = wx.NewId()
-            self._slicerpop.AppendMenu(id,'&Modify Symbol',  symbol_menu)
-            self._slicerpop.AppendSeparator()
-
-            id = wx.NewId()
-            self.hide_menu = self._slicerpop.Append(id, "Hide Error")
-
-            if plot.dy is not None and plot.dy != []:
-                if plot.hide_error :
-                    self.hide_menu.SetText('Show Error')
+                self._slicerpop.Append(id, "Remove %s Curve" % name)
+                wx.EVT_MENU(self, id, self._onRemove)
+                if not plot.is_data:
+                    id = wx.NewId()
+                    self._slicerpop.Append(id, '&Freeze', 'Freeze')
+                    wx.EVT_MENU(self, id, self.onFreeze)
+                symbol_menu = wx.Menu()
+                for label in self._symbol_labels:
+                    id = wx.NewId()
+                    symbol_menu.Append(id, str(label), str(label))
+                    wx.EVT_MENU(self, id, self.onChangeSymbol)
+                id = wx.NewId()
+                self._slicerpop.AppendMenu(id,'&Modify Symbol',  symbol_menu)
+                self._slicerpop.AppendSeparator()
+    
+                id = wx.NewId()
+                self.hide_menu = self._slicerpop.Append(id, "Hide Error")
+    
+                if plot.dy is not None and plot.dy != []:
+                    if plot.hide_error :
+                        self.hide_menu.SetText('Show Error')
+                    else:
+                        self.hide_menu.SetText('Hide Error')
                 else:
-                    self.hide_menu.SetText('Hide Error')
-            else:
-                self.hide_menu.Enable(False)
-            wx.EVT_MENU(self, id, self._ontoggle_hide_error)
-            
-            self._slicerpop.AppendSeparator()
-            # Option to hide
-            #TODO: implement functionality to hide a plottable (legend click)
+                    self.hide_menu.Enable(False)
+                wx.EVT_MENU(self, id, self._ontoggle_hide_error)
+                
+                self._slicerpop.AppendSeparator()
+                # Option to hide
+                #TODO: implement functionality to hide a plottable (legend click)
         
         

sansview/perspectives/fitting/fitting.py

@@ -228 +228 @@
         loader.associate_file_reader(".fitv", self.state_reader)
         #loader.associate_file_reader(".svs", self.state_reader)
-        from sans.perspectives.calculator.sld_panel import SldPanel
+        #from sans.perspectives.calculator.sld_panel import SldPanel
         #Send the fitting panel to guiframe
         self.mypanels.append(self.fit_panel) 
-        self.mypanels.append(SldPanel(parent=self.parent, base=self.parent))
+        #self.mypanels.append(SldPanel(parent=self.parent, base=self.parent))
         return self.mypanels