Changeset 9e00363 in sasview for calculatorview/src/sans

Timestamp:

Jun 21, 2012 5:00:16 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:

f5500b3

Parents:

ffdfd23

Message:

minor mac bug fixes

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• data_operator.py (modified) (3 diffs)
• model_editor.py (modified) (2 diffs)

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

@@ -25 +25 @@
     _BOX_WIDTH = 230
     PANEL_WIDTH = 890
-    PANEL_HEIGTH = 470
+    PANEL_HEIGTH = 430
     FONT_VARIANT = 1
     ON_MAC = True
@@ -626 +626 @@
 
         self.erase_legend()
-        self.figure.tight_layout()
-        #self.figure.subplots_adjust(left=0.1, bottom=0.1)
-
+        try:
+            # mpl >= 1.1.0
+            self.figure.tight_layout()
+        except:
+            self.figure.subplots_adjust(left=0.1, bottom=0.1)
         self.subplot.figure.canvas.draw()
 
@@ -662 +664 @@
         except:
             self.subplot.set_frame_on(False)
-        self.figure.tight_layout()
-        #self.figure.subplots_adjust(left=0.1, bottom=0.1)
+        try:
+            # mpl >= 1.1.0
+            self.figure.tight_layout()
+        except:
+            self.figure.subplots_adjust(left=0.1, bottom=0.1)
         if len(label) > 0 and xpos > 0 and ypos > 0:
             new_text = self.subplot.text(str(xpos), str(ypos), str(label),

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

@@ -20 +20 @@
     FONT_VARIANT = 1
     PNL_WIDTH = 590
-    PNL_HITE = 400
+    PNL_HITE = 350
 M_NAME = 'Model'
 EDITOR_WIDTH = 800
@@ -375 +375 @@
         On Select an Operator
         """
+        # For Mac
+        if event != None:
+            event.Skip()
+            
         item = event.GetEventObject()
         text = item.GetLabel().strip()