PaIRS-UniNa 0.2.4__cp311-cp311-macosx_10_9_universal2.whl → 0.2.5__cp311-cp311-macosx_10_9_universal2.whl

PaIRS_UniNa/TabTools.py

@@ -151,7 +151,8 @@ class TABpar:
             fields=self.fields
         else:
             [exceptions.remove(f) for f in fields if f in exceptions]
-        df=''
+        printing=''
+        df=[]
         for f in fields:
             if f in exceptions: continue
             if not hasattr(self,f):
@@ -176,11 +177,13 @@ class TABpar:
                 else:
                     if a!=b: Flag=True
             if Flag: 
-                if not df: df=f'{self.name} differences in:'
-                df=df+f'\n*\t{f}:\t {str(a)[:100]}   -->   {str(b)[:100]}'
-        if not df: df=f'{self.name} no differences!'
-        pri.Info.magenta(df)
-
+                df.append(f)
+                if not printing: printing=f'{self.name} differences in:'
+                printing=printing+f'\n*\t{f}:\t {str(a)[:100]}   -->   {str(b)[:100]}'
+        if not printing: printing=f'{self.name} no differences!'
+        pri.Info.magenta(printing)
+        return df
+    
     def hasIndexOf(self,d):
       """ check if the indexes are the same """
       return self.ind==d.ind            
@@ -498,16 +501,52 @@ class gPaIRS_Tab(QWidget):
                 TABpar_ind=self.TABpar_at(self.TABpar.ind)
                 if TABpar_ind and self.TABpar.isEqualTo(TABpar_ind,FlagStrictDiff=True): return
                 FlagNewPar=self.isNewPar()
-                if FlagNewPar and (self.TABpar.flagRun!=0 or len(self.TABpar.link)>0):
+                flagRun=self.TABpar_at(self.TABpar.ind).flagRun
+                if FlagNewPar and (flagRun!=0 or len(self.TABpar.link)>0):
                     #FlagNewPar=not self.FlagAddPrev
-                    self.TABpar.copyfrom(TABpar_ind)
-                    originalStyleSheet=self.gui.styleSheet()
-                    self.gui.setStyleSheet(f'background: {self.palette().color(QPalette.ColorRole.Text).name()} ;') #dcdcdc
-                    self.repaint()
-                    try:
-                        self.setTABpar(FlagAdjustPar=False,FlagBridge=False,FlagCallback=False)
-                    finally:
-                        self.gui.setStyleSheet(originalStyleSheet)
+                    if len(self.TABpar.link)>0:
+                        ITE0_master=self.gui.ui.Explorer.ITEsfromInd(self.TABpar.link)[0]
+                        linkInfo=f'{ITE0_master.ind[2]+1}: {ITE0_master.name}'
+                        Messagge=f'This process step is linked to process {linkInfo}. To modify it, you need to unlink the process step.'
+                        if flagRun!=0 or ITE0_master.flagRun!=0:
+                            Messagge+=' After unlinking the process will be reset!'
+                        def unlink_pars_online():
+                            TABpar_ind.copyfrom(self.TABpar)
+                            self.gui.unlink_pars(self.TABpar.ind)
+                            if self.TABpar.flagRun!=0 or ITE0_master.flagRun!=0:
+                                self.gui.reset_step(self.TABpar.ind)
+                        warningDialog(self.gui,Messagge,addButton={'Unlink step!': unlink_pars_online})
+                    elif flagRun==-10:
+                         Messagge='This process step is in the queue for process execution. To modify it, you need to stop processing and then reset it and all the subsequent steps.'
+                         warningDialog(self.gui,Messagge)
+                    elif flagRun==-2:
+                         Messagge='This process step is currently in execution. To modify it, you need to stop processing and then reset it and all the subsequent steps.'
+                         warningDialog(self.gui,Messagge)
+                    elif flagRun!=0:
+                        if self.gui.FlagRun:
+                            Messagge='This process step has already been executed. To modify it, you need to stop processing and then reset it and all the subsequent steps.'
+                            warningDialog(self.gui,Messagge)               
+                        else:    
+                            Messagge='This process step has already been executed. To modify it, you need to reset the current step and all the subsequent ones.'
+                            def reset_step_online():
+                                TABpar_ind.copyfrom(self.TABpar)
+                                self.gui.reset_step(self.TABpar.ind)
+                                return
+                            warningDialog(self.gui,Messagge,addButton={'Reset step!': reset_step_online})
+                    
+
+                    if flagRun!=0 or len(self.TABpar.link)>0:
+                        self.TABpar.copyfrom(TABpar_ind)
+                        originalStyleSheet=self.gui.styleSheet()
+                        self.gui.setStyleSheet(f'background: {self.palette().color(QPalette.ColorRole.Text).name()} ;') #dcdcdc
+                        self.repaint()
+                        try:
+                            self.setTABpar(FlagAdjustPar=False,FlagBridge=False,FlagCallback=False)
+                        finally:
+                            timesleep(.01)
+                            self.gui.setStyleSheet(originalStyleSheet)
+                    else:
+                        return
                 else:
                     self.setTABpar(FlagAdjustPar=True,FlagBridge=self.FlagBridge,FlagCallback=True)
             except:
@@ -824,7 +863,7 @@ class gPaIRS_Tab(QWidget):
                     self.onlyReadLabel.setText('')
                 self.button_link_step.setToolTip('Link current process step to another in the same project')
                 self.button_link_step.setIcon(self.icon_link)
-                self.gui.RCLbar.buttonData[2]['name']='Link step to...'
+                self.gui.RCLbar.buttonData[3]['name']='Link step to...'
             else:
                 if hasattr(self.gui,'ui') and hasattr(self.gui.ui,'Explorer'):
                     ITE0_master=self.gui.ui.Explorer.ITEsfromInd(self.TABpar.link)[0]
@@ -834,7 +873,7 @@ class gPaIRS_Tab(QWidget):
                     self.onlyReadLabel.setText('')
                 self.button_link_step.setToolTip('Unlink current process step')
                 self.button_link_step.setIcon(self.icon_unlink)
-                self.gui.RCLbar.buttonData[2]['name']='Unlink step'
+                self.gui.RCLbar.buttonData[3]['name']='Unlink step'
             self.button_link_step.setStatusTip(self.button_link_step.toolTip())
             self.button_link_step.setChecked(len(self.TABpar.link)!=0)