Changeset 783940c in sasview for guiframe/local_perspectives/plotting

Timestamp:

Mar 21, 2011 3:00:52 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

6512644

Parents:

119dc89

Message:

working on the splashpage

File:

• guiframe/local_perspectives/plotting/plotting.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/plotting.py

@@ -87 +87 @@
             panel.remove_data_by_id(id=id)
             return True
-        else:
-            msg = "Panel with GROUP_ID: %s cannot be located" % str(group_id)
-            raise ValueError, msg
+        return False
+        
+    def clear_panel(self, group_id):
+        """
+        clear the graph
+        """
+        if group_id in self.plot_panels.keys():
+            panel = self.plot_panels[group_id]
+            panel.graph.reset()
+            return True
+        return False
+            
         
     def hide_panel(self, group_id):
@@ -170 +179 @@
         _, x_unit =  data.get_xaxis()
         _, y_unit =  data.get_yaxis()
-        if x_unit != panel.graph.prop["xunit"] \
-            or  y_unit != panel.graph.prop["yunit"]:
+        flag_x = (panel.graph.prop["xunit"] is not None) and \
+                    (panel.graph.prop["xunit"].strip() != "") and\
+                    (x_unit != panel.graph.prop["xunit"])
+        flag_y = (panel.graph.prop["yunit"] is not None) and \
+                    (panel.graph.prop["yunit"].strip() != "") and\
+                    (x_unit != panel.graph.prop["yunit"])
+        if (flag_x and flag_y):
             msg = "Cannot add %s" % str(data.name)
             msg += " to panel %s\n" % str(panel.window_caption)
@@ -224 +238 @@
             if event.action.lower() == 'delete':
                 return self.delete_panel(group_id)
+            if event.action.lower() == "clear":
+                return self.clear_panel(group_id)
+            
         title = None
         if hasattr(event, 'title'):