ref: IndentationPreprocessor is deprecated in nanite

AFM-analysis · Aug 16, 2021 · dc3193a · dc3193a
1 parent 07f43f8
commit dc3193a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+0.10.1
+ - ref: IndentationPreprocessor is deprecated in nanite
 0.10.0
  - BREAKING CHANGE: The default contact point estimation method
    changed. This means that your fitted contact points and any

diff --git a/pyjibe/fd/tab_preprocess.py b/pyjibe/fd/tab_preprocess.py
@@ -1,6 +1,6 @@
 import pkg_resources
 
-from nanite.preproc import IndentationPreprocessor
+from nanite import preproc
 from PyQt5 import uic, QtCore, QtWidgets
 
 from .widget_preprocess_item import WidgetPreprocessItem
@@ -15,7 +15,7 @@ def __init__(self, *args, **kwargs):
 
         # Setup everything necessary for the preprocessing tab:
         # Get list of preprocessing methods
-        premem = IndentationPreprocessor.available()
+        premem = preproc.available()
 
         self._map_widgets_to_preproc_ids = {}
         for pid in premem:
@@ -75,7 +75,7 @@ def check_selection(self):
             pid = self._map_widgets_to_preproc_ids[sender]
             if state:
                 # Enable all steps that this step here requires
-                req_stps = IndentationPreprocessor.get_steps_required(pid)
+                req_stps = preproc.get_steps_required(pid)
                 if req_stps:
                     for pwid in self._map_widgets_to_preproc_ids:
                         if self._map_widgets_to_preproc_ids[pwid] in req_stps:
@@ -84,7 +84,7 @@ def check_selection(self):
                 # Disable all steps that depend on this one
                 for dwid in self._map_widgets_to_preproc_ids:
                     did = self._map_widgets_to_preproc_ids[dwid]
-                    req_stps = IndentationPreprocessor.get_steps_required(did)
+                    req_stps = preproc.get_steps_required(did)
                     if req_stps and pid in req_stps:
                         dwid.setChecked(False)
 
@@ -102,7 +102,7 @@ def current_preprocessing(self):
                 if popts:
                     options[pid] = popts
         # Make sure the order is correct
-        identifiers = IndentationPreprocessor.autosort(identifiers)
+        identifiers = preproc.autosort(identifiers)
         return identifiers, options
 
     @QtCore.pyqtSlot()

diff --git a/pyjibe/fd/widget_preprocess_item.py b/pyjibe/fd/widget_preprocess_item.py
@@ -1,6 +1,6 @@
 import pkg_resources
 
-from nanite.preproc import IndentationPreprocessor
+from nanite import preproc
 from PyQt5 import QtCore, QtWidgets, uic
 
 
@@ -17,13 +17,13 @@ def __init__(self, identifier, *args, **kwargs):
         uic.loadUi(path_ui, self)
 
         # set label text
-        name = IndentationPreprocessor.get_name(identifier)
+        name = preproc.get_name(identifier)
         self.label.setText(name)
 
         self.identifier = identifier
 
         # set tooltip
-        meth = IndentationPreprocessor.get_func(identifier)
+        meth = preproc.get_func(identifier)
         self.setToolTip(meth.__doc__)
 
         # set options
@@ -47,7 +47,7 @@ def get_options(self):
         """Return preprocessing options"""
         popts = {}
         if self.comboBox.isEnabled() and not self.comboBox.isHidden():
-            meth = IndentationPreprocessor.get_func(self.identifier)
+            meth = preproc.get_func(self.identifier)
             if meth.options is not None:
                 for opt in meth.options:
                     if "choices" in opt: