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

PaIRS_UniNa/PaIRS.py

@@ -1,18 +1,18 @@
 from .gPaIRS import *
-
-def run():
-    gui:gPaIRS
-    app,gui,flagPrint=launchPaIRS()
-    quitPaIRS(app,flagPrint)
-
-def cleanRun():
-    if os.path.exists(lastcfgname):
-        os.remove(lastcfgname)
-    run()
-   
-def debugRun():
-    gui:gPaIRS
-    app,gui,flagPrint=launchPaIRS(flagInputDebug=True)
-    quitPaIRS(app,flagPrint)
-
-
+
+def run():
+    gui:gPaIRS
+    app,gui,flagPrint=launchPaIRS()
+    quitPaIRS(app,flagPrint)
+
+def cleanRun():
+    if os.path.exists(lastcfgname):
+        os.remove(lastcfgname)
+    run()
+   
+def debugRun():
+    gui:gPaIRS
+    app,gui,flagPrint=launchPaIRS(flagInputDebug=True)
+    quitPaIRS(app,flagPrint)
+
+

PaIRS_UniNa/PaIRS_pypacks.py

@@ -80,8 +80,10 @@ if currentID in (developerIDs['GP_Win_Office'],developerIDs['GP_Win_Office_New']
                             'C:/desk/PIV_Img/img1/',
                             'C:/desk/PIV_Img/_data/PIV_data/virtual_case/', 
                             'C:/desk/PIV_Img/_data/PIV_data/real_case/',
+                            'C:/desk/PIV_Img/_data/SPIV_data/real_case/img/',
                             'C:/desk/PIV_Img/_data/Calibration_data/pinhole/',
                             'C:/desk/PIV_Img/_data/Calibration_data/cylinder/',
+                            'C:/desk/PIV_Img/_data/SPIV_data/real_case/calib/',
                             ]
     basefold_DEBUG_VIS='C:/desk/PIV_Img/_data/PIV_data/real_case/'
 elif  currentID==developerIDs['GP_WSL']:
@@ -148,6 +150,15 @@ fileChanges='Changes.txt'
 fileWhatsNew=['whatsnew.txt','whatwasnew.txt']
 icons_path="icons/"
 
+gPaIRS_QMenu_style="""
+        QMenu::item:selected,
+        QMenu::item:checked,
+        QMenu::item:pressed {
+            background-color: rgba(0, 116, 255, 0.8);
+            color: white;
+        }
+        """
+
 from psutil import cpu_count
 NUMTHREADS_MAX=cpu_count(logical=True)#-1
 if NUMTHREADS_MAX<1: NUMTHREADS_MAX=1
@@ -808,12 +819,6 @@ def toPlainText(text):
     PlainTextConverter.setHtml(text) #for safety
     return PlainTextConverter.toPlainText()
 
-def showTip(obj,message):
-    toolTipDuration=obj.toolTipDuration()
-    obj.setToolTipDuration(3000)
-    QToolTip.showText(QCursor.pos(),message)
-    obj.setToolTipDuration(toolTipDuration)
-
 def clean_tree(tree:QTreeWidget):
     def remove_children(item:QTreeWidgetItem):
         while item.childCount() > 0:
@@ -1166,59 +1171,6 @@ def checkOutDated(packageName:str,printOutDated):
   f3=executor.submit(asyncio.run,checkOutDatedInternal(packageName))
   f3.add_done_callback(checkOutDatedComplete)
 
-def changes(self,TabType,filename,title=" Changes"):
-    FlagShow=False
-    if self.logChanges:
-        if self.logChanges.isVisible():
-            FlagShow=True
-    if FlagShow:
-        self.logChanges.hide()
-        self.logChanges.show()
-    else:
-        self.logChanges=TabType(self,True)
-        self.logChanges.resize(720,720)
-        self.logChanges.show()
-        self.logChanges.ui.progress_Proc.hide()
-        self.logChanges.ui.button_close_tab.hide()
-        icon=QPixmap(''+ icons_path +'news.png')
-        self.logChanges.ui.icon.setPixmap(icon)
-        self.logChanges.setWindowIcon(self.windowIcon())
-        self.logChanges.setWindowTitle(title)
-        self.logChanges.ui.name_tab.setText(title)
-    
-        self.logChanges.ui.log.setLineWrapColumnOrWidth(self.logChanges.ui.log.width()-20)
-        self.logChanges.ui.log.setStyleSheet("")
-
-        def setFontPixelSize(logChanges:type(self.logChanges),fPixSize):
-            logfont=self.font()
-            logfont.setFamily(fontName)
-            logfont.setPixelSize(fPixSize+2)
-            logChanges.ui.log.setFont(logfont)
-            fPixSize_TabNames=min([fPixSize*2,30])
-            lab=logChanges.ui.name_tab
-            font=lab.font()
-            font.setPixelSize(fPixSize_TabNames)
-            lab.setFont(font)
-        self.logChanges.setFontPixelSize=lambda fS: setFontPixelSize(self.logChanges,fS)
-        self.logChanges.setFontPixelSize(self.TABpar.fontPixelSize)
-        def logResizeEvent(logChanges:type(self.logChanges),e):
-            super(type(logChanges),logChanges).resizeEvent(e) 
-            logChanges.ui.log.setLineWrapColumnOrWidth(logChanges.ui.log.width()-20)
-        self.logChanges.ui.log.resizeEvent=lambda e: logResizeEvent(self.logChanges,e)
-
-        self.logChanges.ui.icon.addfuncclick['whatsnew']=self.whatsNew
-        self.logChanges.ui.icon.setCustomCursor()
-
-        try:
-            file = open(filename, "rb")
-            content = file.read().decode("utf-8")
-            self.logChanges.ui.log.setText(content)
-            file.close()
-        except Exception as inst:
-            pri.Error.red(f'There was a problem while reading the file {filename}:\n{inst}')
-            self.logChanges.ui.log.setText(f'No information about PaIRS-UniNa updates available!\n\nSorry for this, try to reinstall PaIRS-UniNa or alternatively contact the authors at {__mail__}.')
-    return
-
 import webbrowser
 def downloadExampleData(self,url):
     Message=f'Test data are available at the following link:\n{url}'
@@ -1354,7 +1306,7 @@ def checkRequiredPackages(self, filename=rqrdpckgs_filename, FlagDisplay=False,
             else:
                 pri.Error.red(f"Malformed line: {line}")
 
-    Flag = False
+    FlagUpdateFile = False
     warnings = []
 
     for i, pkg in enumerate(required_packages):
@@ -1364,9 +1316,10 @@ def checkRequiredPackages(self, filename=rqrdpckgs_filename, FlagDisplay=False,
             installed_version = None
 
         # Update current installed version
-        if installed_version is not None and (installed_version != vcurr_list[i] or FlagDisplay):
-            vcurr_list[i] = installed_version
-            Flag = True
+        if installed_version is not None:
+            if installed_version != vcurr_list[i]:
+                vcurr_list[i] = installed_version
+                FlagUpdateFile = True
 
             # Check if within [vmin, vmax]
             if not (le_ver(vmin_list[i],installed_version) and le_ver(installed_version,vmax_list[i])):
@@ -1381,7 +1334,7 @@ def checkRequiredPackages(self, filename=rqrdpckgs_filename, FlagDisplay=False,
 
     # Show warning
     if len(warnings)>0: self.FlagPackIssue=True
-    if len(warnings)>0 or FlagForcePrint:
+    if ( (FlagUpdateFile or FlagDisplay) and len(warnings)>0 ) or FlagForcePrint :
         message = (
             "Some installed packages have a version outside the target range used to develop "
             "the current release of the PaIRS_UniNa package.\n\n"
@@ -1413,7 +1366,7 @@ def checkRequiredPackages(self, filename=rqrdpckgs_filename, FlagDisplay=False,
         warningDialog(self, Message="All installed packages are within the expected version range.", flagScreenCenter=True,pixmap=icons_path+'greenv.png')
 
     # Update file if needed
-    if Flag:
+    if FlagUpdateFile:
         with open(filename, "w") as f:
             for pkg, vmin, vmax, vcurr in zip(required_packages, vmin_list, vmax_list, vcurr_list):
                 f.write(f"{pkg}\t{vmin}\t{vmax}\t{vcurr if vcurr else 0}\n")

PaIRS_UniNa/Process_Tab.py

@@ -735,13 +735,12 @@ class Process_Tab(gPaIRS_Tab):
                 message="Please, insert at least one element!"
             else:
                 message="Items must be inserted in decreasing order!"
-            wlab.setToolTip(message)
-            wlab.setStatusTip(message)
-            """
-            QToolTip.showText(QCursor.pos(),wlab.toolTip(),wedit,QRect(),3000)       
-            """
         else: 
             wlab.setPixmap(QPixmap())
+            message=""
+        show_mouse_tooltip(wedit,message)     
+        wlab.setToolTip(message)
+        wlab.setStatusTip(message)
         self.PROpar.VectFlag[self.Vect_widgets.index(wedit)]=not FlagError
         return split_text, vect, FlagError
 
@@ -1292,18 +1291,25 @@ class Process_Tab(gPaIRS_Tab):
     def line_edit_IW_action(self):
         text=self.ui.line_edit_IW.text()
         split_text=re.split(r'(\d+)', text)[1:-1:2]
-        vect=[int(split_text[i]) for i in (0,2,1,3)]
-        if len(vect)==4:
+        if len(split_text)!=4:
+            message="Please insert four distinct values to edit the current PIV process iteration!"
+            show_mouse_tooltip(self,message)
+            self.line_edit_IW_set()
+        else:
+            vect=[int(split_text[i]) for i in (0,2,1,3)]
             k=self.PROpar.row
             FlagValid=True
             if k>0: FlagValid=FlagValid and all([vect[i]<=self.PROpar.Vect[i][k-1] for i in range(4)])
             if k<self.PROpar.Nit-1 and FlagValid: FlagValid=FlagValid and all([vect[i]>=self.PROpar.Vect[i][k+1] for i in range(4)])
             if FlagValid:
+                message=""
+                show_mouse_tooltip(self,message)
                 for i in range(4):
                     self.PROpar.Vect[i][k]=vect[i] #np.array([vect[i]])
             else:
-                message='IW sizes o r spacings were assigned inconsistently! Please, retry!'
-                showTip(self,message)
+                message='IW sizes or spacings were assigned inconsistently! They must be inserted in decreasing order across iterations. Please, retry!'
+                show_mouse_tooltip(self,message)
+                self.line_edit_IW_set()
         self.PROpar.flag_rect_wind=any([v!=w for v,w in zip(self.PROpar.Vect[0],self.PROpar.Vect[2])]) or any([v!=w for v,w in zip(self.PROpar.Vect[1],self.PROpar.Vect[3])])
         return
     
@@ -1329,6 +1335,7 @@ class Process_Tab(gPaIRS_Tab):
         item=table_iter.currentItem()
         if not item: return
         menu=QMenu(table_iter)
+        menu.setStyleSheet(self.gui.ui.menu.styleSheet())
         buttons=['add', 'delete']
         name=[]
         tips=['Add new iteration to the PIV process','Delete current iteration from the PIV process']
@@ -1361,10 +1368,7 @@ class Process_Tab(gPaIRS_Tab):
             item.setStatusTip('')
 
             message='No context menu available! Please, pause processing.'
-            toolTipDuration=self.toolTipDuration()
-            self.setToolTipDuration(3000)
-            QToolTip.showText(QCursor.pos(),message)
-            self.setToolTipDuration(toolTipDuration)
+            show_mouse_tooltip(self,message)
             item.setToolTip(toolTip)
             item.setStatusTip(toolTip)
 
@@ -1688,13 +1692,13 @@ class Process_Tab(gPaIRS_Tab):
             FlagStable=FlagStable and not flagUnstable
             if k==self.PROpar.Nit-1:
                 if j==0:
-                    if self.father and hasattr(self.father,'w_Export'): Res=self.father.w_Export.OUTpar.xres
+                    if self.father and hasattr(self.father,'w_Output'): Res=self.father.w_Output.OUTpar.xres
                     else: Res=0
                     self.MTF=[lam,MTF.T,f'IW size-spacing: {Wa:d}-{Wc:d}.   Vel.-correl. windowing: {VelWin}-{CorrWin}.',Res]
                     
                 else:
                     if self.PROpar.Vect[j*2][kVect]>self.PROpar.Vect[(j-1)*2][kVect]:
-                        if self.father: Res=self.father.w_Export.OUTpar.xres*self.father.w_Export.OUTpar.pixAR
+                        if self.father: Res=self.father.w_Output.OUTpar.xres*self.father.w_Output.OUTpar.pixAR
                         else: Res=0
                         self.MTF=[lam,MTF.T,f'IW size-spacing: {Wa:d}-{Wc:d}.   Vel.-correl. windowing: {VelWin}-{CorrWin}.',Res]
         if FlagStable:

PaIRS_UniNa/Process_Tab_Disp.py

@@ -134,15 +134,22 @@ class Process_Tab_Disp(gPaIRS_Tab):
     def line_edit_IW_action(self):
         text=self.ui.line_edit_IW.text()
         split_text=re.split(r'(\d+)', text)[1:-1:2]
+        if len(split_text)==0:
+            message="Please insert at least one value!"
+            show_mouse_tooltip(self,message)
+            self.line_edit_IW_set()
+            return
         split_num=[int(t) for t in split_text]
         if len(split_num)<4: split_num+=[split_num[-1]]*(4-len(split_num))
         vect=[int(split_num[i]) for i in (0,2,1,3)]
         FlagValid=len(vect)==4 and all([v>0 for v in vect])
         if FlagValid:
             self.PROpar.Vect=vect
+            message=""
         else:
             message='IW sizes or spacings were assigned inconsistently! Please, retry!'
-            showTip(self,message)
+        show_mouse_tooltip(self,message)
+        self.line_edit_IW_set()
         return
 
 #******************** Settings

PaIRS_UniNa/SPIVCalHelp.py

@@ -0,0 +1,155 @@
+from PySide6 import QtWidgets, QtGui, QtCore
+import sys
+from .PaIRS_pypacks import icons_path, fontPixelSize
+
+def showSPIVCalHelp(parent=None,disable_callback=None):
+    """
+    Shows an informational dialog explaining the correct calibration setup
+    for stereoscopic PIV in PaIRS, ensuring compatibility with disparity
+    correction and full stereoscopic reconstruction.
+    """
+    dlg = QtWidgets.QDialog(parent)
+    dlg.setWindowTitle("Guidelines for stereoscopic PIV calibration")
+    #dlg.resize(900, 750)
+    dlg.setMinimumWidth(900)
+    dlg.setMinimumHeight(750)
+
+    main_layout = QtWidgets.QVBoxLayout(dlg)
+
+    # --- Explanatory text (English, corrected axes) ---
+    text = (
+        "For stereoscopic PIV, PaIRS assumes that:<br><br>"
+
+        "&nbsp;&nbsp;• the <b>calibration plate defines "
+        "the x–y plane</b> of the calibration coordinate system;<br>"
+        
+        "&nbsp;&nbsp;• the <b>x-axis</b> is <b>aligned with the stereoscopic baseline</b>, i.e. "
+        "the direction along which the projections of the two camera viewing rays diverge "
+        "on the calibration plate (the dominant disparity direction);<br>"
+
+        "&nbsp;&nbsp;• the <b>y-axis</b> is then defined as the axis <b>perpendicular to the plane containing "
+        "the two cameras</b> (i.e. perpendicular to the triangulation plane formed by the two "
+        "optical axes);<br>"
+
+        "&nbsp;&nbsp;• the <b>z-axis is normal to the plate</b> (typically pointing towards the cameras).<br><br>"
+
+        "To ensure full compatibility with the operations performed in the disparity correction step and the stereoscopic reconstruction,"
+        " the calibration procedure must always adhere to the above coordinate convention.<br>"
+        " The example below shows a <b>correct</b> configuration (left) and an <b>incorrect</b> one (right).<br>"
+    )
+
+    text_label = QtWidgets.QLabel()
+    text_label.setWordWrap(True)
+    text_label.setTextFormat(QtCore.Qt.RichText)
+    text_label.setText(f"<div>{text}</div>")
+    main_layout.addWidget(text_label)
+    font=dlg.font()
+    font.setPixelSize(fontPixelSize+4)
+    text_label.setFont(font)
+
+    # --- Side-by-side images ---
+    img_layout = QtWidgets.QHBoxLayout()
+    img_layout.setSpacing(10)
+    main_layout.addLayout(img_layout)
+
+    # Paths to images (adjust to match PaIRS resources folder)
+    img_ok_path = icons_path+"spiv_setup_ok.png"
+    img_no_path = icons_path+"spiv_setup_no.png"
+
+    # --- Correct configuration image ---
+    ok_widget = QtWidgets.QVBoxLayout()
+    ok_caption = QtWidgets.QLabel()
+    caption_text = "<b>Correct configuration (x–z stereo plane)</b>"
+    ok_caption.setText(f"<div>{caption_text}</div>")
+    ok_caption.setFont(font)
+    ok_caption.setTextFormat(QtCore.Qt.RichText)
+    ok_caption.setAlignment(QtCore.Qt.AlignCenter)
+
+    ok_label_img = QtWidgets.QLabel()
+    ok_label_img.setAlignment(QtCore.Qt.AlignCenter)
+    ok_label_img.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+    ok_label_img.setScaledContents(True)
+    
+    ok_pix = QtGui.QPixmap(img_ok_path)
+    if not ok_pix.isNull():
+        ok_pix = ok_pix.scaledToWidth(400, QtCore.Qt.SmoothTransformation)
+        ok_label_img.setPixmap(ok_pix)
+    ok_label_img.setFixedSize(ok_pix.width(),ok_pix.height())
+
+    ok_widget.addWidget(ok_caption)
+    ok_widget.addWidget(ok_label_img)
+    img_layout.addLayout(ok_widget)
+
+    # --- Incorrect configuration image ---
+    no_widget = QtWidgets.QVBoxLayout()
+    no_caption = QtWidgets.QLabel()
+    caption_text = "<b>Incorrect configuration</b>"
+    no_caption.setText(f"<div'>{caption_text}</div>")
+    no_caption.setFont(font)
+    no_caption.setTextFormat(QtCore.Qt.RichText)
+    no_caption.setAlignment(QtCore.Qt.AlignCenter)
+
+    no_label_img = QtWidgets.QLabel()
+    no_label_img.setAlignment(QtCore.Qt.AlignCenter)
+    no_label_img.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+    no_label_img.setScaledContents(True)
+    
+    no_pix = QtGui.QPixmap(img_no_path)
+    if not no_pix.isNull():
+        no_pix = no_pix.scaledToWidth(400, QtCore.Qt.SmoothTransformation)
+        no_label_img.setPixmap(no_pix)
+    no_label_img.setFixedSize(no_pix.width(),no_pix.height())
+
+    no_widget.addWidget(no_caption)
+    no_widget.addWidget(no_label_img)
+    img_layout.addLayout(no_widget)
+
+    # Prevent bottom clipping: allow images row to shrink/expand as needed
+    main_layout.setStretch(0, 1)
+    main_layout.setStretch(1, 0)
+
+    # Create a horizontal layout for buttons
+    button_layout = QtWidgets.QHBoxLayout()
+
+    # Spacer pushes OK to the right
+    button_layout.addStretch(1)
+
+    # Left button
+    if disable_callback is not None:
+        button_disable = QtWidgets.QPushButton("Don't show this message again")
+        def on_disable():
+            disable_callback()
+            dlg.accept()
+        button_disable.clicked.connect(on_disable)
+        button_layout.addWidget(button_disable)
+
+    # Right button (OK)
+    button_ok = QtWidgets.QPushButton("OK")
+    def on_ok():
+        dlg.accept()
+    button_ok.clicked.connect(on_ok)
+    button_layout.addWidget(button_ok)
+
+    # Add the layout to the dialog
+    main_layout.addSpacing(12)
+    main_layout.addLayout(button_layout)
+
+    button_ok.setDefault(True)
+    button_ok.setFocus()
+
+    main_layout.setContentsMargins(20, 25, 20, 25)  # slightly larger bottom margin to avoid macOS clipping
+
+    dlg.exec()
+
+if __name__ == "__main__":
+    # QApplication MUST be created before any QWidget
+    app = QtWidgets.QApplication(sys.argv)
+
+    # Parent window (optional)
+    main_window = QtWidgets.QMainWindow()
+    main_window.show()
+
+    # Show the SPIV calibration dialog
+    showSPIVCalHelp(parent=main_window)
+
+    sys.exit(app.exec())