Changeset 7aa1685 in sasview for calculatorview/src/sans/perspectives/calculator/calculator.py

Timestamp:

Apr 24, 2013 12:16:12 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:

b07ffca

Parents:

9159cb9

Message:

put most tools in MDI.

File:

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

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

@@ -113 +113 @@
                                                     manager=self, data=[],
                                                     title="Data Editor")
-            self.put_icon(self.data_edit_frame)
-        self.data_edit_frame.Show(False)    
+            #self.put_icon(self.data_edit_frame)
+        else:
+            self.data_edit_frame.Show(False)    
         self.data_edit_frame.Show(True)
               
@@ -126 +127 @@
                                                 manager=self, 
                                                 title="Data Operation")
-            self.put_icon(self.data_operator_frame)
-        self.data_operator_frame.Show(False)
+            #self.put_icon(self.data_operator_frame)
+        else:
+            self.data_operator_frame.Show(False)
         self.data_operator_frame.panel.set_panel_on_focus(None)
         self.data_operator_frame.Show(True)
@@ -137 +139 @@
         if self.kiessig_frame == None:
             frame = KiessigWindow(parent=self.parent, manager=self)
-            self.put_icon(frame)
+            #self.put_icon(frame)
             self.kiessig_frame = frame
-        self.kiessig_frame.Show(False)
+        else:
+            self.kiessig_frame.Show(False)
         self.kiessig_frame.Show(True) 
         
@@ -147 +150 @@
         """
         if self.sld_frame == None:
-            frame = SldWindow(base=self.parent, manager=self)
-            self.put_icon(frame)
+            frame = SldWindow(parent=self.parent, 
+                                  base=self.parent, manager=self)
+            #self.put_icon(frame)
             self.sld_frame = frame
-        self.sld_frame.Show(False)
+        else:
+            self.sld_frame.Show(False)
         self.sld_frame.Show(True) 
     
@@ -158 +163 @@
         """
         if self.cal_md_frame == None:
-            frame = DensityWindow(base=self.parent, manager=self)
-            self.put_icon(frame)
+            frame = DensityWindow(parent=self.parent, 
+                                  base=self.parent, manager=self)
+            #self.put_icon(frame)
             self.cal_md_frame = frame
-        self.cal_md_frame.Show(False)
+        else:
+            self.cal_md_frame.Show(False)
         self.cal_md_frame.Show(True) 
               
@@ -170 +177 @@
         if self.cal_slit_frame == None:
             frame = SlitLengthCalculatorWindow(parent=self.parent, manager=self)  
-            self.put_icon(frame)
+            #self.put_icon(frame)
             self.cal_slit_frame = frame 
-        self.cal_slit_frame.Show(False)     
+        else:
+            self.cal_slit_frame.Show(False)     
         self.cal_slit_frame.Show(True)
         
@@ -183 +191 @@
             self.put_icon(frame)
             self.cal_res_frame = frame
-        self.cal_res_frame.Show(False)
+        else:
+            self.cal_res_frame.Show(False)
         self.cal_res_frame.Show(True) 
         
@@ -192 +201 @@
         if self.gen_frame == None:
             frame = SasGenWindow(parent=self.parent, manager=self)
-            self.put_icon(frame)
+            #self.put_icon(frame)
             self.gen_frame = frame
-        self.gen_frame.Show(False)
+        else:
+            self.gen_frame.Show(False)
         self.gen_frame.Show(True) 
 
@@ -225 +235 @@
             self.put_icon(frame)
             self.py_frame = frame
-        self.py_frame.Show(False)
+        else:
+            self.py_frame.Show(False)
         self.py_frame.Show(True)