Changeset dbc01f2 in sasview for calculatorview/src/sans

Timestamp:

Jan 10, 2013 5:16:51 PM (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:

b1174ec

Parents:

2d9c7266

Message:

fixed and added some features in pdb reader

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• gen_scatter_panel.py (modified) (17 diffs)
• load_thread.py (modified) (1 diff)
• media/gen_sans_help.html (modified) (1 diff)

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

@@ -353 +353 @@
         x_in = n_qbins * n_pixs / 100000
         # magic equation: not very accurate
-        etime = 0.00001 + 0.085973 * x_in
+        etime = 1.0 + 0.14 * x_in
         return int(etime)
         
@@ -526 +526 @@
             else:
                 raise
-            for name, _, unit in  self.parameters:
-                if name.GetLabelText() == 'background':
-                    if is_pdbdata:
-                        unit.SetLabel('[A^(2)]')
-                    else:
-                        unit.SetLabel('[1/cm]')
-                    break
             self._set_sld_data_helper(True)
         except:
@@ -575 +568 @@
         Draw 3D sld profile
         """
+        color_dic = {'H':'blue', 'D':'purple', 'N': 'orange', 
+                     'O':'red', 'C':'green', 'Other':'k'}
         graph_title = self.file_name
         graph_title += "   3D SLD Profile "
+        
         flag = self.parent.check_omfpanel_inputs()
         if not flag:
@@ -595 +591 @@
         add_icon(self.parent, frame)
         panel = frame.plotpanel
+        
         try:
             # mpl >= 1.0.0
@@ -606 +603 @@
                 logging.error("PlotPanel could not import Axes3D")
                 raise
+            
         marker = ','
         m_size = 2
@@ -622 +620 @@
         is_nonzero = sld_tot > 0.0  
         is_zero = sld_tot == 0.0  
+        
+        # Plot null points
         if is_zero.any():
             ax.plot(pos_x[is_zero], pos_z[is_zero], pos_y[is_zero], marker, 
@@ -632 +632 @@
             sld_my = sld_my[is_nonzero]
             sld_mz = sld_mz[is_nonzero]
-
-        ax.plot(pos_x, pos_z, pos_y, 
-                marker, c="k", 
-                alpha=0.5, markeredgecolor="k", markersize=m_size) 
+        
+        # Plot selective points in color
+        for key in color_dic.keys():
+            chosen_color = output.pix_symbol == key
+            other_color = numpy.ones(len(output.pix_symbol), dtype='bool')
+            if chosen_color.any():
+                other_color = other_color  & (chosen_color != True)
+                color = color_dic[key]
+                ax.plot(pos_x[chosen_color], pos_z[chosen_color], 
+                        pos_y[chosen_color], marker, c=color, alpha=0.5, 
+                        markeredgecolor=color, markersize=m_size, label=key) 
+        # Plot All others        
+        if other_color.any():
+            ax.plot(pos_x[other_color], pos_z[other_color], pos_y[other_color], 
+                    marker, c="k", alpha=0.5, markeredgecolor="k", 
+                    markersize=m_size, label="Other") 
         
         if has_arrow and len(pos_x) > 0:     
@@ -643 +655 @@
                 draw w/arrow
                 """
-                #frame.SetSize(wx.Size(650, 570))
-                #event.Skip()
                 max_mx = max(numpy.fabs(sld_mx))
                 max_my = max(numpy.fabs(sld_my))
@@ -679 +689 @@
                                                   mutation_scale=10, lw=1, 
                                                   arrowstyle="->", alpha = 0.5)
-                        ax.add_artist(arrows)
-                        
+                        ax.add_artist(arrows) 
                 except:
                     pass 
@@ -701 +710 @@
         ax.set_ylabel('z ($\A%s$)'% output.pos_unit)
         ax.set_zlabel('y ($\A%s$)'% output.pos_unit)
+        if output.pix_type == 'atom':
+            ax.legend(loc='upper left', prop={'size':10})
         num_graph = str(self.graph_num)
         frame.SetTitle('Graph %s: %s'% (num_graph, graph_title))        
@@ -743 +754 @@
             return
         try:
-            vol = self.parent.get_pix_volume()
-            self.model.set_pixel_volume(vol)
+            #vol = self.parent.get_pix_volumes()
+            #self.model.set_pixel_volumes(vol)
             self.model.set_sld_data(self.sld_data)
             self.set_input_params()
@@ -754 +765 @@
             
             cal_out = CalcGen(input=[self.data.qx_data, 
-                                     self.data.qy_data,i_out], 
+                                     self.data.qy_data, i_out], 
                               completefn=self.complete, 
                               updatefn=self._update)
@@ -1043 +1054 @@
         return self.sld_data
     
-    def get_pix_volume(self):
+    def get_pix_volumes(self):
         """
         Get the pixel volume
         """
-        val = 1
-        if self.sld_data.pix_type == 'pixel':
-            for lst in self.stepsize:
-                val *= float(lst[1].GetValue())
-        
-        return numpy.fabs(val)
+        vol = self.sld_data.vol_pix
+        
+        return vol
                 
     def _get_other_val(self):  
@@ -1270 +1278 @@
             ctl = InputTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
                                 style=wx.TE_PROCESS_ENTER)
+            ctl.Bind(wx.EVT_TEXT, self._onstepsize )
             ctl.SetValue(format_number(value, True))
             ctl.Enable(not is_data)
@@ -1387 +1396 @@
                     ctr_list[1].SetValue(format_number(mean_val, True))
                     ctr_list[1].Enable(enable)
-                    ctr_list[2].SetLabel("[" + sld_data.sld_unit + "]")
+                    #ctr_list[2].SetLabel("[" + sld_data.sld_unit + "]")
                     break   
 
@@ -1483 +1492 @@
         return flag
     
+    def _onstepsize(self, event):
+        """
+        On stepsize event
+        """
+        flag = True
+        if event != None:
+            event.Skip()
+            ctl = event.GetEventObject()
+            ctl.SetBackgroundColour("white")
+
+        if flag and not self.sld_data.is_data:#ctl.IsEnabled():
+            s_size = 1.0
+            try:
+                for item in self.stepsize:
+                    s_val = float(item[1].GetValue())
+                    if s_val <= 0:
+                        item[1].SetBackgroundColour("pink")
+                        ctl.Refresh()
+                        return
+                    if numpy.isfinite(s_val):
+                        s_size *= s_val
+                self.sld_data.set_pixel_volumes(s_size)
+            except:
+                pass
+        ctl.Refresh()
+  
+         
     def set_npts_from_slddata(self):
         """
@@ -1759 +1795 @@
         return n_pix
     
-    def get_pix_volume(self):
+    def get_pix_volumes(self):
         """
         Get a pixel volume
         """
-        vol = self.omfpanel.get_pix_volume()
+        vol = self.omfpanel.get_pix_volumes()
         return vol
     

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

calculatorview/src/sans/perspectives/calculator/media/gen_sans_help.html

@@ -115 +115 @@
 For example, both values are 0.5 for unpolarized neutrons.
 <br>
-*Note II: The unit of intensity calculated from .sld, .omf, or .txt files is 1/cm, otherwise
-it is &#197;<sup>2</sup>. (In the first equation above, the V is set to 1.)
-<br>
-*Note III: This computation is totally based on the pixel (or atomic) data fixed
+*Note II: This computation is totally based on the pixel (or atomic) data fixed
 in the xyz coordinates. Thus no angular orientational averaging is considered.
 <br>
-*Note IV: For the nuclear scattering length density, only the real component is taken account.
+*Note III: For the nuclear scattering length density, only the real component is taken account.
+<br>
 </body>