Changeset 318b5bbb in sasview for fittingview/src/sans/perspectives/fitting/fitpage.py

Timestamp:

Dec 18, 2012 10:55:24 AM (12 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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -635 +635 @@
 
         for item in self.model.dispersion.keys():
+            if not self.magnetic_on:
+                if item in self.model.magnetic_params:
+                    continue
             if not item in self.model.orientation_params:
                 if not item in self.disp_cb_dict:
@@ -752 +755 @@
         first_orient = True
         for item in self.model.dispersion.keys():
+            if not self.magnetic_on:
+                if item in self.model.magnetic_params:
+                    continue
             if  item in self.model.orientation_params:
                 if not item in self.disp_cb_dict:
@@ -2943 +2949 @@
             if item in self.model.orientation_params:
                 orient_angle = wx.StaticText(self, -1, '[For 2D only]:')
+                mag_on_button = wx.Button(self, -1, "Magnetic ON" )
+                mag_on_button.Bind(wx.EVT_BUTTON, self._on_mag_on)
+                mag_help_button = wx.Button(self, -1,"Magnetic angles?" )
+                mag_help_button.Bind(wx.EVT_BUTTON,self._on_mag_help)
                 sizer.Add(orient_angle, (iy, ix), (1, 1),
                           wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+                iy += 1
+                sizer.Add(mag_on_button,(iy, ix ),(1,1), 
+                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
+                sizer.Add(mag_help_button,(iy, ix + 1),(1,1), 
+                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
+                
+                #handle the magnetic buttons
+                if not self._has_magnetic:
+                    mag_on_button.Show(False)
+                elif not self.data.__class__.__name__ == "Data2D":
+                    mag_on_button.Show(False)
+                else:
+                    mag_on_button.Show(True)
+                mag_help_button.Show(False)
+                if mag_on_button.IsShown():
+                    if self.magnetic_on:
+                        mag_on_button.SetLabel("Magnetic OFF")
+                        mag_help_button.Show(True) 
+                    else:
+                        mag_on_button.SetLabel("Magnetic ON")
+                        mag_help_button.Show(False)
+                        
                 if not self.data.__class__.__name__ == "Data2D" and \
                         not self.enable2D:
@@ -2955 +2987 @@
         if type.lower() != "array":
             for item in self.model.orientation_params:
+                if not self.magnetic_on:
+                    if item in self.model.magnetic_params:
+                        continue
                 if not item in self.disp_list:
                     ##prepare a spot to store min max