Changeset e2f0554 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 10, 2011 9:49:15 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

fa65e99

Parents:

cab8143

Message:

working on swithcing from 1d to 2d theory

File:

• sansview/perspectives/fitting/fitpage.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -467 +467 @@
         self.minimum_q = BGTextCtrl(self, -1, size=(_BOX_WIDTH,20))
         self.minimum_q.SetValue(str(data_min))
-        #self.minimum_q.SetEditable(False)
         self.maximum_q = BGTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.maximum_q.SetValue(str(data_max))
-        #self.maximum_q.SetEditable(False)
         sizer_range.Add(wx.StaticText(self, -1, "Min: "),0, wx.LEFT, 10)
         sizer_range.Add(self.minimum_q,0, wx.LEFT, 10)
@@ -476 +474 @@
         sizer_range.Add(self.maximum_q,0, wx.LEFT, 10)
         id = wx.NewId()
-        self.model_view = wx.Button(self, id,'View 2D', size=(80, 23))
+        self.model_view = wx.Button(self, id,"Switch to 2D", size=(80, 23))
         self.model_view.Bind(wx.EVT_BUTTON, self._onModel2D, id=id)
         hint = "toggle view of model from 1D to 2D  or 2D from 1D"
@@ -1474 +1472 @@
                 self.default_mask = copy.deepcopy(self.data.mask)
                 
+                
             self.formfactorbox.Enable()
             self.structurebox.Enable()
@@ -1490 +1489 @@
                 self.EditMask_title.Disable()
             else:
+                
                 ## Minimum value of data 
                 data_min = 0
@@ -1514 +1514 @@
         self.state.qmin = self.qmin_x
         self.state.qmax = self.qmax_x
+       
         #update model plot with new data information
         if flag:
+            #set model view button
+            if self.data.__class__.__name__ == "Data2D":
+                self.enable2D = True
+                self.model_view.SetLabel("2D Mode")
+            else:
+                self.enable2D = False
+                self.model_view.SetLabel("1D Mode")
+            self.model_view.Disable()
             self._draw_model()
         
@@ -2626 +2635 @@
         toggle view of model from 1D to 2D  or 2D from 1D
         """
-        if self.model_view.GetLabelText() == "View 2D":
-            self.model_view.SetLabel("View 1D")
+        if self.model_view.GetLabelText() == "Switch to 2D":
+            self.model_view.SetLabel("Switch to 1D")
             self.enable2D = True
         else:
-            self.model_view.SetLabel("View 2D")
+            self.model_view.SetLabel("Switch to 2D")
             self.enable2D = False
         self._draw_model()