Changeset 2310d69 in sasview

Timestamp:

Jun 11, 2008 2:10:48 PM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

4101eea

Parents:

de9483d

Message:

Improved context menu functionality

Location:

guiframe

Files:

• gui_manager.py (modified) (6 diffs)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)
• release_notes.txt (modified) (2 diffs)

guiframe/gui_manager.py

@@ -64 +64 @@
 
         ## Next available ID for wx gui events 
+        #TODO:  No longer used - remove all calls to this 
         self.next_id = 20000
+
+        # Default locations
+        self._default_save_location = os.getcwd()        
 
         ## Default welcome panel
@@ -199 +203 @@
                               CenterPane().
                               BestSize(wx.Size(900,800)).
-                              MinSize(wx.Size(900,800)).
+                              MinSize(wx.Size(800,700)).
                               Show())
 
@@ -216 +220 @@
                                           CenterPane().
                                           BestSize(wx.Size(600,600)).
-                                          MinSize(wx.Size(600,600)).
+                                          MinSize(wx.Size(200,200)).
                                           Hide())
                 
@@ -235 +239 @@
                                   #Show().
                                   BestSize(wx.Size(400,400)).
-                                  MinSize(wx.Size(100,100)))
-                
-        
-    def get_context_menu(self):
+                                  MinSize(wx.Size(300,200)))
+                
+        
+    def get_context_menu(self, graph=None):
         """
             Get the context menu items made available 
@@ -247 +251 @@
         for item in self.plugins:
             if hasattr(item, "get_context_menu"):
-                menu_list.extend(item.get_context_menu())
+                menu_list.extend(item.get_context_menu(graph))
             
         return menu_list
@@ -533 +537 @@
         #TODO: clean this up
         from data_loader import choose_data_file
-        return choose_data_file(self)
+        path = choose_data_file(self, self._default_save_location)
+        if not path==None:
+            try:
+                self._default_save_location = os.path.dirname(path)
+            except:
+                pass
+        return path
+    
+    def load_ascii_1D(self, path):
+        from data_loader import load_ascii_1D
+        return load_ascii_1D(path)
                   
 class DefaultPanel(wx.Panel):

guiframe/local_perspectives/plotting/plotting.py

@@ -118 +118 @@
         
         slicerpop.AppendSeparator()
-        item_list = self.parent.get_context_menu()
+        item_list = self.parent.get_context_menu(self.graph)
         if not item_list==None:
             for item in item_list:
@@ -131 +131 @@
         slicerpop.AppendSeparator()
         
+        #id = wx.NewId()
+        #slicerpop.Append(id, '&Toggle Linear/Log scale')
+        #wx.EVT_MENU(self, id, self._onToggleScale)
+
         id = wx.NewId()
-        slicerpop.Append(id, '&Toggle Linear/Log scale')
-        wx.EVT_MENU(self, id, self._onToggleScale)
+        slicerpop.Append(id, '&Change scale')
+        wx.EVT_MENU(self, id, self._onProperties)
 
         pos = event.GetPosition()

guiframe/release_notes.txt

@@ -6 +6 @@
 Documentation to come...
 
-1- Version 0.1.0
+1- Version 0.1.1
 
         - Release date: 5/28/2008
+
+        - Changes:
+                * the Plugin.get_context_menu(graph) now takes a Graph object
 
 Dependencies:
@@ -31 +34 @@
           for additionally installed plug-ins.
         - Fix the damned images directory folder...
+        - Allow user to remove a plottable from a graph (from code!)
+        - Allow perspectives to recognize their own plots and add context menu items.
+        - Catch error when trying to show log of negative or zero plots... update status bar.