Changeset e2271c5 in sasview

Timestamp:

Apr 6, 2013 10:10:31 AM (11 years ago)

Author:

Anders Markvardsen <anders.markvardsen@…>

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:

cb270ad2

Parents:

476977b

Message:

Prepare to move corfunc perspective code out of trunk into branch

Files:

• corfunc/MANIFEST.IN (deleted)
• corfunc/README.txt (deleted)
• corfunc/corfunc_eula.txt (deleted)
• corfunc/license.txt (deleted)
• corfunc/release_notes.txt (deleted)
• corfunc/setup.py (deleted)
• corfunc/src/sans/__init__.py (deleted)
• corfunc/src/sans/corfunc/__init__.py (deleted)
• corfunc/src/sans/corfunc/corfunc.py (deleted)
• corfuncview/MANIFEST.IN (deleted)
• corfuncview/README.txt (deleted)
• corfuncview/corfunc_eula.txt (deleted)
• corfuncview/license.txt (deleted)
• corfuncview/release_notes.txt (deleted)
• corfuncview/setup.py (deleted)
• corfuncview/src/sans/__init__.py (deleted)
• corfuncview/src/sans/perspectives/__init__.py (deleted)
• corfuncview/src/sans/perspectives/corfunc/__init__.py (deleted)
• corfuncview/src/sans/perspectives/corfunc/corfunc.py (deleted)
• sansview/sansview.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

sansview/sansview.py

@@ -104 +104 @@
             logging.error(sys.exc_value)  
         
-        #Corfunc perspective   
-        try:
-            import sans.perspectives.corfunc as module    
-            corfunc_plug = module.Plugin(standalone=False)
-            self.gui.add_perspective(corfunc_plug)
-        except:
-            logging.error("%s: could not find Corfunc plug-in module"% \
-                                                        APP_NAME)
-            logging.error(sys.exc_value)  
-        
             
         # Add welcome page

setup.py

@@ -135 +135 @@
 package_dir["sans.calculator"] = "sanscalculator/src/sans/calculator"
 packages.extend(["sans.calculator"])
-
-# sans.corfunc
-package_dir["sans.corfunc"] = "corfunc/src/sans/corfunc"
-packages.extend(["sans.corfunc"])
     
 # sans.pr
@@ -192 +188 @@
                                 "src", "sans", "perspectives", "calculator")
 package_data['sans.perspectives.calculator'] = ['images/*', 'media/*']
-packages.extend(["sans.perspectives", "sans.perspectives.calculator"])
-     
-# Calculator view
-package_dir["sans.perspectives"] = "corfuncview/src/sans/perspectives"
-package_dir["sans.perspectives.corfunc"] = os.path.join("corfuncview", 
-                                "src", "sans", "perspectives", "corfunc")
-package_data['sans.perspectives.corfunc'] = ['images/*', 'media/*']
-packages.extend(["sans.perspectives", "sans.perspectives.corfunc"])     
+packages.extend(["sans.perspectives", "sans.perspectives.calculator"])    
      
 # Data util