Changeset db7a82e in sasview for sansview

Timestamp:

Aug 11, 2011 1:15:30 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

fe857e2

Parents:

9e2e7e9

Message:

updated dataloader calls

Location:

sansview/scripts

Files:

• installer_generator.py (modified) (1 diff)
• sansview.py (modified) (2 diffs)
• setup_exe.py (modified) (1 diff)
• setup_mac.py (modified) (3 diffs)

sansview/scripts/installer_generator.py

@@ -41 +41 @@
         list = []
         #(ext, type, name, flags)
-        from DataLoader.loader import Loader
+        from sans.dataloader.loader import Loader
         wild_cards = Loader().get_wildcards()
         for item in wild_cards:

sansview/scripts/sansview.py

@@ -62 +62 @@
             self.gui.add_perspective(pr_plug)
         except:
+            raise
             logging.error("SansView: could not find P(r) plug-in module") 
             logging.error(sys.exc_value)  
@@ -71 +72 @@
             self.gui.add_perspective(invariant_plug)
         except:
+            raise
             logging.error("SansView: could not find Invariant plug-in module") 
             logging.error(sys.exc_value)  

sansview/scripts/setup_exe.py

@@ -98 +98 @@
     data_files.append((os.path.split(dirname)[0], [f]))
 
-# Copy the settings file for the DataLoader file extension associations
-import DataLoader.readers
-f = os.path.join(DataLoader.readers.get_data_path(),'defaults.xml')
+# Copy the settings file for the sans.dataloader file extension associations
+import sans.dataloader.readers
+f = os.path.join(sans.dataloader.readers.get_data_path(),'defaults.xml')
 if os.path.isfile(f):
     data_files.append(('.', [f]))

sansview/scripts/setup_mac.py

@@ -7 +7 @@
 from setuptools import setup
 import periodictable.xsf
-import DataLoader.readers 
+import sans.dataloader.readers 
 from distutils.sysconfig import get_python_lib
 import os
@@ -31 +31 @@
 
 #CANSAxml reader data files
-RESOURCES_FILES.append(os.path.join(DataLoader.readers.get_data_path(),'defaults.xml'))
+RESOURCES_FILES.append(os.path.join(sans.dataloader.readers.get_data_path(),'defaults.xml'))
 
 # Locate libxml2 library
@@ -53 +53 @@
         list = []
         EXCEPTION_LIST = ['*', '.', '']
-        from DataLoader.loader import Loader
+        from sans.dataloader.loader import Loader
         wild_cards = Loader().get_wildcards()
         for item in wild_cards: