Changeset fa81e94 in sasview for src/sas/sasgui/guiframe/local_perspectives

Timestamp:

Nov 15, 2017 4:33:09 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d4881f6a

Parents:

7c487846

Message:

Initial commit of the P(r) inversion perspective.
Code merged from Jeff Krzywon's ESS_GUI_Pr branch.
Also, minor 2to3 mods to sascalc/sasgui to enble error free setup.

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (2 diffs)
• SectorSlicer.py (modified) (1 diff)
• binder.py (modified) (2 diffs)
• boxSlicer.py (modified) (2 diffs)
• plotting.py (modified) (3 diffs)
• sector_mask.py (modified) (1 diff)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -475 +475 @@
             try:
                 self._onEVT_FUNC_PROPERTY()
-            except Exception, exc:
+            except (Exception, exc):
                 wx.PostEvent(self.parent,
                              StatusEvent(status="Plotting Error: %s" % str(exc), info="error"))
@@ -492 +492 @@
                     # MAC: forcing to plot 2D avg
                     self.canvas._onDrawIdle()
-            except Exception, exc:
+            except (Exception, exc):
                 wx.PostEvent(self.parent, StatusEvent(status=\
                     "Plotting Error: %s" % str(exc), info="error"))

src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -232 +232 @@
             msg = "Phi left and phi right are different"
             msg += " %f, %f" % (self.left_line.phi, self.right_line.phi)
-            raise ValueError, msg
+            raise (ValueError, msg)
         params["Phi [deg]"] = self.main_line.theta * 180 / numpy.pi
         params["Delta_Phi [deg]"] = numpy.fabs(self.left_line.phi * 180 / numpy.pi)

src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py

@@ -187 +187 @@
         # Check that the trigger is valid
         if trigger not in self._actions:
-            raise ValueError, "%s invalid --- valid triggers are %s" \
-                % (trigger, ", ".join(self.events))
+            raise (ValueError, "%s invalid --- valid triggers are %s" \
+                % (trigger, ", ".join(self.events)))
         # Register the trigger callback
         self._actions[trigger][artist] = action
@@ -203 +203 @@
         """
         if action not in self.events:
-            raise ValueError, "Trigger expects " + ", ".join(self.events)
+            raise (ValueError, "Trigger expects " + ", ".join(self.events))
         # Tag the event with modifiers
         for mod in ('alt', 'control', 'shift', 'meta'):

src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py

@@ -136 +136 @@
             if new_slab is None:
                 msg = "post data:cannot average , averager is empty"
-                raise ValueError, msg
+                raise (ValueError, msg)
             self.averager = new_slab
         if self.direction == "X":
@@ -152 +152 @@
         else:
             msg = "post data:no Box Average direction was supplied"
-            raise ValueError, msg
+            raise (ValueError, msg)
         # # Average data2D given Qx or Qy
         box = self.averager(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max,

src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

@@ -200 +200 @@
 
         msg = "1D Panel of group ID %s could not be created" % str(group_id)
-        raise ValueError, msg
+        raise (ValueError, msg)
 
     def create_2d_panel(self, data, group_id):
@@ -218 +218 @@
             return new_panel
         msg = "2D Panel of group ID %s could not be created" % str(group_id)
-        raise ValueError, msg
+        raise (ValueError, msg)
 
     def update_panel(self, data, panel):
@@ -238 +238 @@
             msg += " to panel %s\n" % str(panel.window_caption)
             msg += "Please edit %s's units, labels" % str(data.name)
-            raise ValueError, msg
+            raise (ValueError, msg)
         else:
             if panel.group_id not in data.list_group_id:

src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py

@@ -175 +175 @@
             msg += "different %f, %f" % (self.left_line.phi,
                                          self.right_line.phi)
-            raise ValueError, msg
+            raise (ValueError, msg)
         params["Phi"] = self.main_line.theta
         params["Delta_Phi"] = math.fabs(self.left_line.phi)