Changeset aaaf9b4 in sasview for calculatorview/src/sans/perspectives

Timestamp:

Dec 19, 2012 9:56:14 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:

5ebdf14

Parents:

9714ff5

Message:

mac: shape combobox problem fixed

File:

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

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

@@ -49 +49 @@
     FONT_VARIANT = 0
 else:
-    PANEL_WIDTH = 600
-    PANEL_HEIGHT = 420
+    PANEL_WIDTH = 620
+    PANEL_HEIGHT = 370
     FONT_VARIANT = 1
 _QMAX_DEFAULT = 0.1
@@ -251 +251 @@
         """
         hint_msg = "We support the omf or sld data files only."
-        hint_msg +=  "           "
-        hint_msg +=  "Very slow drawing -->"
+        hint_msg +=  "         "
+        if FONT_VARIANT < 1:
+            hint_msg +=  "Very "
+        hint_msg += "SLOW drawing -->"
         hint_txt = wx.StaticText(self, -1, hint_msg)
         
@@ -291 +293 @@
         """
         event.Skip()
-        label = self.shape_combo.GetLabel().lower() 
+        label = event.GetEventObject().GetValue().lower() 
         self.default_shape = label
         self.parent.set_omfpanel_default_shap(self.default_shape)
@@ -618 +620 @@
                 pos_z, ',', c="k", 
                 alpha=0.5, markeredgecolor='k', markersize=3) 
-
+        ax.plot_surface(pos_x, pos_y, pos_z,  rstride=4, cstride=4, color='b')
         if has_arrow and len(pos_x) > 0:     
             graph_title += "w/ Arrows"