Changeset df7046f in sasview for guiframe

Timestamp:

Jan 21, 2011 3:35:47 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:

c26a64b

Parents:

cacbd7d

Message:

working on loading multiple file

Location:

guiframe/local_perspectives

Files:

• data_loader/data_loader.py (modified) (4 diffs)
• plotting/Plotter1D.py (modified) (1 diff)

guiframe/local_perspectives/data_loader/data_loader.py

@@ -6 +6 @@
 import sys
 import wx
+import logging
 
 from DataLoader.loader import Loader
@@ -192 +193 @@
         """
         message = ""
+        log_msg = ''
         output = []
         error_message = ""
@@ -199 +201 @@
             if flag:
                 if extension.lower() in EXTENSIONS:
-                    error_message = "Cannot load: %s\n" % str(p_file)
-                    error_message += "Try File -> open ...."
+                    log_msg = "Data Loader cannot "
+                    log_msg += "load: %s\n" % str(p_file)
+                    log_msg += "Try File -> open ...."
+                    logging.info(log_msg)
                     continue
             else:
                 if extension.lower() not in EXTENSIONS:
-                    error_message = "Cannot load: %s\n" % str(p_file)
-                    error_message += "Try Data -> Load ...."
+                    log_msg = "File Loader cannot"
+                    log_msg += " load: %s\n" % str(p_file)
+                    log_msg += "Try Data -> Load ...."
+                    logging.info(log_msg)
                     continue
             try:
@@ -223 +229 @@
                 self.load_update(output=output, message=error_message)
                 
-        message = "Loading Complete!"
+        message = "Loading Complete! "
+        message += log_msg
         self.load_complete(output=output, error_message=error_message,
                        message=message, path=path)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -22 +22 @@
 from danse.common.plottools.plottables import Graph
 from sans.guiframe import dataFitting 
-from sans.guicomm.events import EVT_NEW_PLOT
-from sans.guicomm.events import StatusEvent 
-from sans.guicomm.events import NewPlotEvent
-from sans.guicomm.events import SlicerEvent
-from sans.guicomm.events import ErrorDataEvent
-from sans.guicomm.events import RemoveDataEvent
-from sans.guicomm.events import AddManyDataEvent
+from sans.guiframe.events import EVT_NEW_PLOT
+from sans.guiframe.events import StatusEvent 
+from sans.guiframe.events import NewPlotEvent
+from sans.guiframe.events import SlicerEvent
+from sans.guiframe.events import ErrorDataEvent
+from sans.guiframe.events import RemoveDataEvent
+from sans.guiframe.events import AddManyDataEvent
 from sans.guiframe.utils import PanelMenu
 from sans.guiframe.dataFitting import Data1D