Changeset 1de85f4 in sasview for calculatorview/src/sans

Timestamp:

Jan 23, 2013 5:52:09 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:

11363ee

Parents:

9e9e9a5

Message:

vector arrow draw bug fixed

File:

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

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

@@ -585 +585 @@
         self._update_model_params()
         if is_draw:
-            wx.CallAfter(self.sld_draw, False)
+            wx.CallAfter(self.sld_draw, None, False)
     
     def _update_model_params(self):
@@ -618 +618 @@
             pass
     
-    def sld_draw(self, has_arrow=False, event=None):
+    def sld_draw(self, event=None, has_arrow=True):
         """
         Draw 3D sld profile
         """
-        graph_title = self.file_name
-        graph_title += "   3D SLD Profile "
-        
         flag = self.parent.check_omfpanel_inputs()
         if not flag:
@@ -655 +652 @@
                 raise
         panel.dimension = 3   
-        self._sld_plot_helper(ax, output, has_arrow)
+        graph_title = self._sld_plot_helper(ax, output, has_arrow)
         # Use y, z axes (in mpl 3d) as z, y axes 
         # that consistent with our SANS detector coords.
@@ -682 +679 @@
         marker = ','
         m_size = 2
+        graph_title = self.file_name
+        graph_title += "   3D SLD Profile "
         pos_x = output.pos_x
         pos_y = output.pos_y
@@ -739 +738 @@
         # V. Draws magnetic vectors
         if has_arrow and len(pos_x) > 0:     
-            graph_title += "w/ Arrows" 
+            graph_title += " - Magnetic Vector as Arrow -" 
+            panel = self.plot_frame.plotpanel
             def _draw_arrow(input=None, elapsed=0.1):
                 """
@@ -780 +780 @@
                 status_type = 'stop'
                 self._status_info(msg, status_type) 
+            msg = "Arrow Drawing is in progress..."
+            status_type = 'progress'
+            self._status_info(msg, status_type) 
+            draw_out = CalcGen(input=ax,
+                             completefn=_draw_arrow, updatefn=self._update)
+            draw_out.queue()
+        return graph_title
  
     def set_input_params(self):
@@ -1923 +1930 @@
         sld draw
         """
-        self.panel.sld_draw(has_arrow=False)
+        self.panel.sld_draw(event=None, has_arrow=False)
         
     def on_save_file(self, event):