Changeset 50f1477 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Dec 19, 2016 7:25:08 AM (8 years ago)

Author:

GitHub <noreply@…>

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:

09fdc89, b61bd57

Parents:

f2724b6 (diff), 345e7e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

jhbakker <j.h.bakker@…> (12/19/16 07:25:08)

git-committer:

GitHub <noreply@…> (12/19/16 07:25:08)

Message:

Merge pull request #27 from SasView?/revert-26-Jurtest2

Revert "Jurtest2"

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (7 diffs)

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

@@ -143 +143 @@
         self.theory_qmin_x = None
         self.theory_qmax_x = None
-        self.cb1 = None
         self.btEditMask = None
         self.btFit = None
@@ -282 +281 @@
                            num=self.npts_x, endpoint=True)
         self.data = Data1D(x=x)
-        #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.xaxis('\\rm{Q}', "A^{-1}")
+        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
         self.data.is_data = False
         self.data.id = str(self.uid) + " data"
@@ -310 +307 @@
                            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{X}', "")
-        self.data.yaxis('\\rm{Y}', "")
+        self.data.xaxis('\\rm{Q}', "A^{-1}")
+        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
         self.data.is_data = False
         self.data.id = str(self.uid) + " data"
@@ -1129 +1124 @@
         # set data, etc. from the state
         # reset page between theory and fitting from bookmarking
-        #if state.data == None:
-        #    data = None
-        #else:
         data = state.data
 
@@ -1348 +1340 @@
                         except Exception:
                             logging.error(traceback.format_exc())
-
-        # Make sure the check box updated when all checked
-        if self.cb1.GetValue():
-            self.select_all_param(None)
 
     def _selectDlg(self):
@@ -2493 +2481 @@
                         item[2].Enable()
 
-            # Make sure the check box updated when all checked
-            if self.cb1.GetValue():
-                #self.select_all_param(None)
-                self.get_all_checked_params()
+            # Make sure the check box updated
+            self.get_all_checked_params()
 
             # update params
@@ -3675 +3661 @@
         call back for model selection if implemented
         """
-    def select_all_param(self, event):
-        """
-        set to true or false all checkBox if implemented
-        """
     def get_weight_flag(self):
         """