Changeset b9f6d83 in sasview for src/sans/perspectives

Timestamp:

Apr 1, 2014 7:23:29 AM (11 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:

aba5876

Parents:

b099388

Message:

Re #216 Merging wx30 branch

Location:

src/sans/perspectives

Files:

• calculator/media/data_oper_pic.png (modified) (previous)
• fitting/batchfitpage.py (modified) (1 diff)
• fitting/fitpage.py (modified) (2 diffs)
• invariant/media/bookmark.png (modified) (previous)
• invariant/media/redo.png (modified) (previous)
• invariant/media/report.png (modified) (previous)
• invariant/media/save.png (modified) (previous)
• invariant/media/undo.png (modified) (previous)

src/sans/perspectives/fitting/batchfitpage.py

@@ -25 +25 @@
     window_caption  = "BatchFit"
 
-    def __init__(self, parent, color='rand'):
+    def __init__(self, parent, color=None):
         """ 
         Initialization of the Panel

src/sans/perspectives/fitting/fitpage.py

@@ -37 +37 @@
     """
 
-    def __init__(self, parent, color='rand'):
+    def __init__(self, parent, color=None):
         """
         Initialization of the Panel
@@ -137 +137 @@
                 if not is_data:
                     is_data = check_data_validity(data)
-        self.dataSource.SetSelection(0)
-        self.on_select_data(event=None)
+        if is_data:
+            self.dataSource.SetSelection(0)
+            self.on_select_data(event=None)
                 
     def on_select_data(self, event=None):