From ca01c80d24378f41e43100df9d7fc4385552ccda Mon Sep 17 00:00:00 2001 From: Gama Anderson Date: Fri, 10 Mar 2017 16:26:21 +0100 Subject: [PATCH] solve bug --- artview/components/display_select_region.py | 2 +- artview/components/select_region.py | 4 +++- artview/modes.py | 2 +- artview/plugins/{manual_filter.py => manual_edit.py} | 10 +++++----- 4 files changed, 10 insertions(+), 8 deletions(-) rename artview/plugins/{manual_filter.py => manual_edit.py} (97%) diff --git a/artview/components/display_select_region.py b/artview/components/display_select_region.py index a78a6a9..9f901bd 100644 --- a/artview/components/display_select_region.py +++ b/artview/components/display_select_region.py @@ -345,7 +345,7 @@ def closeEvent(self, QCloseEvent): warnings.warn( "Reseting SelectRegion fails with following error\n" + error) self.disconnect() - super(SelectRegion, self).closeEvent(QCloseEvent) + super(DisplaySelectRegion, self).closeEvent(QCloseEvent) def displayStats(self): '''Calculate basic statistics of the SelectRegion list.''' diff --git a/artview/components/select_region.py b/artview/components/select_region.py index fdf09f2..d6b52b3 100644 --- a/artview/components/select_region.py +++ b/artview/components/select_region.py @@ -324,7 +324,7 @@ def resetSelectRegion(self): '''Clear the SelectRegion lines from plot and reset things.''' if self.polys: for poly in self.polys: - for i in xrange(len(poly)): + for i in range(len(poly)): try: poly[i].remove() except: @@ -350,6 +350,8 @@ def closeEvent(self, QCloseEvent): error = traceback.format_exc() warnings.warn( "Reseting SelectRegion fails with following error\n" + error) + import warnings + warnings.warn("a waring\n") self.disconnect() super(SelectRegion, self).closeEvent(QCloseEvent) diff --git a/artview/modes.py b/artview/modes.py index 8cd22bc..24c4601 100644 --- a/artview/modes.py +++ b/artview/modes.py @@ -219,7 +219,7 @@ def manual_unfold_mode(): def manual_filter_mode(): change_mode( - [FileNavigator, RadarDisplay, SelectRegion, ManualFilter], + [FileNavigator, RadarDisplay, SelectRegion, ManualEdit], [ ((0, 'Vradar'), (1, 'Vradar')), ((1, 'VplotAxes'), (2, 'VplotAxes')), diff --git a/artview/plugins/manual_filter.py b/artview/plugins/manual_edit.py similarity index 97% rename from artview/plugins/manual_filter.py rename to artview/plugins/manual_edit.py index f8b48d1..875a899 100644 --- a/artview/plugins/manual_filter.py +++ b/artview/plugins/manual_edit.py @@ -20,7 +20,7 @@ from ..core import Component, Variable, common, QtWidgets, QtCore, componentsList -class ManualFilter(Component): +class ManualEdit(Component): ''' Use of Points to remove data from Radar. ''' @@ -34,12 +34,12 @@ class ManualFilter(Component): def guiStart(self, parent=None): '''Graphical interface for starting this class.''' kwargs, independent = \ - common._SimplePluginStart("ManualFilter").startDisplay() + common._SimplePluginStart("ManualEdit").startDisplay() kwargs['parent'] = parent return self(**kwargs), independent def __init__(self, Vradar=None, Vpoints=None, Vfield=None, - Vgatefilter=None, name=" ManualFilter", parent=None): + Vgatefilter=None, name=" ManualEdit", parent=None): '''Initialize the class to create the interface. Parameters @@ -63,7 +63,7 @@ def __init__(self, Vradar=None, Vpoints=None, Vfield=None, If None, then Qt owns, otherwise associated with parent PyQt instance. ''' - super(ManualFilter, self).__init__(name=name, parent=parent) + super(ManualEdit, self).__init__(name=name, parent=parent) if Vradar is None: self.Vradar = Variable(None) @@ -258,4 +258,4 @@ def NewField(self, variable, strong): self.fieldBox.setCurrentIndex(idx) -_plugins = [ManualFilter] +_plugins = [ManualEdit]