Changeset 2365c0b in sasview

Timestamp:

Dec 29, 2011 6:57:07 PM (13 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:

176fbf1

Parents:

aba60f4

Message:

added x^{4 scale and fixed a problem in plotting with scaled}

Files:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (1 diff)
• plottools/src/danse/common/plottools/PropertyDialog.py (modified) (1 diff)
• plottools/src/danse/common/plottools/transform.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py (modified) (1 diff)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -1600 +1600 @@
                 xunits = convertUnit(2,xunits) 
                 self.graph._xaxis_transformed("%s^{2}" % xname, "%s" % xunits)
+            if(self.xLabel == "x^(4)"):
+                item.transformX(transform.toX4, transform.errToX4)
+                xunits = convertUnit(4,xunits) 
+                self.graph._xaxis_transformed("%s^{4}" % xname, "%s" % xunits)
             if(self.xLabel == "ln(x)"):
                 item.transformX(transform.toLogX,transform.errToLogX)

plottools/src/danse/common/plottools/PropertyDialog.py

@@ -59 +59 @@
         self.xvalue.Insert("x", 0)
         self.xvalue.Insert("x^(2)", 1)
-        self.xvalue.Insert("ln(x)", 2)
-        self.xvalue.Insert("log10(x)", 3)
+        self.xvalue.Insert("x^(4)", 2)
+        self.xvalue.Insert("ln(x)", 3)
+        self.xvalue.Insert("log10(x)", 4)
         
         # scale value for y

plottools/src/danse/common/plottools/transform.py

@@ -49 +49 @@
     else:
         return math.sqrt(x)
-     
+
+def toX4(x, y=None):
+    """
+    This function is used to load value on Plottable.View
+    
+    Calculate x^(4)
+    
+    :param x: float value
+    
+    """
+    return x * x * x * x
+
+def fromX4(x, y=None):
+    """
+    This function is used to load value on Plottable.View
+    Calculate square root of x
+     
+    :param x: float value
+     
+    """
+    if not x >= 0 :
+        raise ValueError, "double square root of a negative value "
+    else:
+        return math.sqrt(math.sqrt(x))
+         
 def toLogX(x, y=None):
     """
@@ -163 +187 @@
         msg = "transform.errFromX2: can't compute error of negative x"
         raise ValueError, msg
-    
+
+def errToX4(x, y=None, dx=None, dy=None):
+    """
+    calculate error of x**4
+    
+    :param x: float value
+    :param dx: float value
+    
+    """
+    if  dx != None:
+        err = 4 * math.pow(x, 3) * dx
+        return math.fabs(err)
+    else:
+        return 0.0
+    
+def errFromX4(x, y=None, dx=None, dy=None):
+    """
+    calculate error of x^1/4
+    
+    :param x: float value
+    :param dx: float value
+    
+    """
+    if (x > 0):
+        if(dx != None):
+            err = dx/(4 * math.pow(x, 3/4))
+        else:
+            err = 0
+        return math.fabs(err)
+    else:
+        msg = "transform.errFromX4: can't compute error of negative x"
+        raise ValueError, msg
+ 
 def errToLog10X(x, y=None, dx=None, dy=None):
     """

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -220 +220 @@
         flag_x = (panel.graph.prop["xunit"] is not None) and \
                     (panel.graph.prop["xunit"].strip() != "") and\
-                    (x_unit != panel.graph.prop["xunit"])
+                    (x_unit != panel.graph.prop["xunit"]) and False
         flag_y = (panel.graph.prop["yunit"] is not None) and \
                     (panel.graph.prop["yunit"].strip() != "") and\
-                    (y_unit != panel.graph.prop["yunit"])
+                    (y_unit != panel.graph.prop["yunit"]) and False
         if (flag_x and flag_y):
             msg = "Cannot add %s" % str(data.name)