Changeset fb59ed9 in sasview for theoryview/perspectives/theory/profile_dialog.py

Timestamp:

Oct 20, 2010 6:08:34 PM (14 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:

d2539aa

Parents:

f118fe2f

Message:

added new models

File:

• theoryview/perspectives/theory/profile_dialog.py (modified) (9 diffs)

theoryview/perspectives/theory/profile_dialog.py

@@ -2 +2 @@
 import sys
 
-import copy,numpy
+from copy import deepcopy
 from danse.common.plottools.PlotPanel import PlotPanel
 from danse.common.plottools.plottables import Graph
@@ -17 +17 @@
 if sys.platform.count("win32")>0:
     _STATICBOX_WIDTH = 380
-    PANEL_SIZE = 420
+    PANEL_SIZE = 475
     FONT_VARIANT = 0
 else:
     _STATICBOX_WIDTH = 410
-    PANEL_SIZE = 450
+    PANEL_SIZE = 505
     FONT_VARIANT = 1
     
@@ -36 +36 @@
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
-    def __init__(self, parent=None,base=None,data =None, id = -1, *args, **kwds):
+    def __init__(self, parent=None,base=None,data =None,axes =['Radius'], id = -1, *args, **kwds):
         kwds["style"] =  wx.DEFAULT_DIALOG_STYLE
-        kwds["size"] = wx.Size(_STATICBOX_WIDTH*2,PANEL_SIZE) 
+        kwds["size"] = wx.Size(_STATICBOX_WIDTH*1.5,PANEL_SIZE) 
         wx.Dialog.__init__(self, parent, id = id,  *args, **kwds)
         if data != None:
@@ -54 +54 @@
             self.name = self.data.name
             
-            # Panel for 2D plot
-            self.plotpanel    = SLDplotpanel(self, -1, style=wx.TRANSPARENT_WINDOW)
+            # Panel for plot
+            self.plotpanel    = SLDplotpanel(self, axes, -1, style=wx.TRANSPARENT_WINDOW)
             self.cmap = DEFAULT_CMAP
             ## Create Artist and bind it
@@ -61 +61 @@
 
             self._setup_layout()
-            self.newplot=Theory1D(self.data.x,self.data.y)
+            data_plot = deepcopy(self.data)
+            self.newplot=Theory1D(data_plot.x,data_plot.y)
             self.newplot.name = 'SLD'
             self.plotpanel.add_image(self.newplot) 
@@ -76 +77 @@
         sizer = wx.GridBagSizer(14,14)
         
-        sizer.Add(self.plotpanel,(0, 0), (13, 13), wx.EXPAND | wx.LEFT| wx.RIGHT, 15)
+        sizer.Add(self.plotpanel,(0, 0), (13, 13), wx.EXPAND | wx.LEFT| wx.RIGHT, 1)
 
         #-----Button------------1
@@ -110 +111 @@
     Panel
     """
-    def __init__(self, parent, id = -1, color = None, dpi = None, **kwargs):
+    def __init__(self, parent,axes=[], id = -1, color = None, dpi = None, **kwargs):
         """
         """
@@ -120 +121 @@
         self.plots = {}
         self.graph = Graph()
-
-
+        self.axes_label = []
+        for idx in range(0,len(axes)):
+            self.axes_label.append(axes[idx])
          
     def add_image(self, plot):
@@ -133 +135 @@
         self.graph.add(plot)
         #add axes
-        self.graph.xaxis('\\rm{Radius} ', '\\AA')
+        x1_label = self.axes_label[0]
+        self.graph.xaxis('\\rm{%s} '% x1_label, '\\AA')
         self.graph.yaxis('\\rm{SLD} ', '\\AA^{-2}')