Changeset d792e813 in sasview

Timestamp:

Apr 22, 2010 2:07:22 PM (15 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:

85a8e95

Parents:

efea0bd

Message:

disable append data1d into theory panel

File:

• guiframe/data_loader.py (modified) (4 diffs)

guiframe/data_loader.py

@@ -11 +11 @@
 from sans.guicomm.events import NewPlotEvent, StatusEvent
 
+def enable_add_data(existing_panel, new_plot):
+    """
+        Enable append data on a plot panel
+    """
+    is_theory = len(existing_panel.plots)<= 1 and \
+        existing_panel.plots.values()[0].__class__.__name__=="Theory1D"
+        
+    is_data2d = hasattr(new_plot, 'data')
+    is_data1d = existing_panel.__class__.__name__ == "ModelPanel1D"\
+        and existing_panel.group_id is not None
+   
+    return is_data1d and not is_data2d and not is_theory
 
 def parse_name(name, expression):
@@ -41 +53 @@
     return path
 
-def append_data_to_existing_panel(panel_name, data_name):
+def open_dialog_append_data(panel_name, data_name):
     """
         Pop up an error message.
@@ -202 +214 @@
                 panel_name = existing_panel.window_caption
                 data_name = new_plot.name
-                if existing_panel.__class__.__name__ == "ModelPanel1D"\
-                    and existing_panel.group_id is not None and \
-                        not hasattr(new_plot, 'data'):
-                    if append_data_to_existing_panel(panel_name, data_name):
+                if enable_add_data(existing_panel, new_plot):
+                    if open_dialog_append_data(panel_name, data_name):
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id
@@ -261 +271 @@
                 panel_name = existing_panel.window_caption
                 data_name = new_plot.name
-                if existing_panel.__class__.__name__ == "ModelPanel1D"\
-                    and existing_panel.group_id is not None and \
-                    not hasattr(new_plot, 'data'):
-                    if append_data_to_existing_panel(panel_name, data_name):
+                if enable_add_data(existing_panel, new_plot):
+                    if open_dialog_append_data(panel_name, data_name):
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id