Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/simulation

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

Location:

src/sas/sasgui/perspectives/simulation

Files:

• ShapeAdapter.py (modified) (3 diffs)
• ShapeParameters.py (modified) (4 diffs)
• __init__.py (modified) (1 diff)
• simulation.py (modified) (1 diff)

src/sas/sasgui/perspectives/simulation/ShapeAdapter.py

@@ -87 +87 @@
             self.sim_canvas._model_changed()
         else:
-            raise ValueError, "SimShapeVisitor: Wrong class for visited object"
+            raise ValueError("SimShapeVisitor: Wrong class for visited object")
         
         
@@ -115 +115 @@
             self.sim_canvas._model_changed()
         else:
-            raise ValueError, "SimShapeVisitor: Wrong class for visited object"
+            raise ValueError("SimShapeVisitor: Wrong class for visited object")
         
     
@@ -130 +130 @@
             shape.accept_update(self)
         else:
-            raise ValueError, "ShapeAdapter: Shape [%s] not in list" % shape.name
+            raise ValueError("ShapeAdapter: Shape [%s] not in list" % shape.name)
 

src/sas/sasgui/perspectives/simulation/ShapeParameters.py

@@ -10 +10 @@
 from __future__ import print_function
 
+import sys
+from copy import deepcopy
+
 import wx
-import sys
 import wx.lib.newevent
-from copy import deepcopy
-import SimCanvas
+
+from . import SimCanvas
 
 (CreateShapeEvent, EVT_ADD_SHAPE) = wx.lib.newevent.NewEvent()
@@ -201 +203 @@
             n = 1
             self.parameters = []
-            keys = shape.params.keys()
-            keys.sort()
-            
-            for item in keys:
+            
+            for item in sorted(shape.params.keys()):
                 if item in ['contrast', 'order']:
                     continue
@@ -393 +393 @@
                 if not tmp==None:
                     self.current_shape.params[item[0]] = tmp 
-        except:
+        except Exception as exc:
             print("Could not create")
-            print(sys.exc_value)
+            print(exc)
                 
     def _onCreate(self, evt):
@@ -489 +489 @@
             print("NOT YET IMPLMENTED")
             print("renaming", self.shape_listbox.GetString(indices[0]))
-                

src/sas/sasgui/perspectives/simulation/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Simulation plug-in 1.0"
-from simulation import *
+from .simulation import *

src/sas/sasgui/perspectives/simulation/simulation.py

@@ -15 +15 @@
 
 # Application imports
-import SimCanvas
-import ShapeParameters
-import ShapeAdapter
+from sas.sascalc.realspace import VolumeCanvas
+from sas.sascalc.data_util.calcthread import CalcThread
 from sas.sasgui.guiframe.dataFitting import Data1D
-# Real-space simulation import
-import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
-
-from sas.sascalc.data_util.calcthread import CalcThread
 from sas.guicomm.events import NewPlotEvent, StatusEvent    
+
+from . import SimCanvas
+from . import ShapeParameters
+from . import ShapeAdapter
 
 logger = logging.getLogger(__name__)