PaIRS-UniNa 0.2.5__cp313-cp313-win_amd64.whl → 0.2.9__cp313-cp313-win_amd64.whl

PaIRS_UniNa/Saving_tools.py

@@ -143,7 +143,7 @@ def save_list_to_file_serialized(l, filename, flagJSON=False):
         print(f'Error while saving the file {filename}!\n{e}\n')
         
     if pickle_counter:
-        pri.Info.yellow(f'The following non-json serializable items were found in {filename}:\n'+"\n".join(info_pickle))
+        pri.IOError.yellow(f'The following non-json serializable items were found in {filename}:\n'+"\n".join(info_pickle))
         pickle_filename = basename+'.pairs_data'
         try:
             with open(pickle_filename, 'wb') as file:
@@ -177,7 +177,7 @@ def load_list_from_file_serialized(filename):
     except Exception as e:
         error=e
     if error:
-        print(f'Error while loading the file {filename}!\n{error}\n')
+        pri.IOError.red(f'Error while loading the file {filename}!\n{error}\n')
         return serialized_list, str(error)
     
     error=''
@@ -187,7 +187,7 @@ def load_list_from_file_serialized(filename):
             with open(pickle_filename, 'rb') as file:
                 pickle_data = pickle.load(file)
         except Exception as e:
-            print(f'Error while loading the file {pickle_filename}!\n{e}\n')
+            pri.IOError.red(f'Error while loading the file {pickle_filename}!\n{e}\n')
             error+=str(e)
 
     info_pickle=[]
@@ -228,7 +228,7 @@ def load_list_from_file_serialized(filename):
                                 else:
                                     setattr(new_instance,f,v_loaded)
                     except Exception as e:
-                        pri.Error.red(f'Error while reading the file {filename} (setting "{key}" field of {cls_name} item)\n{traceback.format_exc()}\n')
+                        pri.IOError.red(f'Error while reading the file {filename} (setting "{key}" field of {cls_name} item)\n{traceback.format_exc()}\n')
                 fields[key] = new_instance
             elif isinstance(value, dict) and '__file_ref__' in value:
                 ref_key = value['__file_ref__']
@@ -253,12 +253,12 @@ def load_list_from_file_serialized(filename):
             return deserialize_element(lst)
     
     if info_pickle:
-        pri.Info.red(f'The following non-json serializable items were not found in {filename}:\n'+"\n".join(info_pickle))
+        pri.IOError.red(f'The following non-json serializable items were not found in {filename}:\n'+"\n".join(info_pickle))
     l=None
     try:
         l=deserialize_list(serialized_list)
     except Exception as e:
-        print(f'Error while loading the file {filename}!\n{e}\n{traceback.format_exc()}\n')
+        pri.IOError.red(f'Error while loading the file {filename}!\n{e}\n{traceback.format_exc()}\n')
         error+=str(e)
     return l, error
 
@@ -285,7 +285,7 @@ def load_list_from_file(filename):
             l=pickle.load(file)
     except Exception as e:
         errorMessage=f'Error while loading the file {filename}!\n{e}\n'
-        print(errorMessage)
+        pri.IOError.red(errorMessage)
     return l, errorMessage
 
 if FLAG_SERIALIZED:

PaIRS_UniNa/TabTools.py

@@ -877,7 +877,10 @@ class gPaIRS_Tab(QWidget):
             self.button_link_step.setStatusTip(self.button_link_step.toolTip())
             self.button_link_step.setChecked(len(self.TABpar.link)!=0)
 
-            FlagProcessTree=self.gui.ui.Explorer.currentTree==self.gui.ui.Explorer.processTree
+            if self.gui.ui.Explorer.TREpar.step is None:
+                FlagProcessTree=False
+            else:
+                FlagProcessTree=self.gui.ui.Explorer.currentTree==self.gui.ui.Explorer.processTree and self.gui.ui.Explorer.TREpar.step>0
             FlagLabel=(self.TABpar.flagRun!=0 and len(self.TABpar.link)==0) or len(self.TABpar.link)>0
             FlagReset=self.TABpar.flagRun!=0 and len(self.TABpar.link)==0
             FlagInherit=self.TABpar.flagRun==0 and len(self.TABpar.link)==0 and len(self.gui.IOVheritableSteps())>0
@@ -1129,11 +1132,11 @@ def setFontPixelSize(self,fPixSize):
         
 def setFontSizeText(lab:QLabel,fPixSizes):
     text=lab.text()
-    text=re.sub("font-size:\d+pt",f"font-size:{fPixSizes[0]}px",text)   
-    text=re.sub("font-size:\d+px",f"font-size:{fPixSizes[0]}px",text)  
+    text=re.sub(r"font-size:\d+pt",f"font-size:{fPixSizes[0]}px",text)   
+    text=re.sub(r"font-size:\d+px",f"font-size:{fPixSizes[0]}px",text)  
     if len(fPixSizes)>1:
         for k in range(len(fPixSizes)-1,0,-1):
-            text=re.sub("font-size:\d+px",f"font-size:{fPixSizes[k]}px",text,k)
+            text=re.sub(r"font-size:\d+px",f"font-size:{fPixSizes[k]}px",text,k)
     lab.setText(text)
     font=lab.font()
     font.setPixelSize(fPixSizes[0])

PaIRS_UniNa/Vis_Tab.py

@@ -234,8 +234,7 @@ class NamesPIV(TABpar):
     
 class VISpar(TABpar):
     FlagVis=True
-    FlagAutoLevels=True
-    FlagAutoSizes=True    
+
     class OUT(TABpar):
         def __init__(self):
             self.x     = 0                
@@ -269,7 +268,7 @@ class VISpar(TABpar):
     def __init__(self,Process=ProcessTypes.null,Step=StepTypes.null):
         self.setup(Process,Step)
         super().__init__('VISpar','Vis')
-        self.unchecked_fields+=['FlagAutomaticLevels','FlagAutomaticSizes','setPage']
+        self.unchecked_fields+=['setPage']
         self.uncopied_fields+=['graphics_fields']
 
     def setup(self,Process,Step):
@@ -314,6 +313,8 @@ class VISpar(TABpar):
         self.variableKey=''
         self.field_rep=0
 
+        self.FlagAutoLevels=True
+        self.FlagAutoSizes=True 
         self.FlagYInvert=[False,False]
         self.FlagResetLevels=True
         self.FlagResetSizes=True
@@ -420,6 +421,9 @@ class Vis_Tab(gPaIRS_Tab):
         #------------------------------------- Graphical interface: miscellanea
         self.brush_cursor= QCursor(QPixmap(icons_path+"brush_cursor.png").scaled(24,24,mode=Qt.TransformationMode.SmoothTransformation))
         self.FlagNormalCursor=True
+        self.CursorTimer = QTimer(self)
+        self.CursorTimer.setSingleShot(True)
+        self.CursorTimer.timeout.connect(self.forceRestoreArrowCursor)
 
         self.img=None
         self.imgshow=None
@@ -547,8 +551,8 @@ class Vis_Tab(gPaIRS_Tab):
         self.setTABlayout=self.setVISlayout
 
         self.FlagReset=True
-        self.FlagResetLevels=True
-        self.FlagResetSizes =True
+        self.FlagResetLevels=False
+        self.FlagResetSizes =False
 
         self.image_file=''
         self.image_raw=None
@@ -634,7 +638,7 @@ class Vis_Tab(gPaIRS_Tab):
         FlagNew=(not self.VISpar.type and FlagNewImage) or (self.VISpar.type==1 and FlagNewResult)
         FlagDiff=self.VISpar.isDifferentFrom(self.VISpar_old,fields=['img','cam','frame']) or FlagNew
 
-        if (VISpar.FlagAutoLevels and (FlagNewImage or FlagNewResult)):
+        if (self.VISpar.FlagAutoLevels and (FlagNewImage or FlagNewResult)):
             self.resetAllLevels()
             if FlagDiff or self.FlagResetLevels:
                 self.FlagResetLevels=False
@@ -643,7 +647,7 @@ class Vis_Tab(gPaIRS_Tab):
             self.FlagResetLevels=False
             self.resetLevels()
 
-        if (VISpar.FlagAutoSizes and (FlagNewImage or FlagNewResult)):
+        if (self.VISpar.FlagAutoSizes and (FlagNewImage or FlagNewResult)):
             self.resetAllXYLims()
             if FlagDiff or self.FlagResetSizes:
                 self.FlagResetSizes=False
@@ -651,8 +655,9 @@ class Vis_Tab(gPaIRS_Tab):
         elif self.FlagResetSizes: 
             self.FlagResetSizes=False
             self.resetXYLims()
-
+        
         self.adjustFieldRep()
+            
 
     def adjustImport(self):
         self.VISpar.image_file=self.VISpar.image_file_Min=self.VISpar.image_file_Disp=''
@@ -676,7 +681,7 @@ class Vis_Tab(gPaIRS_Tab):
         if self.VISpar.img>0:
             self.VISpar.image_file=self.VISpar.path+self.VISpar.imList[self.VISpar.cam-1][self.VISpar.frame-1][self.VISpar.img-1] if len(self.VISpar.imList[self.VISpar.cam-1][self.VISpar.frame-1]) else ''
         elif self.VISpar.img==0:
-            self.VISpar.image_file=self.VISpar.image_file_Current if self.VISpar.flagRun==-2 else self.VISpar.image_file_Disp if self.VISpar.variableKey==self.namesPIV.dispMap else self.VISpar.image_file_Min 
+            self.VISpar.image_file=self.VISpar.image_file_Current if self.VISpar.flagRun==-2 and self.VISpar.variableKey!=self.namesPIV.dispMap else self.VISpar.image_file_Disp if self.VISpar.variableKey==self.namesPIV.dispMap else self.VISpar.image_file_Min 
         else:
             self.VISpar.image_file=self.image_file_Load
 
@@ -699,7 +704,13 @@ class Vis_Tab(gPaIRS_Tab):
                     else:
                         self.VISpar.result_file=self.VISpar.resF(self.VISpar.img)
                 elif self.VISpar.img==0:
-                    self.VISpar.result_file=self.VISpar.result_file_Mean               
+                    self.VISpar.result_file=self.VISpar.result_file_Mean   
+                if not self.VISpar.FlagView:
+                    ITE=self.gui.ui.Explorer.ITEfromInd(self.VISpar.ind)
+                    id=ITE.procdata.name_proc
+                    self.VISpar.FlagResult=fileIdenitifierCheck(id,self.VISpar.result_file)
+                    if not self.VISpar.FlagResult: self.VISpar.result_file=''
+
         
         FlagNewImage, FlagNewResult, _=self.importFiles()  
         return FlagNewImage, FlagNewResult
@@ -717,7 +728,7 @@ class Vis_Tab(gPaIRS_Tab):
             self.image_file=self.VISpar.image_file
             if self.VISpar.img==0:
                 if self.VISpar.flagRun==-2:
-                    self.image_raw=self.image_Current_raw[self.VISpar.frame] if self.image_Current_raw else None
+                    self.image_raw=self.image_Disp_raw if self.VISpar.variableKey==self.namesPIV.dispMap else self.image_Current_raw[self.VISpar.frame] if self.image_Current_raw else None
                 else:
                     self.image_raw=self.image_Disp_raw if self.VISpar.variableKey==self.namesPIV.dispMap else self.image_Min_raw
             else:
@@ -871,7 +882,10 @@ class Vis_Tab(gPaIRS_Tab):
         self.ui.image_levels.setCurrentIndex(i)
         self.ui.label_title.setText(f"Settings ({i+1}/{c+1})")
 
-        Lim=self.VISpar.vLim[self.VISpar.variableKey]
+        if self.VISpar.variableKey in self.VISpar.vLim:
+            Lim=self.VISpar.vLim[self.VISpar.variableKey]
+        else:
+            Lim=1.0
         step=Lim/nStepsSlider
         FlagLim= self.VISpar.type or FlagDispMap
         self.ui.spin_min.setMinimum(-Lim if FlagLim else 0)
@@ -929,8 +943,10 @@ class Vis_Tab(gPaIRS_Tab):
         self.ui.name_var.setToolTip(f'{dataType} file: {dataName}')
         self.ui.name_var.setStatusTip(self.ui.name_var.toolTip()) 
         
-        self.VISpar.colorMap=self.VISpar.vcolorMap[self.VISpar.variableKey]
-        self.VISpar.vectorColor=self.VISpar.vvectorColor[self.VISpar.variableKey]
+        if self.VISpar.variableKey in self.VISpar.vcolorMap:
+            self.VISpar.colorMap=self.VISpar.vcolorMap[self.VISpar.variableKey]
+        if self.VISpar.variableKey in self.VISpar.vvectorColor:
+            self.VISpar.vectorColor=self.VISpar.vvectorColor[self.VISpar.variableKey]
 
         self.ui.button_cmap.setIcon(QIcon(icons_path+'colormaps/'+self.VISpar.colorMap+'.png'))
         self.ui.button_cvec.setIcon(QIcon(icons_path+'colormaps/'+self.VISpar.vectorColor+'Vector.png'))
@@ -950,17 +966,19 @@ class Vis_Tab(gPaIRS_Tab):
         return
     
     def setLevels(self):
-        self.VISpar.min=self.VISpar.vmin[self.VISpar.variableKey]
-        self.VISpar.max=self.VISpar.vmax[self.VISpar.variableKey]
-        self.VISpar.mean=self.VISpar.vmean[self.VISpar.variableKey]
-        self.VISpar.range=self.VISpar.vrange[self.VISpar.variableKey]
+        if self.VISpar.variableKey in self.VISpar.vmin:
+            self.VISpar.min=self.VISpar.vmin[self.VISpar.variableKey]
+            self.VISpar.max=self.VISpar.vmax[self.VISpar.variableKey]
+            self.VISpar.mean=self.VISpar.vmean[self.VISpar.variableKey]
+            self.VISpar.range=self.VISpar.vrange[self.VISpar.variableKey]
             
     def resetLevels(self):
-        self.VISpar.vmin[self.VISpar.variableKey]=self.VISpar.vmin_default[self.VISpar.variableKey]
-        self.VISpar.vmax[self.VISpar.variableKey]=self.VISpar.vmax_default[self.VISpar.variableKey]
-        self.VISpar.vmean[self.VISpar.variableKey]=self.VISpar.vmean_default[self.VISpar.variableKey]
-        self.VISpar.vrange[self.VISpar.variableKey]=self.VISpar.vrange_default[self.VISpar.variableKey]
-        #self.setLevels()
+        if self.VISpar.variableKey in self.VISpar.vmin_default:
+            self.VISpar.vmin[self.VISpar.variableKey]=self.VISpar.vmin_default[self.VISpar.variableKey]
+            self.VISpar.vmax[self.VISpar.variableKey]=self.VISpar.vmax_default[self.VISpar.variableKey]
+            self.VISpar.vmean[self.VISpar.variableKey]=self.VISpar.vmean_default[self.VISpar.variableKey]
+            self.VISpar.vrange[self.VISpar.variableKey]=self.VISpar.vrange_default[self.VISpar.variableKey]
+            #self.setLevels()
 
     def resetAllLevels(self, ind=None):
         if ind is None: VIS:VISpar=self.VISpar
@@ -1007,6 +1025,7 @@ class Vis_Tab(gPaIRS_Tab):
     def getImageInfo(self,image=None,ind=None):
         if image is None: I=self.image
         else: I=image
+        if I is None: return
         if ind is None: VIS:VISpar=self.VISpar
         else: VIS:VISpar=self.TABpar_at(ind)
         variableKey=self.VISpar.variableKey
@@ -1052,7 +1071,8 @@ class Vis_Tab(gPaIRS_Tab):
                         res[n]=tres[0][:,:,j]
                 if self.namesPIV.u in res and self.namesPIV.v in res:
                     res=self.calcMagnitude(res)
-                    res=self.calcZVorticity(res)
+                    FlagUnit=self.VISpar.Out.xres!=1.0 or self.VISpar.Out.pixAR!=1.0
+                    res=self.calcZVorticity(res,FlagUnit)
                 for f in list(res):
                     if not f in self.namesPIV.allFields: del res[f]
         except Exception as inst:
@@ -1068,9 +1088,10 @@ class Vis_Tab(gPaIRS_Tab):
                 res[self.namesPIV.Mod]=np.sqrt(res[self.namesPIV.u]**2+res[self.namesPIV.v]**2)
         return res
 
-    def calcZVorticity(self,res):
+    def calcZVorticity(self,res,FlagUnit=False):
         if self.namesPIV.x in res and self.namesPIV.y in res and self.namesPIV.u in res and self.namesPIV.v in res:
-            xres,yres=self.getXYRes(type=1)
+            if FlagUnit: xres=yres=1/1000
+            else: xres=yres=1.0
             try:
                 du_dy, _=np.gradient(res[self.namesPIV.u],res[self.namesPIV.y][:,0]*yres,res[self.namesPIV.x][0,:]*xres)  # Derivate di u rispetto a y e x
                 _, dv_dx=np.gradient(res[self.namesPIV.v],res[self.namesPIV.y][:,0]*yres,res[self.namesPIV.x][0,:]*xres)  # Derivate di v rispetto a y e x
@@ -1082,6 +1103,7 @@ class Vis_Tab(gPaIRS_Tab):
     def getResultInfo(self,result=None,ind=None):
         if result is None: res=self.result
         else: res=result
+        if res is None: return
         if ind is None: VIS:VISpar=self.VISpar
         else: VIS:VISpar=self.TABpar_at(ind)
         for i in list(VIS.vmin_default):
@@ -1141,7 +1163,7 @@ class Vis_Tab(gPaIRS_Tab):
 
     def button_ShowIW_action(self):
         self.VISpar.FlagShowIW=self.ui.button_ShowIW.isChecked()
-        self.resetXYLims()
+        #if self.VISpar.FlagShowIW: self.resetXYLims()
     
     def button_SubMIN_action(self):
         self.VISpar.FlagSubMIN=self.ui.button_SubMIN.isChecked()
@@ -1170,11 +1192,21 @@ class Vis_Tab(gPaIRS_Tab):
         self.setLevels()
     
     def button_automatic_levels_action(self):
-        VISpar.FlagAutoLevels=self.ui.button_automatic_levels.isChecked()
+        self.VISpar.FlagAutoLevels=self.ui.button_automatic_levels.isChecked()
         return True
     
     def button_automatic_sizes_action(self):
-        VISpar.FlagAutoSizes=self.ui.button_automatic_sizes.isChecked()
+        self.VISpar.FlagAutoSizes=self.ui.button_automatic_sizes.isChecked()
+        if self.VISpar.FlagAutoSizes is False and self.VISpar.Process==ProcessTypes.piv:
+            type2=0 if self.VISpar.type==1 else 1
+            if self.VISpar.unit[self.VISpar.type]!=self.VISpar.unit[type2]:
+                xres,yres=self.getXYRes(type=self.VISpar.unit[self.VISpar.type])
+            else: xres=yres=1.0
+            if (type2==0 and self.VISpar.unit[type2]) or (type2==1 and not self.VISpar.unit[type2]):
+                xres2,yres2=self.getXYRes(type=type2)
+            else: xres2=yres2=1.0
+            self.VISpar.size[type2][0:2]=[s*xres/xres2 for s in [self.VISpar.xmin, self.VISpar.xmax]]
+            self.VISpar.size[type2][2:4]=[s*yres/yres2 for s in [self.VISpar.ymin, self.VISpar.ymax]]
         return True
     
     def button_restore_action(self):
@@ -1299,6 +1331,33 @@ class Vis_Tab(gPaIRS_Tab):
         self.VISpar.size[self.VISpar.type][3]+=dy
 
     def button_FocusIW_action(self):
+        """
+        Show a popup menu with options 'H x W' and return the selected index (int) or None.
+        Labels are formatted as f"{Vect[2][i]} x {Vect[0][i]}".
+        """
+        FlagDisp=self.VISpar.variableKey is self.namesPIV.dispMap
+        if FlagDisp: it=-1
+        else:
+            # Ensure consistent length between lists 0 (width values) and 2 (height values)
+            ve=self.VISpar.Pro.Vect if isinstance(self.VISpar.Pro.Vect[0],list) else [[v] for v in self.VISpar.Pro.Vect] 
+            Vect = [[val for val in v] for v  in ve]
+            n = min(len(Vect[0]), len(Vect[2]))
+            if n == 0:
+                return None
+
+            # Create a context menu and populate it with the available sizes
+            menu = QMenu(self)
+            for i in range(n):
+                label = f"{Vect[2][i]} x {Vect[0][i]}"
+                act = menu.addAction(label)
+                act.setData(i)
+
+            # Display the menu at the current cursor position and wait for user selection
+            chosen = menu.exec(QCursor.pos())
+            it = None if chosen is None else chosen.data()
+        if it is not None: self.FocusIW_it(it)
+
+    def FocusIW_it(self,it=-1):
         ve=self.VISpar.Pro.Vect if isinstance(self.VISpar.Pro.Vect[0],list) else [[v] for v in self.VISpar.Pro.Vect] 
         Vect = [[val for val in v] for v  in ve]
         if self.VISpar.unit[self.VISpar.type] and self.VISpar.type!=0:
@@ -1306,20 +1365,20 @@ class Vis_Tab(gPaIRS_Tab):
             for k in range(2): Vect[k]=[val/self.VISpar.Out.xres for val in Vect[k]]
             for k in range(2,4): Vect[k]=[val/yres for val in Vect[k]]
         else: yres=1.0
-        W=Vect[2][-1]
+        W=Vect[2][it]
         FlagDisp=self.VISpar.variableKey is self.namesPIV.dispMap
         if FlagDisp:
             H=self.gui.w_Process_Disp.PROpar.SemiWidth_Epipolar*2+1
             H/=yres
             FlagBordo=False
         else:
-            H=Vect[0][-1]
+            H=Vect[0][it]
             FlagBordo=self.VISpar.Pro.FlagBordo
         if abs(self.VISpar.size[self.VISpar.type][1]-self.VISpar.size[self.VISpar.type][0]-W)<1 and abs(self.VISpar.size[self.VISpar.type][3]-self.VISpar.size[self.VISpar.type][2]-H)<1:
-            dW=W if FlagDisp else Vect[3][-1] 
+            dW=W if FlagDisp else Vect[3][it] 
             boundDist=W/2 if not FlagBordo else dW
             x0=int((self.VISpar.size[self.VISpar.type][0]-boundDist+W/2)/dW)*dW+boundDist-W/2 if self.VISpar.size[self.VISpar.type][0]>boundDist else boundDist-W/2
-            dH=H if FlagDisp else Vect[1][-1]
+            dH=H if FlagDisp else Vect[1][it]
             boundDist=H/2 if not FlagBordo else dH
             y0=int((self.VISpar.size[self.VISpar.type][2]-boundDist+H/2)/dH)*dH+boundDist-H/2 if self.VISpar.size[self.VISpar.type][2]>boundDist else boundDist-H/2
             self.VISpar.size[self.VISpar.type][0]=x0
@@ -1350,10 +1409,10 @@ class Vis_Tab(gPaIRS_Tab):
         self.ui.button_Contourf.setChecked(self.VISpar.FlagContourf)
     
     def button_automatic_levels_set(self):
-        self.ui.button_automatic_levels.setChecked(VISpar.FlagAutoLevels)
+        self.ui.button_automatic_levels.setChecked(self.VISpar.FlagAutoLevels)
 
     def button_automatic_sizes_set(self):
-        self.ui.button_automatic_sizes.setChecked(VISpar.FlagAutoSizes)
+        self.ui.button_automatic_sizes.setChecked(self.VISpar.FlagAutoSizes)
 
     def button_invert_y_set(self):
         self.ui.button_invert_y.setChecked(self.VISpar.FlagYInvert[self.VISpar.type])
@@ -1384,14 +1443,18 @@ class Vis_Tab(gPaIRS_Tab):
         self.VISpar.size[self.VISpar.type][:2]=[xmin/self.xres,xmax/self.xres]
         self.VISpar.size[self.VISpar.type][2:4]=[ymin/self.yres,ymax/self.yres]
         
+    def forceRestoreArrowCursor(self):
+        if self.CursorTimer.isActive():
+            self.CursorTimer.stop()
+        while QApplication.overrideCursor() is not None:
+            QApplication.restoreOverrideCursor()
+        self.FlagNormalCursor = True
+
     def brushCursor(self):
-        if self.FlagNormalCursor:
-            self.FlagNormalCursor=False
-            QApplication.setOverrideCursor(self.brush_cursor) 
-            def restoreCursor():
-                QApplication.restoreOverrideCursor()
-                self.FlagNormalCursor=True
-            QTimer.singleShot(250,lambda: restoreCursor())
+        self.forceRestoreArrowCursor()
+        self.FlagNormalCursor=False
+        QApplication.setOverrideCursor(self.brush_cursor) 
+        self.CursorTimer.start(250)
 
     def setMapVar(self):    
         pri.PlotTime.magenta(f'{"/"*25} Plotting image - start')
@@ -1417,12 +1480,13 @@ class Vis_Tab(gPaIRS_Tab):
                 if self.orect: self.cleanRect()
                 self.cleanCommonRegion()
                 fields=['result_file','variable','unit','min','max','nclev','FlagContourf','colorMap']
+                if self.VISpar.variableKey not in self.result: raise('Variable not found in result structure!')
                 V=self.result[self.VISpar.variableKey]
                 if not self.VISpar.FlagContourf:   
                     self.img,Ximg,Yimg,FlagInterp,size=self.calcMap(V,size_pixels=[np.size(V,0), np.size(V,1)])
                     FlagDraw=self.showImg(fields,size)
                 else:
-                    self.img,Ximg,Yimg,FlagInterp,size=self.calcMap(self.result[self.VISpar.variableKey])
+                    self.img,Ximg,Yimg,FlagInterp,size=self.calcMap(V)
                     if FlagInterp:
                         FlagDraw=self.showImg(fields,size)
                     else:
@@ -1436,6 +1500,7 @@ class Vis_Tab(gPaIRS_Tab):
             FlagVecField=self.VISpar.isDifferentFrom(self.VISpar_old,fields=fields)
             if FlagVecField and self.result: 
                 self.showVecField()
+            elif self.result is None: self.cleanVecField()
             FlagDraw=FlagDraw or FlagVecField
             
             if FlagDraw: 
@@ -1476,7 +1541,7 @@ class Vis_Tab(gPaIRS_Tab):
                 FlagXLim=True
             else: 
                 self.imgshow.set_data(img)
-                extent=self.imgExtent()
+                extent=self.imgExtent(size)
                 if extent!=self.imgshow.get_extent():
                     self.imgshow.set_extent(extent)
                     FlagExtent=True
@@ -1516,7 +1581,7 @@ class Vis_Tab(gPaIRS_Tab):
         return cmap, levs
     
     def getXYRes(self,type=None):
-        if not type: type=self.VISpar.type
+        if type is None: type=self.VISpar.type
         xres=yres=1.0 
         if self.VISpar.Process==ProcessTypes.piv and not self.VISpar.Out.FlagNone:
             if type==0: #mm/pixels
@@ -1564,6 +1629,7 @@ class Vis_Tab(gPaIRS_Tab):
             else: xres=yres=1.0
             X=result[self.namesPIV.x]*xres
             Y=result[self.namesPIV.y]*yres
+            if self.VISpar.variableKey not in self.result: raise('Variable not found in result structure!')
             V=result[self.VISpar.variableKey]
             self.map=[X,Y,V]
 
@@ -1707,6 +1773,8 @@ class Vis_Tab(gPaIRS_Tab):
                 size_pixels=np.shape(U)
                 Up,_,_,_,_=self.calcMap(U,size_pixels=size_pixels)
                 Vp,Xp,Yp,_,_=self.calcMap(V,size_pixels=size_pixels)
+                Xp=Xp*xres
+                Yp=Yp*yres
                 self.stream=self.ui.plot.axes.streamplot(Xp,Yp,Up,Vp,color=VIS_VectorColors[self.VISpar.vectorColor],density=self.VISpar.streamdens,zorder=10)
 
     def cleanAxes(self,FlagAxis=True):
@@ -1836,21 +1904,22 @@ class Vis_Tab(gPaIRS_Tab):
             else:
                 yin0=0
                 xin0=xmax
-        xlim=self.ui.plot.axes.get_xlim()
-        xlim_min=min([xlim[0],xlim_min])
-        xlim_max=max([xlim[1],xlim_max])
-        self.ui.plot.axes.set_xlim(xlim_min,xlim_max)
-        if self.VISpar.FlagYInvert[self.VISpar.type]: 
-            ylim=self.ui.plot.axes.get_ylim()
-            ylim_max=min([ylim[1],ylim_min])
-            ylim_min=max([ylim[0],ylim_max])
-        else:
-            ylim=self.ui.plot.axes.get_ylim()
-            ylim_min=min([ylim[0],ylim_min])
-            ylim_max=max([ylim[1],ylim_max])
-        self.ui.plot.axes.set_ylim(ylim_min,ylim_max)
-        self.VISpar.xmin,self.VISpar.xmax=list(self.ui.plot.axes.get_xlim())
-        self.VISpar.ymin,self.VISpar.ymax=list(self.ui.plot.axes.get_ylim())
+        if self.VISpar.FlagShowIW and self.VISpar.isDifferentFrom(self.VISpar_old,fields=['FlagShowIW']):
+            xlim=self.ui.plot.axes.get_xlim()
+            xlim_min=min([xlim[0],xlim_min])
+            xlim_max=max([xlim[1],xlim_max])
+            self.ui.plot.axes.set_xlim(xlim_min,xlim_max)
+            if self.VISpar.FlagYInvert[self.VISpar.type]: 
+                ylim=self.ui.plot.axes.get_ylim()
+                ylim_max=min([ylim[1],ylim_min])
+                ylim_min=max([ylim[0],ylim_max])
+            else:
+                ylim=self.ui.plot.axes.get_ylim()
+                ylim_min=min([ylim[0],ylim_min])
+                ylim_max=max([ylim[1],ylim_max])
+            self.ui.plot.axes.set_ylim(ylim_min,ylim_max)
+            self.VISpar.xmin,self.VISpar.xmax=list(self.ui.plot.axes.get_xlim())
+            self.VISpar.ymin,self.VISpar.ymax=list(self.ui.plot.axes.get_ylim())
 
     def cleanCommonRegion(self):
         if self.CR:

PaIRS_UniNa/Whatsnew.py

@@ -1,6 +1,6 @@
 from .PaIRS_pypacks import*
 from .ui_Whatsnew import Ui_Whatsnew
-from .__init__ import __version__
+from .__init__ import __version__,__subversion__
 import unicodedata
 
 #from TabTools import setupWid,setFontPixelSize,setFontSizeText
@@ -50,8 +50,10 @@ class Whatsnew(QMainWindow):
         self.ui.button_Ok.clicked.connect(self.close)
 
 def whatsNew(self):
+    FlagCheckWhatWasNew=False
     if os.path.exists(fileWhatsNew[0]): 
         filename=fileWhatsNew[0]
+        FlagCheckWhatWasNew=True
     elif os.path.exists(fileWhatsNew[1]): 
         filename=fileWhatsNew[1]
     else: 
@@ -72,6 +74,15 @@ def whatsNew(self):
         news=content.replace('\r','').replace('\n','').replace('$',warn).replace('*',star)
         news=news.replace('<br/><br/>','',1)
         """
+        if FlagCheckWhatWasNew and os.path.exists(fileWhatsNew[1]):
+            file_old = open(fileWhatsNew[1], "rb")
+            content_old = file_old.read().decode("utf-8")
+            file_old.close()
+            if content_old==content: 
+                os.remove(fileWhatsNew[1])
+                os.rename(fileWhatsNew[0],fileWhatsNew[1])
+                return
+
         splitted_news=content.splitlines()
         for k, text in enumerate(splitted_news):
             if not text: continue
@@ -90,8 +101,9 @@ def whatsNew(self):
                 splitted_news[k]= f'<br/><span style="font-weight: 600; font-size: {fontPixelSize}px;">{text[1:]}</span><br/>'
         news="".join(splitted_news)   
 
-        Message=f'<span style=" font-size: {fontPixelSize+dfontPixelSize}px; font-weight: 600;">'+f"What's new in PaIRS-UniNa {__version__}"+'</span><br/><br/>'+news+'<br/>Go to the menu "? -> Changes" for further information.'
-        self.whatsnew=Whatsnew(self,Message,f'Updates of version {__version__}',dfontPixelSize)
+        subversion_string=f'(.{__subversion__})' if int(__subversion__) else ''
+        Message=f'<span style=" font-size: {fontPixelSize+dfontPixelSize}px; font-weight: 600;">'+f"What's new in PaIRS-UniNa {__version__}{subversion_string}"+'</span><br/><br/>'+news+'<br/>Go to the menu "? -> Changes" for further information.'
+        self.whatsnew=Whatsnew(self,Message,f'Updates of version {__version__}{subversion_string}',dfontPixelSize)
         #warningDialog(self,Message,pixmap=''+ icons_path +'news.png',title=f'Updates of version {__version__}',flagRichText=True)
     except Exception as inst:
         pri.Error.red(f"There was a problem while launching the What's new dialog box:\n{inst}")

PaIRS_UniNa/__init__.py

@@ -1,6 +1,6 @@
-__version__="0.2.5"
+__version__="0.2.9"
 __subversion__="0"
-__year__='2024'
-__date__='2025.07.18'
+__year__='2025'
+__date__='2025.12.12'
 __mail__='etfd@unina.it'
-__website__='https://pairs.unina.it'
+__website__='https://pairs.unina.it'