Changeset 077207b in sasview for calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

Timestamp:

Jan 4, 2013 9:30:31 AM (11 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:

d7b6913

Parents:

ab7e3a4

Message:

added pdb reader

File:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (17 diffs)

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

@@ -20 +20 @@
 
 from data_util.calcthread import CalcThread
-#from sans.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D \
-#                    as PlotPanel
-#from danse.common.plottools.PlotPanel import PlotPanel
-#from danse.common.plottools.SimplePlot import PlotFrame
 from sans.guiframe.local_perspectives.plotting.SimplePlot import PlotFrame
-#from danse.common.plottools.plottables import Graph
 from sans.guiframe.dataFitting import Data2D
-#from sans.guiframe.utils import PanelMenu
 from sans.dataloader.data_info import Detector
 from sans.dataloader.data_info import Source
@@ -38 +32 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 from sans.perspectives.calculator.load_thread import GenReader
-#import matplotlib.pyplot as plt
 from danse.common.plottools.arrow3d import Arrow3D
-#from danse.common.plottools.toolbar import NavigationToolBar
+
 _BOX_WIDTH = 76
 #Slit length panel size 
@@ -51 +44 @@
     PANEL_HEIGHT = 370
     FONT_VARIANT = 1
-_QMAX_DEFAULT = 0.1
+_QMAX_DEFAULT = 0.3
 _NPTS_DEFAULT = 50 
 
@@ -434 +427 @@
         for type in omf_type:
             wildcard.append(type)
-        #for type in pdb_type:
-        #    wildcard.append(type)
+        for type in pdb_type:
+            wildcard.append(type)
         wildcard = '|'.join(wildcard)
         dlg = wx.FileDialog(self, "Choose a file", location,
@@ -474 +467 @@
             if self.reader is not None and self.reader.isrunning():
                 self.reader.stop()
+            self.browse_button.Enable(False)
+            self.browse_button.SetLabel("Loading...")
             if self.parent.parent is not None:
                 wx.PostEvent(self.parent.parent, 
@@ -482 +477 @@
                                     updatefn=self.load_update)
             self.reader.queue()
-            self.load_update()
+            #self.load_update()
         except:
             self.ext = None
@@ -496 +491 @@
         """
         print update on the status bar
-        """
+        """       
         if self.parent.parent is None:
                 return 
@@ -511 +506 @@
         """
         #compute the slit size
+        self.browse_button.Enable(True)
+        self.browse_button.SetLabel('Load')
         try:
             filename = data.filename
@@ -529 +526 @@
             self._set_sld_data_helper(True)
         except:
-            #raise
             if self.parent.parent is None:
-                return 
+                raise
             msg = "Loading Error: This file format is not supported "
             msg += "for GenSANS." 
@@ -540 +536 @@
         if self.parent.parent is None:
             return 
+        
         msg = "Load Complete"
         wx.PostEvent(self.parent.parent, StatusEvent(status=msg, type='stop'))
@@ -619 +616 @@
         is_zero = sld_tot == 0.0  
         if is_zero.any():
-            ax.plot(pos_x[is_zero], pos_y[is_zero], pos_z[is_zero], marker, 
+            ax.plot(pos_x[is_zero], pos_z[is_zero], pos_y[is_zero], marker, 
                         c="y", alpha=0.5, markeredgecolor='y', 
                         markersize=m_size) 
@@ -629 +626 @@
             sld_mz = sld_mz[is_nonzero]
 
-        ax.plot(pos_x, pos_y, 
-                pos_z, marker, c="k", 
+        ax.plot(pos_x, pos_z, pos_y, 
+                marker, c="k", 
                 alpha=0.5, markeredgecolor="k", markersize=m_size) 
         
@@ -671 +668 @@
                                                       color_z))
                         
-                        arrows = Arrow3D(panel, x_arrow, y_arrow, 
-                                                  z_arrow, colors, 
+                        arrows = Arrow3D(panel, x_arrow, z_arrow, y_arrow, 
+                                                  colors, 
                                                   mutation_scale=10, lw=1, 
                                                   arrowstyle="->", alpha = 0.5)
@@ -692 +689 @@
         panel.subplot.figure.subplots_adjust(left=0.05, right=0.95, 
                                              bottom=0.05, top=0.96)
+        # Use y, z axes (in mpl 3d) as z, y axes 
+        # that consistent with SANS coords.
         ax.set_xlabel('x ($\A%s$)'% output.pos_unit)
-        ax.set_ylabel('y ($\A%s$)'% output.pos_unit)
-        ax.set_zlabel('z ($\A%s$)'% output.pos_unit)
+        ax.set_ylabel('z ($\A%s$)'% output.pos_unit)
+        ax.set_zlabel('y ($\A%s$)'% output.pos_unit)
         num_graph = str(self.graph_num)
         frame.SetTitle('Graph %s: %s'% (num_graph, graph_title))        
@@ -1137 +1136 @@
         
         self.npixels_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.box_sld = wx.StaticBox(self, -1, str("Mean SLD"))
+        self.box_sld = wx.StaticBox(self, -1, 
+                                    str("Scattering Length (Density)"))
         self.box_node = wx.StaticBox(self, -1, str("Nodes"))
         self.boxsizer_sld = wx.StaticBoxSizer(self.box_sld, wx.VERTICAL)
@@ -1360 +1360 @@
     def set_sld_ctr(self, sld_data):
         """
+        Set sld textctrls
         """
         if sld_data == None:
@@ -1375 +1376 @@
                     max_val = numpy.max(sld_list[key])
                     mean_val = numpy.mean(sld_list[key])
-                    enable = (min_val == max_val)
+                    enable = (min_val == max_val) and \
+                             sld_data.pix_type == 'pixel'
                     ctr_list[1].SetValue(format_number(mean_val, True))
                     ctr_list[1].Enable(enable)