PaIRS-UniNa 0.2.0__cp310-cp310-win_amd64.whl → 0.2.8__cp310-cp310-win_amd64.whl

PaIRS_UniNa/Vis_Tab_CalVi.py

@@ -20,12 +20,12 @@ spin_tips={
     'cam'       :  'Camera number',
     'LMin'      :  'Minimum intensity level',
     'LMax'      :  'Maximum intensity level',
-    #'yOriOff'   :  'Origin y shift',
-    #'xOriOff'   :  'Origin x shift',
-    #'yp'        :  'Maximum y limit',
-    #'ym'        :  'Minimum y limit',
-    #'xp'        :  'Maximum x limit',
-    #'xm'        :  'Minimum x limit',
+    'yOriOff'   :  'Origin y shift',
+    'xOriOff'   :  'Origin x shift',
+    'yp'        :  'Maximum y limit',
+    'ym'        :  'Minimum y limit',
+    'xp'        :  'Maximum x limit',
+    'xm'        :  'Minimum x limit',
 }
 check_tips={}
 radio_tips={
@@ -72,9 +72,10 @@ class VISpar_CalVi(TABpar):
         self.scrollBarValues = [0,0]
         self.LLim           = 0
         self.LMin           = 0
-        self.LMax           = 0
+        self.LMax           = 1
 
         self.MaskType       = 0
+        self.DotDiam        = 0
         self.FlagShowMask   = True
         self.FlagPlotMask   = False
 
@@ -102,6 +103,17 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
     class VIS_Tab_Signals(gPaIRS_Tab.Tab_Signals):
         run=Signal(bool)
         pass
+    
+    def showEvent(self, event: QShowEvent) -> None:
+        super().showEvent(event)
+        if not self.FlagInitVIS:
+            self.FlagInitVIS=True
+            S=self.scrollArea.size()
+            s=self.calibView.pixmap().size()
+            self.VISpar.scaleFactor = self.calibView.scaleFactor =min([S.width()/s.width() if s.width() else S.width(), S.height()/s.height() if s.height() else S.height()])
+            self.calibView.resize(self.VISpar.scaleFactor * self.calibView.pixmap().size())
+        return 
+    
     def closeEvent(self,event):
         ''' called when closing 
         I had to add this to be sure that calib was destroyed'''
@@ -152,6 +164,7 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         self.VISpar_old:VISpar_CalVi=self.TABpar_old        
         
         #------------------------------------- Callbacks 
+        self.FlagInitVIS=False
         self.defineWidgets()
         self.setupWid()  #---------------- IMPORTANT
 
@@ -210,8 +223,10 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
     def stopCalVi(self):
         self.calibView.executeCalibTask(CalibTasks.stop)
         self.setTaskButtonsText()
+        self.gui.ui.button_Run_CalVi.setVisible(True)
         self.setTABlayout()
-        self.FlagBridge=True        
+        self.FlagBridge=True  
+        self.adjustTABparInd()      
 
     def show(self):
         super().show()
@@ -285,10 +300,17 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
     def adjustVISpar(self):
         self.calibView.hide()
         
-        FlagNewRun=self.VISpar.isDifferentFrom(self.VISpar_old,fields=['FlagRunning']) or not self.VISpar.FlagInit
+        FlagNewRun=self.VISpar.isDifferentFrom(self.VISpar_old,fields=['FlagRunning'])
         if FlagNewRun: 
             self.defaultSplitterSize()
 
+        FlagNewSet=False
+        INP_CalVi:INPpar_CalVi = self.gui.w_Input_CalVi.TABpar
+        PRO_CalVi:PROpar_CalVi = self.gui.w_Process_CalVi.TABpar
+        if PRO_CalVi.isDifferentFrom(self.gui.w_Process_CalVi.PROpar_old,exceptions=['ind']) or INP_CalVi.isDifferentFrom(self.gui.w_Input_CalVi.INPpar_old,exceptions=['ind']) or not self.FlagInitData: 
+            FlagNewSet=True
+            self.gui.initDataAndSetImgFromGui(INP_CalVi,PRO_CalVi)
+
         #***Data
         c=self.calibView.calib
         self.VISpar.nPlane=c.nPlanesPerCam
@@ -300,9 +322,10 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
 
         self.VISpar.MaskType=abs(self.calibView.calib.cal.data.FlagPos)
         if self.VISpar.MaskType in (2,3):
-            self.VISpar.FlagShowMask=False
+            #self.VISpar.FlagShowMask=False
             self.VISpar.FlagPlotMask=False
         #if not self.VISpar.FlagShowMask: self.VISpar.FlagPlotMask=False
+        self.VISpar.DotDiam=abs(self.calibView.calib.cal.data.raggioInizialeRicerca)
         self.calibView.calib.flagShowMask=self.VISpar.FlagShowMask
         self.calibView.calib.flagPlotMask=self.VISpar.FlagPlotMask
 
@@ -312,12 +335,12 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         if FlagPlotMask: 
             FlagPlot=True
             self.plotPlane()
-        if self.VISpar.FlagResetLevels or FlagNewRun: #or FlagPlotMask:
+        if self.VISpar.FlagResetLevels or FlagNewRun or FlagNewSet: #or FlagPlotMask:
             if not FlagPlot: 
                 FlagPlot=True
                 self.plotPlane()
             self.restoreLevels()
-            self.VISpar.FlagResetLevels=True
+            #self.VISpar.FlagResetLevels=False            
         self.VISpar.LLim=c.LLim
         if self.VISpar.FlagResetLevels: 
             self.VISpar.LMin=c.LMin
@@ -330,7 +353,7 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         self.VISpar.FlagResetLevels=False
         
         #***Zoom
-        if self.VISpar.FlagResetZoom or FlagNewRun or FlagPlotMask:
+        if self.VISpar.FlagResetZoom or FlagNewRun or FlagPlotMask or FlagNewSet:
             if not FlagPlot: 
                 FlagPlot=True
                 self.plotPlane()
@@ -376,21 +399,29 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         self.calibView.calib.LMax=self.VISpar.LMax
         self.calibView.calib.flagShowMask=self.VISpar.FlagShowMask
         self.calibView.calib.flagPlotMask=self.VISpar.FlagPlotMask
-
-        if self.VISpar.plane and self.VISpar.cam:
+        
+        FlagNoImage=True
+        if self.VISpar.cam>0 and self.VISpar.plane>0:
+            if self.VISpar.nCam==len(self.VISpar.imEx):
+                TargetType=self.gui.w_Process_CalVi.PROpar.TargetType
+                nPlane=self.VISpar.nPlane/(1+TargetType)
+                if nPlane==len(self.VISpar.imEx[0]):
+                    plane=int( (self.VISpar.plane+TargetType)/(1+TargetType) )
+                    if self.VISpar.imEx[self.VISpar.cam-1][plane-1]:
+                        FlagNoImage=False
+        if FlagNoImage:
+            self.ui.status_R.setText('')
+            self.ui.status_L.setText('')
+            self.calibView.hide()
+        else:   
             if self.VISpar_old.FlagRunning!=self.VISpar.FlagRunning or (self.VISpar.nPlane>0 and self.VISpar_old.nPlane==0):
                 self.plotPlane()
-                self.resetScaleFactor()
                 self.button_zoom_equal_action()
             self.setZoom()
             self.plotPlane()
             self.calibView.show()
             if not self.VISpar.FlagInit:
                 self.button_zoom_equal_action()
-        else:
-            self.ui.status_R.setText('')
-            self.ui.status_L.setText('')
-            self.calibView.hide()
         self.setRunButtonText()
         return
 
@@ -594,6 +625,7 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
             b.setEnabled(flagEnab)
         for b  in  self.buttonsToDisableNotCalibrated:      
             b.setEnabled(self.calibView.calib.cal.flagCalibrated)    
+        self.setRunCalViButtonLayout()
         #for b in self.functionButtons:      b.setEnabled(flagEnab)
         #pri.Callback.green('-----abcde----- TaskButtonsText -----abcde-----')
    
@@ -618,37 +650,58 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         calib.ccMask=[]
         flagFirstImage=True
         npType=np.uint16
+
+        data=calib.cal.data
+        Him=data.ImgH
+        Wim=data.ImgW
         if self.VISpar.imList: #only used to read the first image and fix the img dimensions
             for imListc,imExc in zip(self.VISpar.imList,self.VISpar.imEx):
                 for k,f in enumerate(imListc):
                     ex=imExc[k]=os.path.exists(f)
                     if ex:
                         if f not in self.bufferImg:
-                            im=Image.open(f)
-                            self.bufferImg[f]=da=np.array(im,dtype=npType)
+                            try:
+                                im=Image.open(f)
+                                da=np.array(im,dtype=npType)
+                                if len(da.shape)!=2:
+                                    self.bufferImg[f]=da=None
+                                    raise(f'Error: the image file: {f} seems not to be grayscale!')
+                                else:
+                                    self.bufferImg[f]=da
+                            except:
+                                pri.Error.red(f'Error while opening the image file: {f}.\n{traceback.format_exc()}\n')
+                                self.bufferImg[f]=da=None
                         else:
                             da=self.bufferImg[f]
-                        if flagFirstImage:
+                        if flagFirstImage and da is not None:
                             Him,Wim=da.shape
                             flagFirstImage=False
                             break
-                if not flagFirstImage: break
-        data=calib.cal.data
-        if flagFirstImage:
-            Him=data.ImgH
-            Wim=data.ImgW
+                if not flagFirstImage: break        
         if self.VISpar.imList: #reading the images 
              for imListc,imExc in zip(self.VISpar.imList,self.VISpar.imEx):
+                k=-1
                 for f,ex in zip(imListc,imExc):
+                    k+=1
                     if f not in self.bufferImg:
                         if ex:
-                            im=Image.open(f)
-                            da=np.array(im,dtype=npType)
+                            try:
+                                im=Image.open(f)
+                                da=np.array(im,dtype=npType)
+                                if len(da.shape)!=2:
+                                    da=None
+                                    raise(f'Error: the image file: {f} seems not to be grayscale!')
+                            except:
+                                pri.Error.red(f'Error while opening the image file: {f}.\n{traceback.format_exc()}\n')
+                                da=None
                         else:
                             da=np.zeros((Him,Wim),dtype=npType)
                         self.bufferImg[f]=da
                     else:
                         da=self.bufferImg[f]
+                    if da is None:
+                        inddel.append(k)
+                        continue
                     h,w=da.shape
                     if (Wim,Him)!=(w,h):
                         inddel.append(k)
@@ -660,7 +713,8 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         self.bufferSize=0
         for f in self.bufferImg:#deleting buffer if to big
             a:np.ndarray=self.bufferImg[f]
-            self.bufferSize+=a.size*a.itemsize
+            if a is not None:
+                self.bufferSize+=a.size*a.itemsize
         if self.bufferSize>bufferSizeLimit:
             imgList=list(self.bufferImg)
             k=0
@@ -690,7 +744,7 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         #-------------------------------------- %
         #            Not in cfg             %
         # --------------------------------------%
-        
+
         data=calib.cal.data
         calVect=calib.cal.vect
         data.PercErrMax = 0.1                # 0.10 Percentuale massima per errore in posizioneTom da modificare 
@@ -701,7 +755,7 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         # --------------------------------------%
         data.percorso = INP.path     #percorso file di input
         data.EstensioneIn = INP.ext #estensione in (b16 o tif)
-        data.FlagCam=0 if not INP.FlagCam else 1    
+        data.FlagCam=0 if INP.FlagCam else 1    
         data.percorsoOut = INP.path_out # percorso file di output
         data.NomeFileOut = INP.root_out # nome file di output
 
@@ -715,19 +769,23 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         data.NCam = len(cams) if INP.FlagCam else 1 # Numero di elementi nel vettore cam (numero di camere da calibrare)
 
         if self.VISpar.FlagRunning:
-            varName=f'{data.percorsoOut}{data.NomeFileOut}{camString}{outExt.cal}'
+            varName=f'{data.percorsoOut}{data.NomeFileOut}{camString}{outExt.calvi}'
             if os.path.exists(varName):
-                with open(varName, 'rb') as file:
-                    try:
-                        var=pickle.load(file)
-                    except:
-                        self.FlagResume=-1
-                    else:
-                        self.FlagResume=1 if INP.isEqualTo(var[0],exceptions=TABpar().fields,fields=['cams','filenames','x','y','w','h','W','H']) else -1
-                        INP.printDifferences(var[0])
-                        #PRO.printDifferences(var[1])
-                        if self.FlagResume>0:
-                            self.VISpar.copyfrom(var[2],TABpar().fields+['FlagRunning'])
+                try:
+                    with open(varName, 'rb') as file:
+                        try:
+                            var=pickle.load(file)
+                        except:
+                            self.FlagResume=-1
+                        else:
+                            self.FlagResume=1 if INP.isEqualTo(var[0],exceptions=TABpar().fields,fields=['cams','filenames','x','y','w','h','W','H']) else -1
+                            INP.printDifferences(var[0])
+                            #PRO.printDifferences(var[1])
+                            if self.FlagResume>0:
+                                self.VISpar.copyfrom(var[2],TABpar().fields+['FlagRunning'])
+                except:
+                    self.FlagResume=-1
+                    pri.Error.red(f'Error while restoring the previous calibration process file: {varName}.\n{traceback.format_exc()}\n')
 
         #-------------------------------------- %
         #            Distance between spots                     %
@@ -895,12 +953,23 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         calib.nCams=calib.cal.data.NCam
         calib.cams=calib.cal.getCams()
         calib.nPlanes=calib.cal.data.Numpiani
+
         calib.nPlanesPerCam=calib.cal.data.Numpiani_PerCam
         self.VISpar.nPlane=calib.nPlanesPerCam
         self.VISpar.nCam=calib.nCams
         self.FlagInitData=True
         return
     
+    def setRunCalViButtonLayout(self):
+        if self.gui:
+            FlagVisible=True
+            calib=self.calibView.calib
+            calVect=calib.cal.vect
+            FlagVisible=all([not bool(p) for p in calVect.flagPlane[:-1]])
+            self.gui.ui.button_Run_CalVi.setVisible(FlagVisible)
+
+        
+    
 
 if __name__ == "__main__":
     import sys

PaIRS_UniNa/Whatsnew.py

@@ -1,6 +1,7 @@
 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
 class Whatsnew(QMainWindow):
@@ -13,6 +14,7 @@ class Whatsnew(QMainWindow):
         if Message:
             self.ui.info.setText(Message)
             self.ui.info.setWordWrap(True)
+            self.ui.info.setFont(gui.font())
         if title:
             self.setWindowTitle(title)
         
@@ -31,9 +33,9 @@ class Whatsnew(QMainWindow):
             if hasattr(c,'setFont'):
                 c.setFont(font)
     
-        self.show()
+        
         self.resize(QSize(w,self.gui.maximumGeometry.height()))
-        self.update()
+        self.show()
         hinfo=self.ui.info.height()
         h=hinfo+self.ui.w_Ok.height()+self.ui.mainLay.verticalSpacing()+self.ui.mainLay.contentsMargins().bottom()*2+self.ui.mainLay.contentsMargins().top()*2
         self.setFixedSize(QSize(w,h))
@@ -48,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: 
@@ -60,15 +64,46 @@ def whatsNew(self):
         content = file.read().decode("utf-8")
         file.close()
     except Exception as inst:
-        pri.Error.red(f'There was a problem while reading the file {filename}:\n{inst}')
+        pri.Error.red(f'There was a problem while reading the file {filename}:\n{inst}.\n{traceback.format_exc()}\n')
     try:
-        splittedContent=content.replace('\r','').replace('\n','').split('*')[1:]
-        star='<span style="font-size:100%;color:#e2b112;">&#9733;</span>'  #⭐,&#9733;
-        news='<br/><br/>'.join([star+'   '+c for c in splittedContent])
         dfontPixelSize=6
         fontPixelSize=self.TABpar.fontPixelSize-2+dfontPixelSize
-        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/><br/>Go to the menu "? -> Changes" for further information.'
-        self.whatsnew=Whatsnew(self,Message,f'Updates of version {__version__}',dfontPixelSize)
+        """
+        warn=f'<br/><br/><span style="font-size:{fontPixelSize+3}px;color:#e2b112;">&#9888;</span>' 
+        star=f'<br/><br/><span style="font-size:{fontPixelSize+3}px;color:#e2b112;">&#128226;</span>'  #⭐ &#9733; &#128264;
+        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
+            if text[0]=='#': splitted_news[k]=''
+            elif text[0]=='!': 
+                splitted_news[k]=formatBullet(icons_path+"warning.png",text[1:])
+            elif text[0]=='%':
+                splitted_news[k]=formatBullet(icons_path+"bugfix.png",text[1:])
+            elif text[0]=='&': 
+                splitted_news[k]=formatBullet(icons_path+"announcement.png",text[1:])
+            elif text[0]=='*': 
+                splitted_news[k]=formatBullet(icons_path+"star.png",text[1:])
+            elif text[0]=='§': 
+                splitted_news[k]=formatBullet(icons_path+"pylog.png",text[1:])
+            elif text[0]=='£': 
+                splitted_news[k]= f'<br/><span style="font-weight: 600; font-size: {fontPixelSize}px;">{text[1:]}</span><br/>'
+        news="".join(splitted_news)   
+
+        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}")
@@ -79,3 +114,17 @@ def whatsNew(self):
         except Exception as inst:
             pri.Error.red(f'There was a problem while renaming the file {fileWhatsNew[0]}:\n{inst}')
     return
+
+
+def formatBullet(icon_path,text):
+    html_text=f"""
+    <table>
+    <tr>
+        <td> <img src="{icon_path}" width="48" height="48" style="margin-right: 0px;"></td>
+        <td>&nbsp;&nbsp;</td> 
+        <td>{text}<br/></td> 
+    </tr>
+    </table> 
+    """ if text else ""
+    return html_text
+

PaIRS_UniNa/__init__.py

@@ -1,5 +1,6 @@
-__version__="0.2.0"
+__version__="0.2.8"
 __subversion__="0"
-__year__='2024'
+__year__='2025'
+__date__='2025.11.14'
 __mail__='etfd@unina.it'
-__website__='https://pairs.unina.it'
+__website__='https://pairs.unina.it'