Changeset 8abbb12 in sasview

Timestamp:

Aug 12, 2011 3:27:07 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:

2f5d888

Parents:

f1044e9

Message:

some updates

Location:

prview

Files:

• PrView.py (modified) (2 diffs)
• installer.iss (modified) (1 diff)
• local_config.py (modified) (1 diff)
• setup_exe.py (modified) (2 diffs)

prview/PrView.py

@@ -34 +34 @@
         #self.gui = gui_manager.ViewApp(0) 
         self.gui = PrApp(0)
+         # Set the application manager for the GUI
+        self.gui.set_manager(self)
+        
         # Add perspectives to the basic application
         # Additional perspectives can still be loaded
@@ -44 +47 @@
         self.gui.build_gui()
         
-        # Set the application manager for the GUI
-        self.gui.set_manager(self)
-        
+       
         # Start the main loop
         self.gui.MainLoop()  

prview/installer.iss

@@ -3 +3 @@
 
 [Setup]
-AppName=PrView-0.3
-AppVerName=PrView 0.3
+AppName=PrView-0.9.1
+AppVerName=PrView 0.9.1
 AppPublisher=University of Tennessee
 AppPublisherURL=http://danse.chem.utk.edu/
 AppSupportURL=http://danse.chem.utk.edu/
 AppUpdatesURL=http://danse.chem.utk.edu/
-DefaultDirName={pf}\PrView-0.3
-DefaultGroupName=DANSE\PrView-0.3
+DefaultDirName={pf}\PrView-0.9.1
+DefaultGroupName=DANSE\PrView-0.9.1
 DisableProgramGroupPage=yes
 LicenseFile=license.txt

prview/local_config.py

@@ -56 +56 @@
 APPLICATION_WLIST = 'P(r) files (*.prv)|*.prv'
 DEFAULT_STYLE = GUIFRAME.DEFAULT_STYLE
-GUIFRAME_WIDTH = 900
+GUIFRAME_WIDTH = 1000
 GUIFRAME_HEIGHT = 780
 PLUGIN_STATE_EXTENSIONS = ['.prv']

prview/setup_exe.py

@@ -67 +67 @@
         self.__dict__.update(kw)
         # for the versioninfo resources
-        self.version = "0.3"
+        self.version = "0.9.1"
         self.company_name = "U Tennessee"
         self.copyright = "copyright 2009"
@@ -76 +76 @@
 # to use the MatPlotLib.
 #
+path = os.getcwd()
+plugins_dir = os.path.join(path, "plugins")
+images_dir = os.path.join(path, "images")
+test_dir = os.path.join(path, "test")
+
 matplotlibdatadir = matplotlib.get_data_path()
 matplotlibdata = findall(matplotlibdatadir)
 data_files = []
 
+import sans.guiframe as guiframe
+data_files += guiframe.data_files()
+
 for f in matplotlibdata:
     dirname = os.path.join('mpl-data', f[len(matplotlibdatadir)+1:])
     data_files.append((os.path.split(dirname)[0], [f]))
-
+   
+f = 'local_config.py'
+if os.path.isfile(f):
+    data_files.append(('.', [f]))  
+f = 'custom_config.py'
+if os.path.isfile(f):
+    data_files.append(('.', [f]))    
 # Copying the images directory to the distribution directory.
-for f in findall('images'):
+for f in findall(images_dir):
     if os.path.split(f)[0].count('.svn')==0:
-        data_files.append((os.path.split(f)[0], [f]))
+        data_files.append(("images", [f]))
 
 # Copying the sample data user data
-for f in findall('test'):
+for f in findall(test_dir):
     if os.path.split(f)[0].count('.svn')==0:
-        data_files.append((os.path.split(f)[0], [f]))
+        data_files.append(("test", [f]))
         
 # Copying the sample data user data
-for f in findall('plugins'):
+for f in findall(plugins_dir):
     if os.path.split(f)[0].count('.svn')==0:
-        data_files.append((os.path.split(f)[0], [f]))
-    
+        data_files.append(("plugins", [f]))  
 #
 # packages