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

PaIRS_UniNa/calib.py

@@ -43,7 +43,7 @@ if Flag_DEBUG_PARPOOL: import debugpy #nel casso mettere nel thread debugpy.debu
 
 
 sleepTimeWorkers=0.2 #for multithreading and other stuff
-FlagReadCfg=False
+FlagReadCfg=True
 PrintTA.flagPriority=PrintTAPriority.veryLow 
 # errror codes 
 TYPE_ERR_REPEAT=-101 # pylint: disable=invalid-name
@@ -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:
@@ -335,12 +335,16 @@ class Calib(PaIRS_lib.PyFunOutCalib):
   def taskFindAllPlanesFromOrigin(self):  
     ''' finds all the spots in the planes when the origins and angles are known'''
     self.cal.flagWorking=1
-    for c in range(self.nCams):
-      p0=c*self.nPlanesPerCam
-      for p in range(0,self.nPlanesPerCam):
-        self.findPlane(p0+p)
-    self.signals.drawCirclesFromCalib.emit(self.plane)
-    self.cal.flagWorking=0
+    try:
+      for c in range(self.nCams):
+        p0=c*self.nPlanesPerCam
+        for p in range(0,self.nPlanesPerCam):
+          self.findPlane(p0+p)
+      self.signals.drawCirclesFromCalib.emit(self.plane)
+    except ValueError as exc:
+      raise exc #può succedere in findPlaneAutomatic o se si preme stop
+    finally:
+      self.cal.flagWorking=0
 
 
 
@@ -441,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:
+      
+      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) 
       
@@ -548,7 +555,7 @@ class Calib(PaIRS_lib.PyFunOutCalib):
     except Exception as exc:
       #traceback.print_exc()
       #pri.Info.white(str(exc.__cause__).split('\n')[3])
-      pri.Info.whiteri(str(exc.args[0]).split('\n')[3])
+      pri.Info.white(str(exc.args[0]).split('\n')[3])
       #'''
     #for i in range(100):              print(f'{outDa.z[0]} {outDa.XOr[0]} {outDa.YOr[0]} {outDa.angCol[0]} {outDa.angRow[0]}')
     

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
@@ -229,7 +229,7 @@ class CalibView(QLabel):
     ''' button  pressed '''
     #pri.Info.red(f'executeCalibTask  {self.calib.flagExitFromView is True}   {self.calib.cal.flagWorking } {self.calib.cal.flagWorking is True}')
     if self.calib.flagExitFromView is True and self.calib.cal.flagWorking ==1:
-      pri.Info.red('#stil working let us wait')# never used? Maybe flagWorking is useless???
+      pri.Info.red('still working let us wait')# never used? Maybe flagWorking is useless???
       return False
     if flag is self.flagCurrentTask or flag  is CalibTasks.stop:# in this case always stop
       self.calib.flagExitFromView=True
@@ -271,15 +271,20 @@ class CalibView(QLabel):
   def plotPlane(self,plane):
     ''' plot image of plane=plane'''
     pri.Info.green('plotPlane call')
-    if 0<=plane <self.calib.nPlanes:
-      self.calib.cal.data.piano=self.calib.plane=plane
-      self.calib.cal.initFindPoint(plane)
-      flagPlot=self.plotImg(plane)   
-      if flagPlot and not self.calib.flagPlotMask: 
-        self.drawCircles(plane)   
+    flagPlot=False
+    try:
+      if 0<=plane <self.calib.nPlanes:
+        self.calib.cal.data.piano=self.calib.plane=plane
+        self.calib.cal.initFindPoint(plane)
+        flagPlot=self.plotImg(plane)   
+        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{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}')
+    return flagPlot
     
   @Slot(int)
   def plotImg(self,plane,flagDrawRect=False):
@@ -331,14 +336,14 @@ class CalibView(QLabel):
     if not calib.flagPlotMask:
         if len(calib.imgs):
           self.imgPlot=self.normalizeArray(calib.imgs[plane],calib.LMax,calib.LMin)
-          FlagPlot=self.imgPlot.max()!=self.imgPlot.min()
+          FlagPlot=bool(self.imgPlot.max()!=self.imgPlot.min())
 
         if calib.flagShowMask and len(calib.ccMask):#todo TA ma se l'img è più piccola
           self.imgPlot[0:mask.shape[0],0:mask.shape[1]]=mask # pylint: disable=unsupported-assignment-operation
     else:
         if len(calib.ccMask):
           self.imgPlot=mask
-          FlagPlot=self.imgPlot.max()!=self.imgPlot.min()
+          FlagPlot=bool(self.imgPlot.max()!=self.imgPlot.min())
       
     return self.imgPlot,FlagPlot
   
@@ -346,15 +351,21 @@ class CalibView(QLabel):
     #todo GP non è mai chiamata con None è necessario complicarla? Fra l'altro se decidiamo di valutare 
     # min e max in fase di assegnazione è inutile
     a=da.copy()# todo GP perchè la copii?
-    LLim=2**(2**a.dtype.num)-1
-    if not LMax: 
-      LMax=max([min([a.max(),LLim]),-LLim+1])
-    if not LMin: 
-      LMin=max([min([a.min(),LMax-1]),-LLim])
-    LMax=max([LMin+1,LMax])
-
-    a[a>LMax]=LMax
-    a[a<LMin]=LMin
+    if 'int' in a.dtype.name:
+      LLim=2**16-1
+      if not LMax: 
+        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
+    else:
+      LMax=a.max()
+      LMin=a.min()
+      if LMax==LMin: LMax=LMax+1
+  
     a=np.uint8(255.0*(a-LMin)/(LMax-LMin)) 
     return a
   def insideImg(self,pu:Punto)->bool:
@@ -488,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)
@@ -521,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)
@@ -611,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)
@@ -664,7 +680,7 @@ class CalibView(QLabel):
     ''' plot image of plane=plane'''
     self.plotPlane(plane)
 
-  def spinOriginChanged(self,Off:int,spin:QSpinBox,flagX:bool):
+  def spinOriginChanged(self,Off:int,spin:QSpinBox,flagX:bool,flagPlot=True):
     ''' offset Origin '''
     p=self.calib.plane
     calVect=self.calib.cal.vect
@@ -676,7 +692,7 @@ class CalibView(QLabel):
       calVect.xOrShift[p]=Off
     else:
       calVect.yOrShift[p]=Off
-    self.plotPlane(self.calib.plane)
+    if flagPlot: self.plotPlane(self.calib.plane)
   
   def copyRemPoints(self):
     p=self.calib.plane
@@ -713,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)