Changeset 225aca8 in sasview for src/sas/guiframe/local_perspectives

Timestamp:

Jul 28, 2015 12:14:38 PM (10 years ago)

Author:

mathieu

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:

a910c788

Parents:

ae2a197 (diff), d06c34c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #3 from SasView?/standalone_cleanup

Standalone cleanup

Location:

src/sas/guiframe/local_perspectives

Files:

• data_loader/data_loader.py (modified) (1 diff)
• plotting/plotting.py (modified) (1 diff)
• plotting/Plotter1D.py (modified) (1 diff)
• plotting/Plotter2D.py (modified) (1 diff)
• plotting/SimplePlot.py (modified) (2 diffs)

src/sas/guiframe/local_perspectives/data_loader/data_loader.py

@@ -41 +41 @@
 class Plugin(PluginBase):
 
-    def __init__(self, standalone=False):
-        PluginBase.__init__(self, name="DataLoader", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="DataLoader")
         # Default location
         self._default_save_location = DEFAULT_OPEN_FOLDER

src/sas/guiframe/local_perspectives/plotting/plotting.py

@@ -36 +36 @@
     """
 
-    def __init__(self, standalone=False):
-        PluginBase.__init__(self, name="Plotting", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="Plotting")
 
         ## Plot panels

src/sas/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -564 +564 @@
             self._slicerpop.Append(wx_id, '&Print Image', 'Print image ')
             wx.EVT_MENU(self, wx_id, self.onPrint)
-            wx_id = wx.NewId()
-            self._slicerpop.Append(wx_id, '&Print Preview', 'Print preview')
-            wx.EVT_MENU(self, wx_id, self.onPrinterPreview)
 
             wx_id = wx.NewId()

src/sas/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -300 +300 @@
 
         wx_id = wx.NewId()
-        slicerpop.Append(wx_id, '&Print Preview', 'Print preview')
-        wx.EVT_MENU(self, wx_id, self.onPrinterPreview)
-
-        wx_id = wx.NewId()
         slicerpop.Append(wx_id, '&Copy to Clipboard', 'Copy to the clipboard')
         wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu)

src/sas/guiframe/local_perspectives/plotting/SimplePlot.py

@@ -58 +58 @@
         slicerpop.Append(wx_id, '&Print Image', 'Print image')
         wx.EVT_MENU(self, wx_id, self.onPrint)
-
-        wx_id = wx.NewId()
-        slicerpop.Append(wx_id, '&Print Preview', 'Print preview')
-        wx.EVT_MENU(self, wx_id, self.onPrinterPreview)
 
         wx_id = wx.NewId()
@@ -234 +230 @@
         wx.EVT_MENU(self, id, self.on_print_image)
 
-        id = wx.NewId()
-        item = wx.MenuItem(menu, id, "&Print Preview")
-        item.SetBitmap(preview_bmp)
-        menu.AppendItem(item)
-        wx.EVT_MENU(self, id, self.on_print_preview)
-
         menu.AppendSeparator()
         id = wx.NewId()