Changeset 3e001f9 in sasview for calculatorview

Timestamp:

Apr 6, 2013 1:36:03 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:

4bdd4fdb

Parents:

cb270ad2

Message:

Added tools, imageviwer and qrange cursors

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• calculator.py (modified) (4 diffs)
• gen_scatter_panel.py (modified) (4 diffs)
• help_panel.py (modified) (1 diff)
• image_viewer.py (added)
• media/load_image.bmp (added)
• media/load_image_help.html (added)
• media/pic_convert.bmp (added)
• media/pic_plot.bmp (added)

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

@@ -66 +66 @@
         gensans_help = "Generic SANS"
         pyconsole_help = "Python Console."
+        imageviewer_help = "Load an image file and display the image."
         #data_editor_help = "Meta Data Editor"
         return [("Data Operation", 
@@ -80 +81 @@
                 ("Generic Scattering Calculator", 
                         gensans_help, self.on_gen_model),
-                ("Python Shell/Editor", pyconsole_help, self.on_python_console)]
+                ("Python Shell/Editor", pyconsole_help, self.on_python_console),
+                ("Image Viewer", imageviewer_help, self.on_image_viewer),]
               
     def on_edit_data(self, event):
@@ -162 +164 @@
         self.put_icon(frame)
         frame.Show(True) 
+
+    def on_image_viewer(self, event):
+        """
+        Get choose an image file dialog
+        
+        :param event: menu event
+        """
+        from sans.perspectives.calculator.image_viewer import ImageView
+        image_view = ImageView(parent=self.parent)
+        image_view.load()
         
     def on_python_console(self, event):
@@ -193 +205 @@
                 except:
                     pass      
-  
-    

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

@@ -662 +662 @@
         output = self.sld_data  
         #frame_size = wx.Size(470, 470)    
-        self.plot_frame = PlotFrame(self, -1, 'testView')
+        self.plot_frame = PlotFrame(self.parent.parent, -1, 'testView')
         frame = self.plot_frame
         frame.Show(False)
@@ -1790 +1790 @@
         return flag
 
-class SasGenWindow(wx.Frame):
+class SasGenWindow(wx.MDIChildFrame):
     """
     GEN SAS main window
@@ -1802 +1802 @@
         kwds['title'] = title
         
-        wx.Frame.__init__(self, parent, *args, **kwds)
+        wx.MDIChildFrame.__init__(self, parent, *args, **kwds)
         self.parent = parent
         self.omfpanel = OmfPanel(parent=self)
@@ -2002 +2002 @@
         """
         """
-        frame = PlotFrame(self, -1, 'testView', self.scale2d)
+        frame = PlotFrame(self.parent, -1, 'testView', self.scale2d)
         add_icon(self.parent, frame)
         frame.add_plot(plot)

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

@@ -84 +84 @@
             <li><a href ="pycrust_help.html" 
             target ="showframe">Python Shell</a><br></li>
+            <li><a href ="load_image_help.html" 
+            target ="showframe">Image Viewer</a><br></li>
             </ul>
             </body>