Changeset 440006a in sasview for calculatorview

Timestamp:

Jan 11, 2013 12:20:11 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:

3540156

Parents:

be0fe41

Message:

Added color for atom P

File:

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

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

@@ -569 +569 @@
         """
         color_dic = {'H':'blue', 'D':'purple', 'N': 'orange', 
-                     'O':'red', 'C':'green', 'Other':'k'}
+                     'O':'red', 'C':'green', 'P':'cyan', 'Other':'k'}
         graph_title = self.file_name
         graph_title += "   3D SLD Profile "
@@ -634 +634 @@
         
         # Plot selective points in color
+        other_color = numpy.ones(len(output.pix_symbol), dtype='bool')
         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():
+            if numpy.any(chosen_color):
                 other_color = other_color  & (chosen_color != True)
                 color = color_dic[key]
@@ -644 +644 @@
                         markeredgecolor=color, markersize=m_size, label=key) 
         # Plot All others        
-        if other_color.any():
+        if numpy.any(other_color):
+            print len(other_color), output.pix_symbol[other_color]
             ax.plot(pos_x[other_color], pos_z[other_color], pos_y[other_color], 
                     marker, c="k", alpha=0.5, markeredgecolor="k",