Changeset 7988501 in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Oct 8, 2016 2:34:03 PM (8 years ago)

Author:

jhbakker

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

51a4d78

Parents:

6df015de

Message:

Data1D class changed to include SESANS Data format

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -282 +282 @@
                            num=self.npts_x, endpoint=True)
         self.data = Data1D(x=x)
-        self.data.xaxis('\\rm{Q}', "A^{-1}")
-        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        #self.data.xaxis('\\rm{Q}', "A^{-1}")
+        self.data.xaxis('\\rm{X}', "")
+        #self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        self.data.yaxis('\\rm{Y}', "")
         self.data.is_data = False
         self.data.id = str(self.uid) + " data"
@@ -308 +310 @@
                            num=self.npts_x, endpoint=True, base=10.0)
         self.data = Data1D(x=x)
-        self.data.xaxis('\\rm{Q}', "A^{-1}")
-        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        #self.data.xaxis('\\rm{Q}', "A^{-1}")
+        #self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        self.data.xaxis('\\rm{X}', "")
+        self.data.yaxis('\\rm{Y}', "")
         self.data.is_data = False
         self.data.id = str(self.uid) + " data"

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -98 +98 @@
     def onTrafo(self, event):
         """
-        On Weighting radio button event, sets the weightbt_string
+        On Trafo radio button event, sets the Trafobt_string
         """
         self.Trafobt_string = event.GetEventObject().GetLabelText()
@@ -120 +120 @@
         self.no_transform = wx.RadioButton(self, wx.ID_ANY,
                                                   'None', style=wx.RB_GROUP)
-        self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-                          id=self.no_transform.GetId())
+
+        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
+         #                 id=self.no_transform.GetId())
         self.hankel = wx.RadioButton(self, wx.ID_ANY,
                                                   'Hankel')
-        self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-                          id=self.hankel.GetId())
+        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
+        #                  id=self.hankel.GetId())
         self.cosine = wx.RadioButton(self, wx.ID_ANY,
                                                   'Cosine')
-        self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-                          id=self.cosine.GetId())
+        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
+         #                 id=self.cosine.GetId())
 
         #Not sure about this (only once though)