Changeset 62af27a9 in sasview

Timestamp:

Apr 26, 2013 12:49:19 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:

0d5768d

Parents:

7c38c90

Message:

fixed Tool standalone-side run.

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• data_operator.py (modified) (1 diff)
• density_panel.py (modified) (1 diff)
• gen_scatter_panel.py (modified) (3 diffs)
• kiessig_calculator_panel.py (modified) (1 diff)
• resolution_calculator_panel.py (modified) (1 diff)
• sld_panel.py (modified) (1 diff)
• slit_length_calculator_panel.py (modified) (1 diff)

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

@@ -956 +956 @@
         
 if __name__ == "__main__":
-   
+
     app  = wx.App()
+    widget.CHILD_FRAME = wx.Frame
     window = DataOperatorWindow(parent=None, data=[], title="Data Editor")
     app.MainLoop()

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

@@ -406 +406 @@
         """
         """
+        widget.CHILD_FRAME = wx.Frame
         frame = DensityWindow(None, title="Density/Volume Calculator")    
         frame.Show(True)

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

@@ -35 +35 @@
 from sans.perspectives.calculator.load_thread import GenReader
 from danse.common.plottools.arrow3d import Arrow3D
-from sans.perspectives.calculator import calculator_widgets as widget   
+from sans.perspectives.calculator import calculator_widgets as widget
+from sans.guiframe.events import NewPlotEvent    
 
 _BOX_WIDTH = 76
@@ -2011 +2012 @@
         """
         """
-        from sans.guiframe.events import NewPlotEvent 
-        wx.PostEvent(self.parent, NewPlotEvent(plot=plot, title=title))
-        """
-        frame = PlotFrame(self, -1, 'testView', self.scale2d)
-        add_icon(self.parent, frame)
-        frame.add_plot(plot)
-        frame.SetTitle(title)
-        frame.Show(True)
-        frame.SetFocus()
-        """
+        try: 
+            wx.PostEvent(self.parent, NewPlotEvent(plot=plot, title=title))
+        except:
+            # standalone
+            frame = PlotFrame(self, -1, 'testView', self.scale2d)
+            #add_icon(self.parent, frame)
+            frame.add_plot(plot)
+            frame.SetTitle(title)
+            frame.Show(True)
+            frame.SetFocus()
+
     def set_schedule_full_draw(self, panel=None, func='del'):  
         """
         Send full draw to gui frame
         """
-        self.parent.set_schedule_full_draw(panel, func)
+        if self.parent != None:
+            self.parent.set_schedule_full_draw(panel, func)
         
     def get_npix(self):
@@ -2132 +2135 @@
 if __name__ == "__main__": 
     app = wx.PySimpleApp()
+    widget.CHILD_FRAME = wx.Frame
     SGframe = SasGenWindow()    
     SGframe.Show(True)

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

@@ -216 +216 @@
 if __name__ == "__main__": 
     app = wx.PySimpleApp()
+    widget.CHILD_FRAME = wx.Frame
     frame = KiessigWindow()    
     frame.Show(True)

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

@@ -1428 +1428 @@
 if __name__ == "__main__": 
     app = wx.PySimpleApp()
+    widget.CHILD_FRAME = wx.Frame
     frame = ResolutionWindow()    
     frame.Show(True)

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

@@ -474 +474 @@
         """
         """
+        widget.CHILD_FRAME = wx.Frame
         frame = SldWindow(None, title='SLD Calculator')    
         frame.Show(True)

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

@@ -279 +279 @@
 if __name__ == "__main__": 
     app = wx.PySimpleApp()
+    widget.CHILD_FRAME = wx.Frame
     frame = SlitLengthCalculatorWindow()    
     frame.Show(True)