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

PaIRS_UniNa/addwidgets_ps.py

@@ -8,6 +8,7 @@ InitCheck=True   #False=Collap closed, True=opened
 #fonts
 font_italic=True
 font_weight=QFont.DemiBold
+backgroundcolor_none=" background-color: none;"
 backgroundcolor_changing=" background-color: rgb(255,230,230);"
 color_changing="color: rgb(33,33,255); "+backgroundcolor_changing
 color_changing_black="color: rgb(0,0,0); "+backgroundcolor_changing
@@ -17,7 +18,7 @@ def setSS(b,style):
     ss=f"{b.metaObject().className()}{'{'+style+'}'}\\nQToolTip{'{'+b.initialStyle+'}'}"
     return ss
 
-class MyTabLabel(QtWidgets.QLabel):
+class MyTabLabel(QLabel):
     def __init__(self,parent):
         super().__init__(parent)
         #self.setCursor(QCursor(QtCore.Qt.PointingHandCursor))
@@ -27,6 +28,12 @@ class MyTabLabel(QtWidgets.QLabel):
         for f in self.addfuncclick:
              self.addfuncclick[f]()
         return super().mousePressEvent(event)
+    
+    def setCustomCursor(self):
+        if self.addfuncclick:
+            self.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
+        else:
+            self.setCursor(QCursor(Qt.CursorShape.ArrowCursor))
 
 #MyQLineEdit=QtWidgets.QLineEdit
 class MyQLineEdit(QtWidgets.QLineEdit):
@@ -57,7 +64,7 @@ class MyQLineEdit(QtWidgets.QLineEdit):
                     if hasStyleFlag:
                         if b.styleFlag: continue
                     b.flagS=True
-                    b.initialStyle=b.styleSheet()
+                    b.initialStyle=b.styleSheet()+" "+backgroundcolor_none
                     b.setEnabled(False)
                     b.disabledStyle=b.styleSheet()
                     b.setEnabled(True)
@@ -91,24 +98,32 @@ class MyQLineEdit(QtWidgets.QLineEdit):
         super().mouseReleaseEvent(event) #to preserve classical behaviour before adding the below
         self.setCompleterList()
 
+    def enterEvent(self, event):
+        super().enterEvent(event)
+        if not self.font()==self.font_changing and not self.hasFocus():
+            self.setFont(self.font_changing)
+
+    def leaveEvent(self, event):
+        super().leaveEvent(event)
+        if self.font()==self.font_changing and not self.hasFocus():
+            self.setFont(self.initialFont)
+
     def focusInEvent(self, event):
         super().focusInEvent(event)
         for f in self.addfuncin:
             self.addfuncin[f]()
         self.focusInFun()
-    
+            
     def setFocus(self):
         super().setFocus()
         self.focusInFun()
 
     def focusInFun(self):
-        #self.setCompleterList()
-        if not self.font()==self.font_changing:
-            self.setStyleSheet(setSS(self,self.initialStyle+" "+color_changing))
-            self.setFont(self.font_changing)
-            for b in self.bros:
-                if (not b==self) and b.flagS:
-                        b.setStyleSheet(b.initialStyle+" "+color_changing_black)
+        self.setStyleSheet(setSS(self,self.initialStyle+" "+color_changing))
+        self.setFont(self.font_changing)
+        for b in self.bros:
+            if (not b==self) and b.flagS:
+                    b.setStyleSheet(b.initialStyle+" "+color_changing_black)
                  
     def focusOutEvent(self, event):
         super().focusOutEvent(event) #to preserve classical behaviour before adding the below
@@ -121,15 +136,14 @@ class MyQLineEdit(QtWidgets.QLineEdit):
         self.focusOutFun()
 
     def focusOutFun(self):
-        if self.font()==self.font_changing:
-           for b in self.bros:
-                if b.flagS:
-                    if hasattr(b,'default_stylesheet'):
-                        b.setStyleSheet(b.default_stylesheet)
-                    else:
-                        b.setStyleSheet(setSS(b,b.initialStyle))
-                if b.flagF:
-                    b.setFont(b.initialFont)
+        for b in self.bros:
+            if b.flagS:
+                if hasattr(b,'default_stylesheet'):
+                    b.setStyleSheet(b.default_stylesheet)
+                else:
+                    b.setStyleSheet(setSS(b,b.initialStyle))
+            if b.flagF:
+                b.setFont(b.initialFont)
         #self.addlab.clear()
             
     def showCompleter(self):
@@ -182,7 +196,7 @@ class MyQSpin(QtWidgets.QSpinBox):
             self.bros=[self]+self.addwid
             for b in self.bros:
                 if b.styleFlag: continue
-                b.initialStyle=b.styleSheet()
+                b.initialStyle=b.styleSheet()+" "+backgroundcolor_none
                 b.initialFont=b.font()
                 b.font_changing=font_changing
                 b.styleFlag=True
@@ -276,7 +290,7 @@ class MyQDoubleSpin(QtWidgets.QDoubleSpinBox):
             self.bros=[self]+self.addwid
             for b in self.bros:
                 if self.styleFlag: continue
-                b.initialStyle=b.styleSheet()
+                b.initialStyle=b.styleSheet()+" "+backgroundcolor_none
                 b.initialFont=b.font()
                 b.font_changing=font_changing
                 b.styleFlag=True
@@ -332,7 +346,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:
@@ -344,15 +360,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);}"+\
@@ -362,8 +383,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()
@@ -663,13 +682,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():
@@ -678,7 +698,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)
@@ -727,6 +749,46 @@ class CustomLineEdit(QLineEdit):
         else:
             super().keyReleaseEvent(event)
 
+class ResizingLabel(QLabel):
+    def __init__(self,*args,**kwargs):
+        super().__init__(*args,**kwargs)
+        self.complete_text=self.text()
+        
+    def setText(self,text):
+        self.complete_text=text
+        self.resizeText(text)
+        return 
+    
+    def resizeEvent(self, event: QResizeEvent) -> None:
+        super().resizeEvent(event)
+        self.resizeText(self.text())
+        return 
+    
+    def resizeText(self,text):
+        text=self.complete_text
+        metrics = QFontMetrics(self.font())
+        if self.alignment() & Qt.AlignmentFlag.AlignRight:
+            FlagRight=True
+            textElideMode=Qt.TextElideMode.ElideLeft
+        else:
+            FlagRight=False
+            textElideMode=Qt.TextElideMode.ElideRight
+        if "<span" in text:
+            match = re.search(r"<span(.*?)</span>", text)
+            html_part = "<span"+match.group(1)+"</span>"
+            index = match.start(1)-5
+            text_without_bullet=text.replace(html_part,'')
+            truncated_text=metrics.elidedText(text_without_bullet, textElideMode, self.width()-5)
+            if FlagRight:
+                index=len(truncated_text)-3*(int('...' in truncated_text))-len(text_without_bullet[index:])
+                if index>0:
+                    truncated_text=truncated_text[:index]+html_part+truncated_text[index:]
+            elif index>len(truncated_text)-3:
+                truncated_text=truncated_text[:index]+html_part+truncated_text[index:]
+        else:
+            truncated_text = metrics.elidedText(text, textElideMode, self.width())
+        super().setText(truncated_text)
+
 class EditableLabel(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -735,7 +797,7 @@ class EditableLabel(QWidget):
         self.main_layout.setContentsMargins(0,0,0,0)
         self.main_layout.setSpacing(0)
 
-        self.label = QLabel(self)
+        self.label = ResizingLabel(self)
         self.label.setAlignment(Qt.AlignmentFlag.AlignLeft)
         self.label.mouseDoubleClickEvent = self.enable_editing
 
@@ -745,6 +807,7 @@ class EditableLabel(QWidget):
         self.edit.editingFinished.connect(self.disable_editing)
         self.edit.cancelEditing.connect(self.disable_editing)
         self.updateLabel=lambda: None
+        self.bullet=''
 
         self.installEventFilter(self)  # Installare il filtro eventi
 
@@ -762,7 +825,7 @@ class EditableLabel(QWidget):
     def enable_editing(self, event):
         self.label.hide()
         self.edit.setGeometry(self.label.geometry())  # Assicurati che l'editor prenda la posizione della label
-        self.edit.setText(self.label.text())  # Assicurati che il testo corrente venga impostato nell'editor
+        self.edit.setText(self.label.text().replace(self.bullet,''))  # Assicurati che il testo corrente venga impostato nell'editor
         self.edit.selectAll()
         self.edit.show()
         self.window().setFocus()
@@ -774,7 +837,7 @@ class EditableLabel(QWidget):
         self.label.show()
         self.updateLabel()
 
-    
+
 #********************************************* Matplotlib
 import io
 import matplotlib as mpl
@@ -804,6 +867,17 @@ class MplCanvas(FigureCanvasQTAgg):
         #clrgb=[int(i*255) for i in color_tuple]
         self.fig.set_facecolor(color_tuple)
 
+        self.copyIcon=QIcon(icons_path+"copy.png")
+        self.openNewWindowIcon=QIcon(icons_path+"open_new_window.png")
+        self.scaleDownIcon=QIcon(icons_path+"scale_down.png")
+        self.scaleUpIcon=QIcon(icons_path+"scale_up.png")
+        self.scaleAllIcon=QIcon(icons_path+"scale_all.png")
+        self.showAllIcon=QIcon(icons_path+"show_all.png")
+        self.alignAllIcon=QIcon(icons_path+"align_all.png")        
+        self.closeAllIcon=QIcon(icons_path+"close_all.png")
+        self.loadImageIcon=QIcon(icons_path+"open_image.png")
+        self.loadResultIcon=QIcon(icons_path+"open_result.png")
+
         super(MplCanvas, self).__init__(self.fig)
 
     def mouseReleaseEvent(self, event):
@@ -863,7 +937,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
 
@@ -923,7 +997,17 @@ class MplCanvas(FigureCanvasQTAgg):
             showAll = contextMenu.addAction("Show all ("+QS_showAll.key().toString(QKeySequence.NativeText)+")")
             alignAll = contextMenu.addAction("Align all ("+QS_alignAll.key().toString(QKeySequence.NativeText)+")")
             closeAll = contextMenu.addAction("Close all ("+QS_closeAll.key().toString(QKeySequence.NativeText)+")")
+            
+            copy2clipboard.setIcon(self.copyIcon)
+            scaleDown.setIcon(self.scaleDownIcon)
+            scaleUp.setIcon(self.scaleUpIcon)
+            scaleAll.setIcon(self.scaleAllIcon)
+            showAll.setIcon(self.showAllIcon)
+            alignAll.setIcon(self.alignAllIcon)
+            closeAll.setIcon(self.closeAllIcon)
+
             action = contextMenu.exec(fig2.mapToGlobal(event.pos()))
+
             if action == copy2clipboard:
                 fCopy2clipboard()
             elif action == scaleDown:
@@ -1014,33 +1098,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! *****")

PaIRS_UniNa/calib.py

@@ -218,7 +218,7 @@ class Calib(PaIRS_lib.PyFunOutCalib):
   def findPlaneFrom3Points(self,plane=0,op=0):  
     ''' ask the user to input the 3 points and then finds the spots in the plane'''
     try:
-      #pri.General.magenta(plane)
+      #pri.Info.magenta(plane)
       self.resetFindPlane(plane) 
       for i in range (3):
         self.signals.textFromCalib.emit(f'Select the {self.pointDesc[i]} point')
@@ -285,7 +285,7 @@ class Calib(PaIRS_lib.PyFunOutCalib):
     if flagPlane:# the points have not been found
       
       if flagPlane &   CalFlags.PLANE_ORIGIN_NOT_FOUND: # no origin error code
-        #pri.General.red('getFlagPlane-> searching????')
+        #pri.Info.red('getFlagPlane-> searching????')
         err=-1
         return err
       try:
@@ -445,10 +445,13 @@ class Calib(PaIRS_lib.PyFunOutCalib):
     try:
       pri.Process.blue ('calibrating ')
       self.signals.textFromCalib.emit('calibrating ')
+      pri.Info.white(f'init calibration {self.cal.flagCalibrated}')
       self.cal.calibrate(self.funCalib) 
+      
       while self.cal.flagWorking==2:# and not self.isKilled:        
         timesleep(sleepTimeWorkers) 
-      self.cal.checkCalibration() 
+      pri.Info.white(f'end calibration {self.cal.flagCalibrated}')
+      self.cal.checkCalibration() #needed because use the main thread and may exit with an exception
       self.FlagCalibration=True
       self.cal.saveCfg (0,self.cfgName) 
       

PaIRS_UniNa/calibView.py

@@ -2,7 +2,7 @@
 # pylint: disable=pointless-string-statement, too-many-instance-attributes, no-name-in-module, multiple-imports
 # pylint: disable= import-error 
 # pylint: disable=multiple-statements,c-extension-no-member
-import sys #, traceback
+import sys, traceback
 from typing import Callable
 from enum import Enum
 #import faulthandler # per capire da dove vengono gli errori c
@@ -280,7 +280,7 @@ class CalibView(QLabel):
         if flagPlot and not self.calib.flagPlotMask: 
           self.drawCircles(plane)   
     except Exception as inst:
-      pri.Error.red(f'plotePlane call: error while plotting image\n{inst}')
+      pri.Error.red(f'plotePlane call: error while plotting image\n{traceback.format_exc()}')
     #XY=self.calib.cal.pointFromCalib([0,0,0],0)
     #pri.Info.green(f"Punto (x,y,z)=(0,0,0) -> (X,Y)=({XY.x},{XY.y})")
     #self.outToStatusBarCaller(f'Cam#:{self.calib.plane//self.calib.nPlanesPerCam} Plane:{self.calib.plane%self.calib.nPlanesPerCam}')
@@ -357,6 +357,7 @@ class CalibView(QLabel):
         LMax=max([min([a.max(),LLim]),-LLim+1])
       if not LMin: 
         LMin=max([min([a.min(),LMax-1]),-LLim])
+      LMin=max([0,LMin])
       LMax=max([LMin+1,LMax])
       a[a>LMax]=LMax
       a[a<LMin]=LMin
@@ -498,6 +499,9 @@ class CalibView(QLabel):
     ''' draw arrow from x1 to x scaled with l''' 
     dx=(x-x1)*l
     dy=(y-y1)*l
+    if abs(dx)>10**6 or abs(dy)>10**6:
+      dx=10**3
+      dy=10**3
     x2=x1+dx
     y2=y1+dy
     painter.drawLine(x1,y1,x2,y2)
@@ -531,15 +535,15 @@ class CalibView(QLabel):
       puOr=Punto(calVect.XOr[p],calVect.YOr[p])
       ind=0
       #puOr=Punto(out.X[p,ii], out.Y[p,ii])
-      #for pp in range (0,self.calib.cal.data.Numpiani):        pri.General.green(out.X[pp,ii], out.Y[pp,ii])
-      #pri.General.green(f'Or=({out.X[p,iOr]}, {out.Y[p,iOr]})   x=({out.X[p,ii]}, {out.Y[p,ii]})  y=({out.X[p,iOr+1]}, {out.Y[p,iOr+1]})')
+      #for pp in range (0,self.calib.cal.data.Numpiani):        pri.Info.green(out.X[pp,ii], out.Y[pp,ii])
+      #pri.Info.green(f'Or=({out.X[p,iOr]}, {out.Y[p,iOr]})   x=({out.X[p,ii]}, {out.Y[p,ii]})  y=({out.X[p,iOr+1]}, {out.Y[p,iOr+1]})')
 
 
       if flagDrawCircles:
         r=rInpCircle
         def pCir(X:float, Y:float,r:float):
           painter.drawRoundedRect(X-r, Y-r,2*r,2*r,r,r)
-          #pri.General.green(X,Y)
+          #pri.Info.green(X,Y)
         pen.setColor(QtGui.QColor(mainInCircleColors[ind]))
         painter.setPen(pen)
         pCir(puOr.x,puOr.y,r)
@@ -621,7 +625,9 @@ class CalibView(QLabel):
       if self.calib.cal.flagCalibrated:    
         data=self.calib.cal.data
         for i in indOk:
-          self.drawArrow(painter,lunFreccia,calVect.X[p,i], calVect.Y[p,i],calVect.Xc[p,i]-data.ColPart, calVect.Yc[p,i]-data.RigaPart)
+          x=float(calVect.Xc[p,i]-data.ColPart)
+          y=float(calVect.Yc[p,i]-data.RigaPart)
+          self.drawArrow(painter,lunFreccia,calVect.X[p,i], calVect.Y[p,i],x,y)
         if p==data.kMax:
           pen.setColor(QtGui.QColor(maxErrorCircleColor))
           painter.setPen(pen)
@@ -723,6 +729,13 @@ class CalibView(QLabel):
       else:
         calVect.remPointsDo[p]=Off
     self.calib.cal.removeBulk()
+    if self.calib.cal.flagCalibrated:
+      self.calib.cal.checkCalibration() #needed because use the main thread and may exit with an exception
+      strPriCalib=self.calib.prettyPrintCalib()
+      strPriErrCalib=self.calib.prettyPrintErrCalib()
+      pri.Process.blue (strPriErrCalib)
+          
+      self.calib.signals.textFromCalib.emit(strPriErrCalib+'\n'+strPriCalib)
     self.plotPlane(self.calib.plane)
   
   @Slot(int)