Changeset 657e52c in sasview for calculatorview/src/sans/perspectives/calculator

Timestamp:

Dec 14, 2012 2:50:24 PM (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:

0203ade

Parents:

aa01d07b

Message:

merging from the release 2.2.0

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• data_operator.py (modified) (3 diffs)
• model_editor.py (modified) (3 diffs)

calculatorview/src/sans/perspectives/calculator/data_operator.py

@@ -645 +645 @@
         self.position = (0.4, 0.5)
         self.scale = 'linear'
+        self.prevXtrans = "x"
+        self.prevYtrans = "y"
+        self.viewModel = "--"
         self.subplot.set_xticks([])
         self.subplot.set_yticks([])
@@ -865 +868 @@
                 dial.view.Insert("--", 0)
                 dial.view.Insert("Linear y vs x", 1)
-                dial.xvalue.SetValue("x")
-                dial.yvalue.SetValue("y")
-                dial.view.SetValue("--")
+                dial.setValues(self.prevXtrans, self.prevYtrans, self.viewModel)
                 dial.Update()
                 if dial.ShowModal() == wx.ID_OK:
@@ -918 +919 @@
                 self.graph._yaxis_transformed("%s" % yname, "%s" % yunits)
             item.transformView()
+        self.prevXtrans = self.xLabel
+        self.prevYtrans = self.yLabel
         self.set_xscale(_xscale)
         self.set_yscale(_yscale)

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -628 +628 @@
         Layout msg
         """
-        self._msg_box = wx.StaticText(self, -1, self._notes)
+        self._msg_box = wx.StaticText(self, -1, self._notes, 
+                                      size=(PANEL_WIDTH, -1))
         self.msg_sizer.Add(self._msg_box, 0, wx.LEFT, 10)  
                     
@@ -717 +718 @@
         if len(title) > 20:
             s_title = title[0:19] + '...'
-        self._notes += "Model function name set "
+        self._notes += "Model function name is set "
         self._notes += "to %s. \n" % str(s_title)
         return True
@@ -783 +784 @@
                 pass
         else:
-            msg = "Successful!!!"
+            msg = "Successful! "
             msg += "  " + self._notes
             msg += " Please look for it in the Customized Models."