Changeset fa09d62 in sasview for src/sas/perspectives/fitting/fitpanel.py

Timestamp:

Feb 18, 2015 12:01:28 PM (9 years ago)

Author:

krzywon

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:

e1251ef

Parents:

3fd3d5a4

Message:

Modified the batch fit panel to give a warning/message saying the file
selecctor is for selecting initial parameters rather than viewing fits.
This is a fix to ticket #234.

File:

• src/sas/perspectives/fitting/fitpanel.py (modified) (3 diffs)

src/sas/perspectives/fitting/fitpanel.py

@@ -371 +371 @@
         """
         from fitpage import FitPage
-        panel = FitPage(parent=self)
+        from batchfitpage import BatchFitPage
         if self.batch_on:
+            panel = BatchFitPage(parent=self)
             self.batch_page_index += 1
             caption = "BatchPage" + str(self.batch_page_index)
@@ -378 +379 @@
         else:
             #Increment index of fit page
+            panel = FitPage(parent=self)
             self.fit_page_index += 1
             caption = "FitPage" + str(self.fit_page_index)
@@ -467 +469 @@
         if data_1d_list and data_2d_list:
             # need to warning the user that this batch is a special case
-            from sas import BatchDataDialog
+            from sas.perspectives.fitting.fitting_widgets import BatchDataDialog
             dlg = BatchDataDialog(self)
             if dlg.ShowModal() == wx.ID_OK: