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

PaIRS_UniNa/parForWorkers.py

@@ -388,6 +388,7 @@ class StereoDisparity_ParFor_Worker(ParForWorker):
         if self.isKilled: return self.stopDisparity(it,flagOut,flagOutIter)
         try:
           self.disp.initAllocDisp()
+          self.disp.dispAvCo.NImg=2*len(imList[0][0]) if spivIn.FlagImgTau==0 else len(imList[0][0])
         except Exception as inst: #ValueError as exc:
           FlagInitError=True
           stringaErr=f'\n!!!!!!!!!! Error during disparity process initialization:\n{inst}\n'
@@ -473,7 +474,7 @@ class StereoDisparity_ParFor_Worker(ParForWorker):
           pri.Error.red(stringaErr)
         else:
           flagOut|=FLAG_PROC[kConst]# per completezza aggiungo anche processato
-          stampa+=f"   Laser plane eq. : z (mm) = {ve.PianoLaser[0]:.4g} + {ve.PianoLaser[1]:.4g} * x + {ve.PianoLaser[2]:.4g} * y\n   Residual calib. error    = {dAC.dOrtMean:.4g} pixels\n   Estimated laser thick.   = {dAC.DeltaZ:.4g} pixels (approx. {dAC.DeltaZ * dP.RisxRadd / abs(dAC.ta0Mean - dAC.ta1Mean):.4g} mm)\n"
+          stampa+=f"   Laser plane eq. :  z (mm) = {ve.PianoLaser[0]:.4g} + {ve.PianoLaser[1]:.4g} * x + {ve.PianoLaser[2]:.4g} * y\n   Residual calib. err. ort. = {dAC.dOrtMean:.4g} pixels\n   Residual calib. err. par. = {dAC.dParMean:.4g} pixels\n   Estimated laser thick.    = {dAC.DeltaZ:.4g} pixels (approx. {dAC.DeltaZ * dP.RisxRadd / abs(dAC.ta0Mean - dAC.ta1Mean):.4g} mm)\n   Outliers %                = {dAC.percOutlier*100:g} \n"
           data.OUT_dict['zconst']=float(ve.PianoLaser[0])
           data.OUT_dict['xterm']=float(ve.PianoLaser[1])
           data.OUT_dict['yterm']=float(ve.PianoLaser[2])
@@ -484,6 +485,10 @@ class StereoDisparity_ParFor_Worker(ParForWorker):
             #  saveResults(data,-1,Var,nameVar)
             #else:
             saveResults(data,f'it{it+1}',Var,nameVar)
+            CC_rot=self.create_CC_image(self.disp.vect.CCrot)
+            nameFileOut=data.resF(f'it{it+1}',string='dispMap')
+            self.save_CC_image(CC_rot,nameFileOut)
+            pass
           except Exception as inst:
             errorPrint=f"\n!!!!!!!!!! Error while saving the results:\n{str(inst)}\n"
             stampa+=errorPrint
@@ -546,3 +551,43 @@ class StereoDisparity_ParFor_Worker(ParForWorker):
         self.signals.progress.emit(procID,ind,flagOutIter,[],'')
      self.signals.finished.emit(data,'')  
 
+
+  def create_CC_image(self,CC):
+    # Get the dimensions of the input matrix
+    n, m, h, w = CC.shape
+
+    # Normalize the matrix values to the range [0, 65535]
+    CC_min = CC.min()
+    CC_max = CC.max()
+    CC_mean = 0.5*(CC_min+CC_max)
+    CC_mean_normalized = (CC_mean + 1.0)/2.0 * 65535
+
+    CC_normalized = (CC + 1.0)/2.0 * 65535
+    CC_normalized = CC_normalized.astype(np.uint16)  # Convert to 16-bit integers
+
+    # Initialize the final image grid with the correct size
+    h=2*self.disp.dispAvCo.N_NormEpi+1
+    grid_height = h * n
+    grid_width  = w * m
+    CC_rot = np.zeros((grid_height, grid_width), dtype=np.uint16)
+
+    # Populate the grid with submatrices
+    try:
+      for i in range(n):
+          for j in range(m):
+              # Copy the submatrix (w x h) into the appropriate position in the grid
+              CC_rot[i*h:(i+1)*h, j*w:(j+1)*w] = CC_normalized[i, j, :h, :]
+              CC_rot[i*h, j*w:(j+1)*w] = CC_mean_normalized
+              CC_rot[i*h:(i+1)*h, j*w] = CC_mean_normalized
+              CC_rot[(i+1)*h-1, j*w:(j+1)*w] = CC_mean_normalized
+              CC_rot[i*h:(i+1)*h, (j+1)*w-1] = CC_mean_normalized
+    except:
+       pri.Error.red(f'Error while generating disparity map image:\n{traceback.format_exc()}\n\n')
+       pass
+
+    return CC_rot
+  
+  def save_CC_image(self,CC,file_path):
+    image = Image.fromarray(CC)
+    image.save(file_path)
+    return 

PaIRS_UniNa/procTools.py

@@ -168,14 +168,20 @@ class dataTreePar(TABpar):
         self.assignDataName()
         return
 
-    def resF(self,i):
+    def resF(self,i,string=''):
         if self.ndig<-1: return ''
-        if type(i)==str:
-            return f"{self.outPathRoot}_{i}{self.outExt}"
-        elif type(i)==int:
-              return f"{self.outPathRoot}_{i:0{self.ndig:d}d}{self.outExt}"
+        if string=='dispMap':
+          fold=os.path.dirname(self.outPathRoot)
+          rad=os.path.splitext(os.path.basename(self.outPathRoot))[0]
+          if rad[-1]!='_': rad+='_'
+          return myStandardRoot(os.path.join(fold, f'dispMap_rot_{rad}{i}.png'))
         else:
-            return ''
+          if type(i)==str:
+              return f"{self.outPathRoot}_{i}{self.outExt}"
+          elif type(i)==int:
+                return f"{self.outPathRoot}_{i:0{self.ndig:d}d}{self.outExt}"
+          else:
+              return ''
 
     def setProc(self,INP:INPpar=INPpar(),OUT:OUTpar=OUTpar(),PRO:PROpar=PROpar(),PRO_Min:PROpar_Min=PROpar_Min(),PRO_Disp:PROpar_Disp=PROpar_Disp()):
         if INP is None: return
@@ -361,7 +367,7 @@ class dataTreePar(TABpar):
               continue
             if self.Step==StepTypes.min: #minimum
                 cont+=2
-                flag=(p&FLAG_FINALIZED[0]) and (p&FLAG_FINALIZED[1]) 
+                #flag=(p&FLAG_FINALIZED[0]) and (p&FLAG_FINALIZED[1]) 
                 if (p&FLAG_FINALIZED[0]):
                     if (p&FLAG_FINALIZED[1]):
                       LogProc+=(self.list_print[i])
@@ -375,6 +381,7 @@ class dataTreePar(TABpar):
                       else:# la b nonè stata proprio letta
                           cont-=1
                           #pri.Process.magenta(f'LogProc wrong {i} {p}   {splitAs.join(sAppo[1:-1])} {hex(p)}  ')
+                    LogProc+='\n'
                 else:
                     sAppo=self.list_print[i].split('\n')
                     if (p&FLAG_FINALIZED[1]):
@@ -1289,6 +1296,9 @@ def data2Disp(data:dataTreePar):
     dAC.N_NormEpi=PRO_Disp.SemiWidth_Epipolar      #      Semiwidth in the direction normal to the epipolar line
     dAC.RaggioFiltro=PRO_Disp.Filter_SemiWidth      #       Semiwidth of the filter for the detection of the maximum in the displacement map
     dAC.SogliaCor = PRO_Disp.Threshold   #     Threshold for the determination of point used in the baricentric search of the maximum in the disp map
+    dAC.nIterMaxValid = PRO_Disp.Nit_OutDet
+    dAC.numStd = PRO_Disp.Std_Threshold
+
     #%% Volume ********************************
     dP.xinfZC = OUT.x_min    #		Coordinata x inferiore
     dP.yinfZC = OUT.y_min    #		Coordinata y inferiore

PaIRS_UniNa/rqrdpckgs.txt

@@ -0,0 +1,8 @@
+scipy	1.14.0	1.16.0	0
+matplotlib	3.9.0	3.10.3	0
+pillow	10.4.0	11.3.0	0
+numpy	2.0.0	2.3.1	0
+pyside6	6.7.0	6.9.1	0
+unidecode	1.3.0	1.4.0	0
+psutil	6.0.0	7.0.0	0
+debugpy	1.6.6	1.8.14	0