other undefined names

Author: woutdenolf

bootstrap.py

@@ -169,7 +169,7 @@ def find_executable(target):
     # scripts from project configuration
     if "scripts" in config:
         for script_name in config["scripts"]:
-            if os.path.basename(script) == target:
+            if os.path.basename(script_name) == target:
                 return ("path", os.path.abspath(script_name))
     # entry-points from project configuration
     if "entry_points" in config:

src/PyMca5/PyMcaCore/NexusTools.py

@@ -35,7 +35,7 @@
 import posixpath
 try:
     # try to import hdf5plugin
-    if hdf5plugin not in sys.modules:
+    if "hdf5plugin" not in sys.modules:
         import hdf5plugin
 except Exception:
     # but do not crash just because of it

src/PyMca5/PyMcaCore/StackBase.py

@@ -41,6 +41,7 @@
 import sys
 import glob
 import logging
+import copy
 
 logger = logging.getLogger(__name__)
 

src/PyMca5/PyMcaCore/XiaEdf.py

@@ -107,7 +107,7 @@ def reset(self):
         try:
             self.__readStat()
         except Exception:
-            raise XiaEdfError("Cannot parse header in <%s>"%filename)
+            raise XiaEdfError("Cannot parse header in <%s>" % self.filename)
 
     def __readStat(self):
         self.header= self.edf.GetHeader(0)

src/PyMca5/PyMcaGraph/backends/MatplotlibBackend.py

@@ -2496,6 +2496,11 @@ def addImage(self, data, legend=None, info=None,
         shape = data.shape
         if 0:
             # this supports non regularly spaced coordenates!!!!
+
+            if colormap is None:
+                colormap = self.getDefaultColormap()
+            cmap = self.__getColormap(colormap['name'])
+            
             x = xmin + numpy.arange(w) * xScale[1]
             y = ymin + numpy.arange(h) * yScale[1]
             image = NonUniformImage(self.ax,
@@ -2505,8 +2510,6 @@ def addImage(self, data, legend=None, info=None,
                                     picker=picker,
                                     cmap=cmap)
 
-
-
             image.set_data(x, y, data)
             xmin, xmax = self.getGraphXLimits()
             ymin, ymax = self.getGraphYLimits()

src/PyMca5/PyMcaGui/io/QEdfFileWidget.py

@@ -1034,7 +1034,8 @@ def closeFile(self, filename=None):
         #print self.selection
         if (self.selection is not None) and filename in self.selection:
             nmca = 0
-            for key in self.selection[filename].keys():
+            mcakeys = list(self.selection[filename].keys())
+            for key in mcakeys:
                 nmca += len(self.selection[filename][key]['rows']) + len(self.selection[filename][key]['cols'])
             if nmca:
                 msg= "%d mca are linked to that EdfFile source.\n"% nmca

src/PyMca5/PyMcaGui/io/QSpsWidget.py

@@ -1048,7 +1048,7 @@ def getSelection(self):
     def __refreshSelection(self):
         return
         _logger.debug("__refreshSelection(self) called")
-        _logger.debug(selection)
+        _logger.debug(self.selection)
         if self.selection is not None:
             sel = self.selection.get(self.data.SourceName, {})
             selkeys = []

src/PyMca5/PyMcaGui/io/hdf5/DataViewerSelector.py

@@ -97,8 +97,8 @@ def _emitSignal(self, action="ADD"):
         ddict = {}
         ddict["action"] = action
         ddict["slice"] = self.getSelection()
-        shape = self.__data.shape
-        ddict["index"] = sel
+        # shape = self.__data.shape
+        # ddict["index"] = sel
         self.sigSliceSelectorSignal.emit(ddict)
 
     def setData(self, data, mode=None):

src/PyMca5/PyMcaGui/io/hdf5/HDF5McaTable.py

@@ -384,7 +384,7 @@ def setMcaSelection(self, ddict):
         if 0:
             if 'aliaslist' in keys:
                 aliaslist = ddict['aliaslist']
-            elif len(self.aliasList) == len(cntlist):
+            elif len(self.aliasList) == len(self.mcaList):
                 aliaslist = self.aliasList * 1
             else:
                 aliaslist = self.mcaList * 1
@@ -404,8 +404,7 @@ def setMcaSelection(self, ddict):
         self.mcaSelection = []
         self.mcaSelectionType = []
         for i in range(len(selection)):
-            idx = selection[idx]
-            if idx < len(mcalist):
+            if selection[i] < len(mcalist):
                 self.mcaSelection.append(selection[i])
                 self.mcaSelectionType.append(selectionType[i])
         self._update()

src/PyMca5/PyMcaGui/math/NNMAWindow.py

@@ -301,7 +301,7 @@ def setParameters(self, ddict):
         if "method" in ddict:
             self.buttonGroup.buttons()[ddict["method"]].setChecked(True)
         if "regions" in ddict:
-            self.regionsWidget.setRegions(regions)
+            self.regionsWidget.setRegions(ddict["regions"])
         return
 
     def getParameters(self):