PaIRS-UniNa 0.2.7__cp312-cp312-win_amd64.whl → 0.2.8__cp312-cp312-win_amd64.whl

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
@@ -550,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
@@ -637,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
@@ -646,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
@@ -654,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=''
@@ -702,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
@@ -1063,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:
@@ -1079,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
@@ -1182,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):
@@ -1389,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])
@@ -1480,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: 
@@ -1520,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
@@ -1560,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

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
@@ -101,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.7"
+__version__="0.2.8"
 __subversion__="0"
 __year__='2025'
-__date__='2025.10.13'
+__date__='2025.11.14'
 __mail__='etfd@unina.it'
 __website__='https://pairs.unina.it'