Changeset dbc5dc9b in sasview for calculatorview/src/sans

Timestamp:

Dec 21, 2012 10:37:59 AM (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:

ab7e3a4

Parents:

46be5e6

Message:

added a pdb reader

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• gen_scatter_panel.py (modified) (17 diffs)
• load_thread.py (modified) (1 diff)

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

@@ -39 +39 @@
 from sans.perspectives.calculator.load_thread import GenReader
 #import matplotlib.pyplot as plt
-from mpl_toolkits.mplot3d import Axes3D
 from danse.common.plottools.arrow3d import Arrow3D
 #from danse.common.plottools.toolbar import NavigationToolBar
@@ -141 +140 @@
         self.omfreader = sans_gen.OMFReader()
         self.sldreader = sans_gen.SLDReader()
+        self.pdbreader = sans_gen.PDBReader()
         self.model = sans_gen.GenSAS()
         self.param_dic = self.model.params
@@ -428 +428 @@
         omf_type = self.omfreader.type
         sld_type = self.sldreader.type
+        pdb_type = self.pdbreader.type
         wildcard = []
         for type in sld_type:
@@ -433 +434 @@
         for type in omf_type:
             wildcard.append(type)
+        #for type in pdb_type:
+        #    wildcard.append(type)
         wildcard = '|'.join(wildcard)
         dlg = wx.FileDialog(self, "Choose a file", location,
@@ -465 +468 @@
             elif self.ext in self.sldreader.ext:
                 loader = self.sldreader
+            elif self.ext in self.pdbreader.ext:
+                loader = self.pdbreader
             else:
                 loader = None
@@ -480 +485 @@
         except:
             self.ext = None
-            raise
             if self.parent.parent is None:
                 return 
@@ -517 +521 @@
                 self.sld_data = gen.get_magsld()
             elif self.ext in self.sldreader.ext:
+                self.sld_data = data
+            elif self.ext in self.pdbreader.ext:
                 self.sld_data = data
                 #omf_data = None
@@ -596 +602 @@
                 logging.error("PlotPanel could not import Axes3D")
                 raise
-
+        marker = ','
+        m_size = 2
+        if output.pix_type != 'pixel':
+            marker = 'o'
+            m_size = 2
         pos_x = output.pos_x
         pos_y = output.pos_y
@@ -603 +613 @@
         sld_my = output.sld_my
         sld_mz = output.sld_mz  
-         
+
         sld_tot = (numpy.fabs(sld_mx) + numpy.fabs(sld_my) + 
                    numpy.fabs(sld_mz) + numpy.fabs(output.sld_n))
@@ -609 +619 @@
         is_zero = sld_tot == 0.0  
         if is_zero.any():
-            ax.plot(pos_x[is_zero], pos_y[is_zero], pos_z[is_zero], ',', c="y", 
-                        alpha=0.5, markeredgecolor='y', markersize=3) 
+            ax.plot(pos_x[is_zero], pos_y[is_zero], pos_z[is_zero], marker, 
+                        c="y", alpha=0.5, markeredgecolor='y', 
+                        markersize=m_size) 
             pos_x = pos_x[is_nonzero]
             pos_y = pos_y[is_nonzero]
@@ -617 +628 @@
             sld_my = sld_my[is_nonzero]
             sld_mz = sld_mz[is_nonzero]
+
         ax.plot(pos_x, pos_y, 
-                pos_z, ',', c="k", 
-                alpha=0.5, markeredgecolor='k', markersize=3) 
+                pos_z, marker, c="k", 
+                alpha=0.5, markeredgecolor="k", markersize=m_size) 
         
         if has_arrow and len(pos_x) > 0:     
@@ -763 +775 @@
             self.set_est_time()
         except:
-           flag =  _set_error(self, self.npt_ctl)
+            flag =  _set_error(self, self.npt_ctl)
         try:
             qmax_val = float(self.qmax_ctl.GetValue()) 
@@ -1030 +1042 @@
         """
         val = 1
-        for lst in self.stepsize:
-            val *= float(lst[1].GetValue())
+        if self.sld_data.pix_type == 'pixel':
+            for lst in self.stepsize:
+                val *= float(lst[1].GetValue())
         
         return numpy.fabs(val)
@@ -1365 +1378 @@
                     ctr_list[1].SetValue(format_number(mean_val, True))
                     ctr_list[1].Enable(enable)
+                    ctr_list[2].SetLabel("[" + sld_data.sld_unit + "]")
                     break   
 
@@ -1450 +1464 @@
                     npts = -1
                     break
-                npts *= int(n_val)
+                if numpy.isfinite(n_val):
+                    npts *= int(n_val)
             if npts > 0:
                 nop = self.set_npts_from_slddata()
@@ -1676 +1691 @@
             return
         self.sld_data = data
-        
         enable = (not data==None)
-        #print "main mx", data.sld_mx
         self._set_omfpanel_sld_data(self.sld_data)
         self.omfpanel.bt_save.Enable(enable)
@@ -1815 +1828 @@
             frame.Show(True)
         except:
-            raise
             frame.Destroy() 
             msg = 'Display Error\n'

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

@@ -3 +3 @@
 """
 import time
+import wx
 from data_util.calcthread import CalcThread
 from sans.dataloader.loader import Loader