Changeset 6318298 in sasview for sansview/perspectives

Timestamp:

Apr 14, 2010 12:39:12 PM (15 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:

36bc34e

Parents:

51a71a3

Message:

fixed last mistakes

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (8 diffs)
• fitpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1008 +1008 @@
         #self._undo.Enable(True)
         # check if 2d data
-        if self.data.__class__.__name__ !="Data1D":
+        if self.data.__class__.__name__ =="Data2D":
             is_2Ddata = True
         if self.model !=None:
@@ -1064 +1064 @@
 
         # check if 2d data
-        if self.data.__class__.__name__ !="Data1D":
+        if self.data.__class__.__name__ =="Data2D":
             is_2Ddata = True
         
@@ -1629 +1629 @@
             self.structurebox.Enable()
             self.text2.Enable()
-        if self.data.__class__.__name__ !="Data1D":
+        if self.data.__class__.__name__ =="Data2D":
             self.smear_description_2d.Show(True)
             
@@ -1727 +1727 @@
         for item in list:
             #skip angle parameters for 1D
-            if self.data.__class__.__name__ !="Data1D":
+            if self.data.__class__.__name__ !="Data2D":
                 if item in self.orientation_params:
                     continue
@@ -1993 +1993 @@
                 self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10))
                 self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
-                if not (self.enable2D or self.data.__class__.__name__ !="Data1D"):
+                if not (self.enable2D or self.data.__class__.__name__ =="Data2D"):
                     self.disp_cb_dict[p].Hide()
                 else:
@@ -2041 +2041 @@
         
         #check if it is 2D data
-        if self.data.__class__.__name__ != 'Data1D':
+        if self.data.__class__.__name__ == 'Data2D':
             is_2Ddata = True
             
@@ -2158 +2158 @@
             return
         ##For 3 different cases: Data2D, Data1D, and theory
-        if self.data.__class__.__name__ != "Data1D":
+        if self.data.__class__.__name__ == "Data2D":
             data_min= 0
             x= max(math.fabs(self.data.xmin), math.fabs(self.data.xmax)) 
@@ -2164 +2164 @@
             self.qmin_x = data_min
             self.qmax_x = math.sqrt(x*x + y*y)
-        elif self.data.__class__.__name__ == "Data1D":
+        elif self.data.__class__.__name__ != "Data2D":
             self.qmin_x = min(self.data.x)
             self.qmax_x = max(self.data.x)

sansview/perspectives/fitting/fitpage.py

@@ -179 +179 @@
         
         # Check if data is 2D
-        if self.data.__class__.__name__ != 'Data1D':
+        if self.data.__class__.__name__ == 'Data2D':
             is_2Ddata = True