Changeset dfca3de in sasview for guitools

Timestamp:

Apr 15, 2008 5:01:45 PM (17 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3aa7074

Parents:

88e7d08

Message:

prpoerty dialog modified

Location:

guitools

Files:

• PlotPanel.py (modified) (5 diffs)
• PropertyDialog.py (modified) (2 diffs)

guitools/PlotPanel.py

@@ -61 +61 @@
         self.xscales ="x"
         self.yscales ="log10(y)"
+        self.viewModel ="--"
         # keep track if the previous transformation of x and y in Property dialog
         self.prevXtrans =" "
@@ -67 +68 @@
     def returnTrans(self):
         return self.xscales,self.yscales
-        
+    
     def setTrans(self,xtrans,ytrans): 
         """
@@ -75 +76 @@
         self.prevXtrans =xtrans
         self.prevYtrans =ytrans
-        
+   
     def onFitting(self, event): 
         """
@@ -97 +98 @@
         from PropertyDialog import Properties
         dial = Properties(self, -1, 'Properties')
-        dial.setValues( self.prevXtrans, self.prevYtrans )
+        dial.setValues( self.prevXtrans, self.prevYtrans,self.viewModel )
         if dial.ShowModal() == wx.ID_OK:
-            self.xscales, self.yscales = dial.getValues()
+            self.xscales, self.yscales,self.viewModel = dial.getValues()
+            if self.viewModel =="Guinier lny vs x^(2)":
+                self.xscales="x^(2)"
+                self.yscales="ln(y)"
+                self.viewModel = "--"
+                dial.setValues( self.xscales, self.yscales,self.viewModel )
             self._onEVT_FUNC_PROPERTY()
         dial.Destroy()
@@ -396 +402 @@
                 xname, xunits = item.get_xaxis()
                 self.graph.yaxis("%s%s^{4}" % (yname,xname),  "%s^{-1}%s^{-4}" % (yunits,xunits))
-   
+            
+            if ( self.viewModel == "Guinier lny vs x^(2)"):
+                
+                item.transform_x( transform.toX2,transform.errToX2 )
+                self.set_xscale('linear')
+                name, units = item.get_xaxis()
+                self.graph.xaxis("%s^{2}" % name,  "%s^{-2}" % units)
+                
+                item.transform_y( transform.toLogX, transform.errToLogX )
+                self.set_yscale("linear")
+                name, units = item.get_yaxis()
+                self.graph.yaxis("%s" % name,  "%s^{-1}" % units)
+                 
         self.prevXtrans = self.xscales 
         self.prevYtrans = self.yscales  

guitools/PropertyDialog.py

@@ -62 +62 @@
         
         # type of view or model used 
-        self.view.SetValue("Guinier lny vs x^(2)")
-        self.view.Insert("Guinier lny vs x^(2)",0)
+        self.view.SetValue("--")
+        self.view.Insert("--",0)
+        self.view.Insert("Guinier lny vs x^(2)",1)
         panel.SetSizer(sizer)
         self.SetSizer(vbox)
@@ -69 +70 @@
            
         
-    def setValues(self,x,y):
-        return  self.xvalue.SetValue(x),  self.yvalue.SetValue(y)
+    def setValues(self,x,y,view):
+        return  self.xvalue.SetValue(x),  self.yvalue.SetValue(y),self.view.SetValue(view)
         
     def getValues(self):
-        return self.xvalue.GetValue(), self.yvalue.GetValue()
+        return self.xvalue.GetValue(), self.yvalue.GetValue(),self.view.GetValue()
+        
 
 if __name__ == "__main__":