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

PaIRS_UniNa/Process_Tab.py

@@ -352,6 +352,7 @@ class PROpar(TABpar):
         WSize=[w for w in self.Vect[0]]
         WSpac=[w for w in self.Vect[1]]
         newist=PROpar(top_new,WSize,WSpac,self.Process,self.Step)
+        newist.copyfromfields(self,newist.parFields)
         for f in self.fields:
             if f not in self.IW_fields:
                 setattr(self,f,getattr(newist,f))       
@@ -705,7 +706,7 @@ class Process_Tab(gPaIRS_Tab):
             from .procTools import dataTreePar
         data=dataTreePar(self.PROpar.Process,self.PROpar.Step)
         data.setProc(PRO=self.PROpar.duplicate())
-        data.writeCfgProcPiv(filename)
+        data.writeCfgProcPiv(filename,FlagWarningDialog=True)
         
 #******************** Settings   
     def combo_mode_set(self):
@@ -723,9 +724,8 @@ class Process_Tab(gPaIRS_Tab):
 #******************** Actions     
     def edit_Wind_vectors(self,wedit:QLineEdit,wlab:QLabel):
         text=wedit.text()
-        split_text=re.split('(\d+)', text)[1:-1:2]
+        split_text=re.split(r'(\d+)', text)[1:-1:2]
         vect=[int(i) for i in split_text]
-        tip=QToolTip(wedit)
         FlagEmpty=len(vect)==0
         if FlagEmpty: FlagError=True
         else: FlagError=not all([v>=w for v,w in zip(vect[:-1],vect[1:])])
@@ -738,21 +738,18 @@ class Process_Tab(gPaIRS_Tab):
             wlab.setToolTip(message)
             wlab.setStatusTip(message)
             """
-            tip=QToolTip(wedit)
-            tip.showText(QCursor.pos(),wlab.toolTip(),wedit,QRect(),3000)       
+            QToolTip.showText(QCursor.pos(),wlab.toolTip(),wedit,QRect(),3000)       
             """
         else: 
             wlab.setPixmap(QPixmap())
-            tip.hideText()
         self.PROpar.VectFlag[self.Vect_widgets.index(wedit)]=not FlagError
-        return split_text, vect, tip, FlagError
+        return split_text, vect, FlagError
 
     def set_Wind_vectors(self,wedit:QLineEdit,wlab:QLabel,i):
-        _, vect, tip, FlagError=self.edit_Wind_vectors(wedit,wlab)     
-        self.set_Wind_vectors_new(i,vect,tip,FlagError) 
+        _, vect, FlagError=self.edit_Wind_vectors(wedit,wlab)     
+        self.set_Wind_vectors_new(i,vect,FlagError) 
         
-    def set_Wind_vectors_new(self,i,vect,tip=QToolTip(),FlagError=False):
-        #tip.hideText()
+    def set_Wind_vectors_new(self,i,vect,FlagError=False):
         if not FlagError: 
             Nit_i=len(vect) 
             if Nit_i>self.PROpar.Nit:
@@ -942,7 +939,7 @@ class Process_Tab(gPaIRS_Tab):
                     pickle.dump(self.PROpar,file)
                     pri.Info.blue(f'Saving custom process file {filename}')
             except Exception as inst:
-                pri.Error.red(f'Error while saving custom process file {filename}:\n{traceback.print_exc}\n\n{inst}')
+                pri.Error.red(f'Error while saving custom process file {filename}:\n{traceback.format_exc()}\n\n{inst}')
                 text=''
         return text
 
@@ -1177,7 +1174,7 @@ class Process_Tab(gPaIRS_Tab):
 
 #******************** Settings
     def combo_TypeMed_set(self):
-        self.ui.w_MedTest_eps.setVisible(self.PROpar.TypeMed==1)
+        self.ui.w_MedTest_eps.setVisible(self.PROpar.TypeMed==1 and self.PROpar.FlagMedTest)
 
 #******************** Layout  
     def setPROlayout_Valid(self):
@@ -1192,7 +1189,7 @@ class Process_Tab(gPaIRS_Tab):
         self.ui.w_MedTest_ker.setVisible(self.PROpar.FlagMedTest)
         self.ui.w_MedTest_alfa.setVisible(self.PROpar.FlagMedTest)
         self.ui.w_MedTest_jump.setVisible(self.PROpar.FlagMedTest)
-        self.ui.w_MedTest_eps.setVisible(self.PROpar.TypeMed==1)
+        self.ui.w_MedTest_eps.setVisible(self.PROpar.TypeMed==1 and self.PROpar.FlagMedTest)
 
     def showSNTestwid(self):
         self.ui.label_SNTest.setVisible(self.PROpar.FlagSNTest)
@@ -1294,7 +1291,7 @@ class Process_Tab(gPaIRS_Tab):
 
     def line_edit_IW_action(self):
         text=self.ui.line_edit_IW.text()
-        split_text=re.split('(\d+)', text)[1:-1:2]
+        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:
             k=self.PROpar.row
@@ -1364,10 +1361,9 @@ class Process_Tab(gPaIRS_Tab):
             item.setStatusTip('')
 
             message='No context menu available! Please, pause processing.'
-            tip=QToolTip(self)
             toolTipDuration=self.toolTipDuration()
             self.setToolTipDuration(3000)
-            tip.showText(QCursor.pos(),message)
+            QToolTip.showText(QCursor.pos(),message)
             self.setToolTipDuration(toolTipDuration)
             item.setToolTip(toolTip)
             item.setStatusTip(toolTip)
@@ -1402,8 +1398,8 @@ class Process_Tab(gPaIRS_Tab):
                 item.set_fontsize(self.font().pixelSize())
         self.fig_MTF.tight_layout()
 
-        self.window().setEnabled(False)
-        self.fig_MTF.canvas.mpl_connect('close_event', lambda e: self.window().setEnabled(True))
+        self.gui.setEnabled(False)
+        self.fig_MTF.canvas.mpl_connect('close_event', lambda e: self.gui.setEnabled(True))
         self.fig_MTF.canvas.manager.set_window_title('Modulation Transfer Function')
         self.fig_MTF.canvas.manager.window.setWindowIcon(self.windowIcon())
         self.fig_MTF.show()

PaIRS_UniNa/Process_Tab_Disp.py

@@ -8,6 +8,8 @@ spin_tips={
     'SemiWidth_Epipolar' : 'Semi-width normal to epipolar line',
     'Filter_SemiWidth'   : 'Semi-width of filter',
     'Threshold'          : 'Threshold for disparity computation',
+    'Nit_OutDet'         : 'Number of iterations for outlier detection',
+    'Std_Threshold'      : 'S.t.d. threshold for disparity validation',
 }
 check_tips={}
 radio_tips={}
@@ -49,6 +51,8 @@ class PROpar_Disp(TABpar):
         self.Filter_SemiWidth   = 10
         self.Threshold          = 0.5
 
+        self.Nit_OutDet    = 5
+        self.Std_Threshold = 3.0
 
 class Process_Tab_Disp(gPaIRS_Tab):
     class Process_Tab_Signals(gPaIRS_Tab.Tab_Signals):
@@ -105,7 +109,6 @@ class Process_Tab_Disp(gPaIRS_Tab):
         if flagInit:     
             self.initialize()
 
-
     def initialize(self):
         pri.Info.yellow(f'{"*"*20}   PROCESS Disp initialization   {"*"*20}')
         self.setTABpar(FlagAdjustPar=True,FlagBridge=False)
@@ -115,21 +118,25 @@ class Process_Tab_Disp(gPaIRS_Tab):
 #*************************************************** Adjusting parameters
     def adjustPROpar(self):
        minIWSize=min([self.PROpar.Vect[0],self.PROpar.Vect[2]])
+       self.PROpar.SemiWidth_Epipolar=min([self.PROpar.SemiWidth_Epipolar, int(minIWSize/4)])
+       self.PROpar.Filter_SemiWidth=min([self.PROpar.Filter_SemiWidth, int(minIWSize/4)])
        self.ui.spin_SemiWidth_Epipolar.setMaximum(int(minIWSize/4))
        self.ui.spin_Filter_SemiWidth.setMaximum(int(minIWSize/4))
        return
-        
-        
+              
 #*************************************************** Layout
     def setPROlayout(self):
+        self.ui.w_Std_Threshold.setVisible(self.PROpar.Nit_OutDet>0)
         return
        
 #*************************************************** Windowing and Correlation
 #******************** Actions
     def line_edit_IW_action(self):
         text=self.ui.line_edit_IW.text()
-        split_text=re.split('(\d+)', text)[1:-1:2]
-        vect=[int(split_text[i]) for i in (0,2,1,3)]
+        split_text=re.split(r'(\d+)', text)[1:-1:2]
+        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

PaIRS_UniNa/Saving_tools.py

@@ -143,7 +143,7 @@ def save_list_to_file_serialized(l, filename, flagJSON=False):
         print(f'Error while saving the file {filename}!\n{e}\n')
         
     if pickle_counter:
-        pri.Info.yellow(f'The following non-json serializable items were found in {filename}:\n'+"\n".join(info_pickle))
+        pri.IOError.yellow(f'The following non-json serializable items were found in {filename}:\n'+"\n".join(info_pickle))
         pickle_filename = basename+'.pairs_data'
         try:
             with open(pickle_filename, 'wb') as file:
@@ -170,29 +170,35 @@ def load_list_from_file_serialized(filename):
             else:
                 file.seek(0)
                 try:
+                    import numpy 
                     serialized_list=pickle.load(file)
                 except Exception as e:
                     error=e
     except Exception as e:
         error=e
     if error:
-        print(f'Error while loading the file {filename}!\n{e}\n')
-        return serialized_list
+        pri.IOError.red(f'Error while loading the file {filename}!\n{error}\n')
+        return serialized_list, str(error)
     
+    error=''
     pickle_data = None
     if os.path.exists(pickle_filename):
         try:
             with open(pickle_filename, 'rb') as file:
                 pickle_data = pickle.load(file)
         except Exception as e:
-            print(f'Error while loading the file {pickle_filename}!\n{e}\n')
+            pri.IOError.red(f'Error while loading the file {pickle_filename}!\n{e}\n')
+            error+=str(e)
 
     info_pickle=[]
 
     def deserialize_element(data):
         if data is None:
-            return None    
-        cls_name = data.pop('parClass')
+            return None  
+        try:  
+            cls_name = data.pop('parClass')
+        except:
+            pass
         cls = globals()[cls_name]
         if cls_name=='dataTreePar':
             pass
@@ -222,7 +228,7 @@ def load_list_from_file_serialized(filename):
                                 else:
                                     setattr(new_instance,f,v_loaded)
                     except Exception as e:
-                        pri.Error.red(f'Error while reading the file {filename} (setting "{key}" field of {cls_name} item)\n{traceback.format_exc()}\n')
+                        pri.IOError.red(f'Error while reading the file {filename} (setting "{key}" field of {cls_name} item)\n{traceback.format_exc()}\n')
                 fields[key] = new_instance
             elif isinstance(value, dict) and '__file_ref__' in value:
                 ref_key = value['__file_ref__']
@@ -247,8 +253,14 @@ def load_list_from_file_serialized(filename):
             return deserialize_element(lst)
     
     if info_pickle:
-        pri.Info.red(f'The following non-json serializable items were not found in {filename}:\n'+"\n".join(info_pickle))
-    return deserialize_list(serialized_list)
+        pri.IOError.red(f'The following non-json serializable items were not found in {filename}:\n'+"\n".join(info_pickle))
+    l=None
+    try:
+        l=deserialize_list(serialized_list)
+    except Exception as e:
+        pri.IOError.red(f'Error while loading the file {filename}!\n{e}\n{traceback.format_exc()}\n')
+        error+=str(e)
+    return l, error
 
 def is_non_json_serializable(value):
     try:
@@ -265,18 +277,20 @@ def save_list_to_file(l,filename):
     except Exception as e:
         print(f'Error while saving the file {filename}!\n{e}\n')
 
-def loadList(filename):
+def load_list_from_file(filename):
     l=None
+    errorMessage=''
     try:
         with open(filename, 'rb') as file:
             l=pickle.load(file)
     except Exception as e:
-        print(f'Error while loading the file {filename}!\n{e}\n')
-    return l
+        errorMessage=f'Error while loading the file {filename}!\n{e}\n'
+        pri.IOError.red(errorMessage)
+    return l, errorMessage
 
 if FLAG_SERIALIZED:
     saveList=save_list_to_file_serialized
     loadList=load_list_from_file_serialized
 else:
     saveList=save_list_to_file
-    loadList=loadList
+    loadList=load_list_from_file