PaIRS-UniNa 0.2.3__cp312-cp312-macosx_10_9_universal2.whl → 0.2.5__cp312-cp312-macosx_10_9_universal2.whl

PaIRS_UniNa/Vis_Tab_CalVi.py

@@ -108,7 +108,10 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         super().showEvent(event)
         if not self.FlagInitVIS:
             self.FlagInitVIS=True
-            self.button_zoom_equal_action()
+            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):
@@ -220,6 +223,7 @@ 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.adjustTABparInd()      
@@ -399,8 +403,11 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         FlagNoImage=True
         if self.VISpar.cam>0 and self.VISpar.plane>0:
             if self.VISpar.nCam==len(self.VISpar.imEx):
-                if self.VISpar.nPlane==len(self.VISpar.imEx[0]):
-                    if self.VISpar.imEx[self.VISpar.cam-1][self.VISpar.plane-1]:
+                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('')
@@ -618,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-----')
    
@@ -736,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 
@@ -747,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
 
@@ -952,6 +960,16 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         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__
+import unicodedata
 
 #from TabTools import setupWid,setFontPixelSize,setFontSizeText
 class Whatsnew(QMainWindow):
@@ -32,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))
@@ -74,10 +75,17 @@ def whatsNew(self):
         splitted_news=content.splitlines()
         for k, text in enumerate(splitted_news):
             if not text: continue
-            if text[0]=='*': 
-                splitted_news[k]=formatBullet(icons_path+"announcement.png",text[1:])
-            elif text[0]=='$': 
+            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)   
@@ -106,4 +114,5 @@ def formatBullet(icon_path,text):
     </tr>
     </table> 
     """ if text else ""
-    return html_text
+    return html_text
+

PaIRS_UniNa/__init__.py

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

PaIRS_UniNa/addwidgets_ps.py

@@ -338,7 +338,9 @@ class CollapsibleBox(QtWidgets.QWidget):
         self.dpix=5
         self.toolMinimumWidth=400
         self.toolHeight=20
+        self.content_area:QGroupBox=None
         self.toggle_button:QPushButton=None
+        self.push_button:MyToolButton=None
         
     def setup(self,*args):
         if not self.initFlag:
@@ -350,15 +352,20 @@ class CollapsibleBox(QtWidgets.QWidget):
                 self.stretch=0
             self.initFlag=True
 
+            if self.content_area is None:
+                self.content_area=self.findChild(QtWidgets.QGroupBox)
+            self.content_area.setStyleSheet("QGroupBox{border: 1px solid gray; border-radius: 6px;}")
+
             if self.toggle_button is None:
                 self.toggle_button=self.findChild(QtWidgets.QToolButton)
-                self.content_area=self.findChild(QtWidgets.QGroupBox)
-                self.push_button=self.findChild(MyToolButton)
-                
                 self.toggle_button.setChecked(InitCheck)
                 self.toggle_button.clicked.connect(self.on_click)    
+            self.toggle_button.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
+            self.toggle_button.setMinimumWidth(self.toolMinimumWidth)
+
+            if self.push_button is None:
+                self.push_button=self.findChild(MyToolButton)
 
-            self.content_area.setStyleSheet("QGroupBox{border: 1px solid gray; border-radius: 6px;}")
             self.OpenStyle=\
             "QToolButton { border: none; }\n"+\
             "QToolButton::hover{color: rgba(0,0,255,200);}"+\
@@ -368,8 +375,6 @@ class CollapsibleBox(QtWidgets.QWidget):
             "QToolButton { border: 1px solid lightgray; border-radius: 6px }\n"+\
             "QToolButton::hover{ border: 1px solid rgba(0,0,255,200); border-radius: 6px; color: rgba(0,0,255,200);}"+\
             "QToolButton::focus{ border: 1px solid rgba(0,0,255,200); border-radius: 6px; color: rgba(0,0,255,200);}" #background-color: rgba(0, 0,128,32); }" 
-            self.toggle_button.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
-            self.toggle_button.setMinimumWidth(self.toolMinimumWidth)
 
             self.heightToogle=self.toggle_button.minimumHeight()
             self.heightOpened=self.minimumHeight()
@@ -669,13 +674,14 @@ class ClickableLabel(QLabel):
     def __init__(self, *args):
         super().__init__(*args)
         
-        
         self.default_stylesheet = self.styleSheet()
         self.highlight_stylesheet = "background-color: #dcdcdc; border-radius: 3px;"
         
         self.timer = QTimer(self)
         self.timer.timeout.connect(self.resetHighlight)
         self.timer.setSingleShot(True)
+
+        self.moviePixmap=None
     
     def mousePressEvent(self, event):
         if event.button() == Qt.LeftButton and self.toolTip():
@@ -684,7 +690,9 @@ class ClickableLabel(QLabel):
             self.resetHighlight()
             
     def showMessageBox(self):
-        warningDialog(self.window(),Message=self.toolTip(),pixmap=self.pixmap(),title='Info')
+        if self.moviePixmap: pixmap=self.moviePixmap
+        else: pixmap=self.pixmap()
+        warningDialog(self.window(),Message=self.toolTip(),pixmap=pixmap,title='Info')
 
     def highlight(self):
         self.setStyleSheet(self.highlight_stylesheet)
@@ -921,7 +929,7 @@ class MplCanvas(FigureCanvasQTAgg):
             fig2.scaleFactor=min([fig2.scaleFactor,1.5])
             fig2.scaleFactor=max([fig2.scaleFactor,0.5])
             fig2.setFixedSize(s0*fig2.scaleFactor)
-            lbl.setPixmap(pixmap.scaled(pixmap.size()*fig2.scaleFactor))
+            lbl.setPixmap(pixmap.scaled(pixmap.size()*fig2.scaleFactor,mode=Qt.TransformationMode.SmoothTransformation))
             return
         fig2.resizeFig2=resizeFig2
 
@@ -1082,33 +1090,36 @@ def setAppGuiPalette(self:QWidget,palette:QPalette=None):
     else:
         applic.setPalette(palette)
 
-    if self.focusWidget():
-        self.focusWidget().clearFocus()
-    widgets=[self]
-    if hasattr(self,'FloatingTabs'):    widgets+=self.FloatingTabs
-    if hasattr(self,'FloatingWindows'): widgets+=self.FloatingWindows
-    if hasattr(self,'aboutDialog'):     widgets.append(self.aboutDialog)
-    if hasattr(self,'logChanges'):      widgets.append(self.logChanges)
-    widgets+=self.findChildren(QDialog)
-    for f in  widgets:
-        if f:
-            f.setPalette(palette)
-            for c in f.findChildren(QObject):
-                if hasattr(c,'setPalette') and not type(c) in (MplCanvas, mplFigure, QStatusBar):
-                    c.setPalette(palette)
-                if hasattr(c,'initialStyle'):
-                    c.setStyleSheet(c.initialStyle)
-            for c in f.findChildren(QObject):
-                c:MyQLineEdit
-                if hasattr(c,'setup'):
-                    c.initFlag=False
-                    c.styleFlag=False
-                    c.setup()
-            for c in f.findChildren(QObject):
-                if hasattr(c,'setup2'):
-                    c.initFlag2=False
-                    c.setup2()
-    if hasattr(self,'ResizePopup'): 
-        if self.ResizePopup is not None:
-            self.ResizePopup=type(self.ResizePopup)(self.buttonSizeCallbacks) #non riesco a farlo come gli altri
-    if hasattr(self,'w_Vis'): self.w_Vis.addPlotToolBar()
+    try:
+        if self.focusWidget():
+            self.focusWidget().clearFocus()
+        widgets=[self]
+        if hasattr(self,'FloatingTabs'):    widgets+=self.FloatingTabs
+        if hasattr(self,'FloatingWindows'): widgets+=self.FloatingWindows
+        if hasattr(self,'aboutDialog'):     widgets.append(self.aboutDialog)
+        if hasattr(self,'logChanges'):      widgets.append(self.logChanges)
+        widgets+=self.findChildren(QDialog)
+        for f in  widgets:
+            if f and isinstance(f, QWidget):
+                f.setPalette(palette)
+                for c in f.findChildren(QObject):
+                    if hasattr(c,'setPalette') and not isinstance(c, (MplCanvas, mplFigure, QStatusBar)):
+                        c.setPalette(palette)
+                    if hasattr(c,'initialStyle') and hasattr(c, 'setStyleSheet'):
+                        c.setStyleSheet(c.initialStyle)
+                for c in f.findChildren(QObject):
+                    c:MyQLineEdit
+                    if isinstance(c, MyQLineEdit) and hasattr(c, 'setup'):
+                        c.initFlag=False
+                        c.styleFlag=False
+                        c.setup()
+                for c in f.findChildren(QObject):
+                    if hasattr(c,'setup2'):
+                        c.initFlag2=False
+                        c.setup2()
+        if hasattr(self,'ResizePopup'): 
+            if self.ResizePopup is not None:
+                self.ResizePopup=type(self.ResizePopup)(self.buttonSizeCallbacks) #non riesco a farlo come gli altri
+        if hasattr(self,'w_Vis'): self.w_Vis.addPlotToolBar()
+    except:
+        pri.Error.red("***** Error while setting the application palette! *****")