PaIRS-UniNa 0.2.7__cp311-cp311-win_amd64.whl → 0.2.11__cp311-cp311-win_amd64.whl

PaIRS_UniNa/Vis_Tab.py

@@ -234,8 +234,7 @@ class NamesPIV(TABpar):
     
 class VISpar(TABpar):
     FlagVis=True
-    FlagAutoLevels=True
-    FlagAutoSizes=True    
+
     class OUT(TABpar):
         def __init__(self):
             self.x     = 0                
@@ -269,7 +268,7 @@ class VISpar(TABpar):
     def __init__(self,Process=ProcessTypes.null,Step=StepTypes.null):
         self.setup(Process,Step)
         super().__init__('VISpar','Vis')
-        self.unchecked_fields+=['FlagAutomaticLevels','FlagAutomaticSizes','setPage']
+        self.unchecked_fields+=['setPage']
         self.uncopied_fields+=['graphics_fields']
 
     def setup(self,Process,Step):
@@ -314,6 +313,8 @@ class VISpar(TABpar):
         self.variableKey=''
         self.field_rep=0
 
+        self.FlagAutoLevels=True
+        self.FlagAutoSizes=True 
         self.FlagYInvert=[False,False]
         self.FlagResetLevels=True
         self.FlagResetSizes=True
@@ -389,7 +390,7 @@ class VISpar(TABpar):
 class Vis_Tab(gPaIRS_Tab):
     class VIS_Tab_Signals(gPaIRS_Tab.Tab_Signals):
         pass
-
+    
     def __init__(self,parent: QWidget =None, flagInit= __name__ == "__main__"):
         super().__init__(parent,Ui_VisTab,VISpar)
         self.signals=self.VIS_Tab_Signals(self)
@@ -397,9 +398,23 @@ class Vis_Tab(gPaIRS_Tab):
         #------------------------------------- Graphical interface: widgets
         self.TABname='Vis'
         self.ui: Ui_VisTab
+        
+        # Create a container widget that will hold toolbar + plot
+        self.w_plot_container = QWidget(self)
+        self.vlay_plot_container = vlay = QVBoxLayout(self.w_plot_container)
+        vlay.setContentsMargins(0, 0, 0, 0)
+        vlay.setSpacing(0)
+        parent_layout = self.ui.lay_w_Plot
+        parent_layout.removeWidget(self.ui.plot)
+        vlay.addWidget(self.ui.plot)
+        parent_layout.insertWidget(-1, self.w_plot_container)
+        parent_layout.setStretchFactor(self.w_plot_container,1)
         self.Ptoolbar=None
         self.addPlotToolBar()
         self.ui.plot.axes.format_coord=lambda x,y: self.custom_format_coord(x,y)
+        self.w_plot_container.contextMenuEvent = lambda ev: plotContextMenuEvent(self.w_plot_container, self, ev)
+        self.addButtonDockVis()
+        self.tabWin=None
 
         self.ui.sliders=self.findChildren(QSlider)
         for slider in (self.ui.slider_min,self.ui.slider_max,self.ui.slider_mean,self.ui.slider_range):
@@ -442,6 +457,7 @@ class Vis_Tab(gPaIRS_Tab):
         pri.Time.magenta('Colormap generation: start')
         # Create the popup menu
         self.colorMapMenu = QMenu(self)
+        self.colorMapMenu.setStyleSheet(gPaIRS_QMenu_style)
         # Add the colormap thumbnails to the menu
         def on_colormap_selected(name):
             self.VISpar.vcolorMap[self.VISpar.variableKey]=self.VISpar.colorMap=name
@@ -462,6 +478,7 @@ class Vis_Tab(gPaIRS_Tab):
         pri.Time.magenta('Vector color generation: start')
         # Create the popup menu
         self.vectorColorMenu = QMenu(self)
+        self.vectorColorMenu.setStyleSheet(gPaIRS_QMenu_style)
         # Add the colormap thumbnails to the menu
         def on_vectorcolor_selected(name):
             self.VISpar.vvectorColor[self.VISpar.variableKey]=self.VISpar.vectorColor=name
@@ -476,7 +493,9 @@ class Vis_Tab(gPaIRS_Tab):
             action = menu.addAction(QIcon(pixmap), ' '+colorName.lower())
             action.triggered.connect(lambda _, name=colorName: on_vectorcolor_selected(name))   
         pri.Time.magenta('Vector color generation: end')         
-            
+        
+        apply_hover_glow_label(self.ui.icon)
+        
         #------------------------------------- Declaration of parameters 
         self.VISpar_base=VISpar()
         self.VISpar:VISpar=self.TABpar
@@ -504,14 +523,15 @@ class Vis_Tab(gPaIRS_Tab):
 
                 slider.valueChanged.connect(callback)
                 
+                """
                 if n in ('nclev','streamdens'):
                     def sliderMessage(s:QSlider):
                         if self.VISpar.field_rep==2:
                             tip = f"Release to repaint"
-                        else: tip=""
-                        QToolTip.showText(s.mapToGlobal(s.rect().topLeft()), tip)
+                            show_mouse_tooltip(s,tip)
                     slider.sliderPressed.connect(lambda: sliderMessage(slider))
-
+                """
+                
                 setattr(self,'slider_'+n+'_callbcak',callback)
                 setattr(self,'spin_'+n+'_action',action)
                 setattr(self,'spin_'+n+'_set',setting)
@@ -536,6 +556,8 @@ class Vis_Tab(gPaIRS_Tab):
         self.QS_copy2clipboard.activated.connect(self.ui.plot.copy2clipboard)
         self.QS_copy2newfig=QShortcut(QKeySequence('Ctrl+D'), self.ui.plot)
         self.QS_copy2newfig.activated.connect(lambda: self.ui.plot.copy2newfig(self.ui.name_var.toolTip()))
+        self.QS_undockfig=QShortcut(QKeySequence('Ctrl+U'), self.ui.plot)
+        self.QS_undockfig.activated.connect(self.undockfig)
         self.load_Img_callback=self.wrappedCallback('Loading image',self.loadImg)
         self.load_Res_callback=self.wrappedCallback('Loading result',self.loadRes)
 
@@ -550,8 +572,8 @@ class Vis_Tab(gPaIRS_Tab):
         self.setTABlayout=self.setVISlayout
 
         self.FlagReset=True
-        self.FlagResetLevels=True
-        self.FlagResetSizes =True
+        self.FlagResetLevels=False
+        self.FlagResetSizes =False
 
         self.image_file=''
         self.image_raw=None
@@ -591,7 +613,7 @@ class Vis_Tab(gPaIRS_Tab):
         for x in self.Ptoolbar.actions():
             if x.text() in unwanted_buttons:
                 self.Ptoolbar.removeAction(x)
-        self.ui.lay_w_Plot.addWidget(self.Ptoolbar)
+        self.vlay_plot_container.addWidget(self.Ptoolbar)
 
     def initialize(self):
         pri.Info.yellow(f'{"*"*20}   VIS initialization   {"*"*20}')
@@ -623,6 +645,103 @@ class Vis_Tab(gPaIRS_Tab):
         self.VISpar.Out.FlagNone=True
         return
 
+    def addButtonDockVis(self):
+        # Container widget that will expand inside w_plot
+        self.dockWidget = QWidget(self.ui.w_plot)
+        self.dockWidget.setSizePolicy(
+            QSizePolicy.Expanding,
+            QSizePolicy.Expanding
+        )
+
+        # Center layout
+        vlay = QVBoxLayout(self.dockWidget)
+        vlay.setContentsMargins(0, 0, 0, 0)
+        vlay.setSpacing(15)
+
+        self.label_dockVis = QLabel(self)
+        self.label_dockVis.setText('Plot area detached and moved to a separate window.')
+        self.label_dockVis.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        font=self.label_dockVis.font()
+        font.setItalic(True)
+        self.label_dockVis.setFont(font)
+        self.label_dockVis.setStyleSheet(
+            "QLabel { color: rgb(128,128,128) }"
+        )
+        
+        # Central push button (icon only, no border)
+        self.button_dockVis = QPushButton(self)
+        self.button_dockVis.setObjectName('button_dockVis')
+        self.button_dockVis.setFlat(True)  # no raised frame
+        self.button_dockVis.setCheckable(False)
+        self.button_dockVis.setText("")    # icon only
+        self.button_dockVis.setIcon(QIcon(icons_path+"dockVis_disable.png"))
+        self.button_dockVis.setIconSize(QSize(64, 64))
+        self.button_dockVis.setStyleSheet(
+            "QPushButton { border: none; background: transparent; }"
+            "QPushButton:hover { background: rgba(0,0,0,20); border-radius: 4px; }"
+            "QPushButton:hover {"
+                "border: none;"
+                "background: transparent;"
+                "image: url("+icons_path+"dockVis.png);"
+            "}"
+        )
+        self.button_dockVis.setToolTip('Dock plot area')
+        self.button_dockVis.setStatusTip('Dock plot area')
+
+        # Center the button inside the expanding widget
+        vlay.addStretch()
+        vlay.addWidget(self.label_dockVis)
+        vlay.addWidget(self.button_dockVis, 0, Qt.AlignCenter)
+        vlay.addSpacerItem(QSpacerItem(10,self.button_dockVis.height()*2,QSizePolicy.Policy.Expanding,QSizePolicy.Policy.Fixed))
+        vlay.addStretch()
+
+        # Add the widget to w_plot layout
+        # assuming w_plot has a layout called lay_w_Plot
+        self.dockWidget.setVisible(False)
+        self.ui.verticalLayout.addWidget(self.dockWidget)
+        self.ui.verticalLayout.setStretchFactor(self.dockWidget,1)
+
+        # Optional: connect button signal
+        # self.btDock.clicked.connect(self.onDockClicked)
+
+    def undockfig(self):
+        wid=self.ui.w_plot #self.ui.w_plot_container
+        def btDock_callback():
+            self.gui.GPApar.tabWinPar[self.TABname]={
+                'active'        : False,
+                'geometry'      : save_frame_geometry_to_param(self.tabWin),
+                'windowState'   : self.tabWin.saveState().toBase64().data().decode(),
+                'visible'       : False,
+            }
+
+            self.tabWin=None
+            parent_layout = self.ui.lay_w_Plot
+            parent_layout.setStretchFactor(wid,1)
+            self.dockWidget.setVisible(False)
+            self.button_dockVis.clicked.disconnect(f.close)
+            self.QS_undockfig.activated.disconnect()
+            self.QS_undockfig.activated.connect(self.undockfig)
+        self.dockWidget.setVisible(True)
+        self.tabWin=f=self.gui.FloatingWidget(self,wid,btDock_callback)
+        f.setWindowTitle('Vis')
+        f.setWindowIcon(QIcon(icons_path+"vis_logo.png"))
+        if self.TABname in self.gui.GPApar.tabWinPar and 'geometry' in self.gui.GPApar.tabWinPar[self.TABname]:
+            restore_frame_geometry_from_param(f,self.gui.GPApar.tabWinPar[self.TABname]['geometry'])
+        else:
+            screen_geom = self.gui.app.primaryScreen().availableGeometry()
+            new_w = int(screen_geom.width()  * 0.5)  
+            new_h = int(screen_geom.height() * 0.8)
+            f.resize(new_w,new_h)
+            frame = f.frameGeometry()
+            frame.moveCenter(screen_geom.center())
+            f.move(frame.topLeft())
+        f.setContentsMargins(self.gui.w_Vis.layout().contentsMargins())
+        f.setMinimumSize(QSize(480,480))
+        self.gui.FloatingWindows.append(f)
+        self.button_dockVis.clicked.connect(f.close)
+        self.QS_undockfig.activated.disconnect()
+        self.QS_undockfig.activated.connect(self.button_dockVis.click)
+    
 #*************************************************** Adjusting parameters
     def adjustVISpar(self):
         self.VISpar.ncam=len(self.VISpar.imList)
@@ -637,7 +756,7 @@ class Vis_Tab(gPaIRS_Tab):
         FlagNew=(not self.VISpar.type and FlagNewImage) or (self.VISpar.type==1 and FlagNewResult)
         FlagDiff=self.VISpar.isDifferentFrom(self.VISpar_old,fields=['img','cam','frame']) or FlagNew
 
-        if (VISpar.FlagAutoLevels and (FlagNewImage or FlagNewResult)):
+        if (self.VISpar.FlagAutoLevels and (FlagNewImage or FlagNewResult)):
             self.resetAllLevels()
             if FlagDiff or self.FlagResetLevels:
                 self.FlagResetLevels=False
@@ -646,7 +765,7 @@ class Vis_Tab(gPaIRS_Tab):
             self.FlagResetLevels=False
             self.resetLevels()
 
-        if (VISpar.FlagAutoSizes and (FlagNewImage or FlagNewResult)):
+        if (self.VISpar.FlagAutoSizes and (FlagNewImage or FlagNewResult)):
             self.resetAllXYLims()
             if FlagDiff or self.FlagResetSizes:
                 self.FlagResetSizes=False
@@ -654,8 +773,8 @@ class Vis_Tab(gPaIRS_Tab):
         elif self.FlagResetSizes: 
             self.FlagResetSizes=False
             self.resetXYLims()
-
-        self.adjustFieldRep()
+        
+        self.adjustFieldRep()    
 
     def adjustImport(self):
         self.VISpar.image_file=self.VISpar.image_file_Min=self.VISpar.image_file_Disp=''
@@ -702,7 +821,13 @@ class Vis_Tab(gPaIRS_Tab):
                     else:
                         self.VISpar.result_file=self.VISpar.resF(self.VISpar.img)
                 elif self.VISpar.img==0:
-                    self.VISpar.result_file=self.VISpar.result_file_Mean               
+                    self.VISpar.result_file=self.VISpar.result_file_Mean   
+                if not self.VISpar.FlagView:
+                    ITE=self.gui.ui.Explorer.ITEfromInd(self.VISpar.ind)
+                    id=ITE.procdata.name_proc
+                    self.VISpar.FlagResult=fileIdenitifierCheck(id,self.VISpar.result_file)
+                    if not self.VISpar.FlagResult: self.VISpar.result_file=''
+
         
         FlagNewImage, FlagNewResult, _=self.importFiles()  
         return FlagNewImage, FlagNewResult
@@ -1063,7 +1188,8 @@ class Vis_Tab(gPaIRS_Tab):
                         res[n]=tres[0][:,:,j]
                 if self.namesPIV.u in res and self.namesPIV.v in res:
                     res=self.calcMagnitude(res)
-                    res=self.calcZVorticity(res)
+                    FlagUnit=self.VISpar.Out.xres!=1.0 or self.VISpar.Out.pixAR!=1.0
+                    res=self.calcZVorticity(res,FlagUnit)
                 for f in list(res):
                     if not f in self.namesPIV.allFields: del res[f]
         except Exception as inst:
@@ -1079,9 +1205,10 @@ class Vis_Tab(gPaIRS_Tab):
                 res[self.namesPIV.Mod]=np.sqrt(res[self.namesPIV.u]**2+res[self.namesPIV.v]**2)
         return res
 
-    def calcZVorticity(self,res):
+    def calcZVorticity(self,res,FlagUnit=False):
         if self.namesPIV.x in res and self.namesPIV.y in res and self.namesPIV.u in res and self.namesPIV.v in res:
-            xres,yres=self.getXYRes(type=1)
+            if FlagUnit: xres=yres=1/1000
+            else: xres=yres=1.0
             try:
                 du_dy, _=np.gradient(res[self.namesPIV.u],res[self.namesPIV.y][:,0]*yres,res[self.namesPIV.x][0,:]*xres)  # Derivate di u rispetto a y e x
                 _, dv_dx=np.gradient(res[self.namesPIV.v],res[self.namesPIV.y][:,0]*yres,res[self.namesPIV.x][0,:]*xres)  # Derivate di v rispetto a y e x
@@ -1182,11 +1309,21 @@ class Vis_Tab(gPaIRS_Tab):
         self.setLevels()
     
     def button_automatic_levels_action(self):
-        VISpar.FlagAutoLevels=self.ui.button_automatic_levels.isChecked()
+        self.VISpar.FlagAutoLevels=self.ui.button_automatic_levels.isChecked()
         return True
     
     def button_automatic_sizes_action(self):
-        VISpar.FlagAutoSizes=self.ui.button_automatic_sizes.isChecked()
+        self.VISpar.FlagAutoSizes=self.ui.button_automatic_sizes.isChecked()
+        if self.VISpar.FlagAutoSizes is False and self.VISpar.Process==ProcessTypes.piv:
+            type2=0 if self.VISpar.type==1 else 1
+            if self.VISpar.unit[self.VISpar.type]!=self.VISpar.unit[type2]:
+                xres,yres=self.getXYRes(type=self.VISpar.unit[self.VISpar.type])
+            else: xres=yres=1.0
+            if (type2==0 and self.VISpar.unit[type2]) or (type2==1 and not self.VISpar.unit[type2]):
+                xres2,yres2=self.getXYRes(type=type2)
+            else: xres2=yres2=1.0
+            self.VISpar.size[type2][0:2]=[s*xres/xres2 for s in [self.VISpar.xmin, self.VISpar.xmax]]
+            self.VISpar.size[type2][2:4]=[s*yres/yres2 for s in [self.VISpar.ymin, self.VISpar.ymax]]
         return True
     
     def button_restore_action(self):
@@ -1327,6 +1464,7 @@ class Vis_Tab(gPaIRS_Tab):
 
             # Create a context menu and populate it with the available sizes
             menu = QMenu(self)
+            menu.setStyleSheet(gPaIRS_QMenu_style)
             for i in range(n):
                 label = f"{Vect[2][i]} x {Vect[0][i]}"
                 act = menu.addAction(label)
@@ -1389,10 +1527,10 @@ class Vis_Tab(gPaIRS_Tab):
         self.ui.button_Contourf.setChecked(self.VISpar.FlagContourf)
     
     def button_automatic_levels_set(self):
-        self.ui.button_automatic_levels.setChecked(VISpar.FlagAutoLevels)
+        self.ui.button_automatic_levels.setChecked(self.VISpar.FlagAutoLevels)
 
     def button_automatic_sizes_set(self):
-        self.ui.button_automatic_sizes.setChecked(VISpar.FlagAutoSizes)
+        self.ui.button_automatic_sizes.setChecked(self.VISpar.FlagAutoSizes)
 
     def button_invert_y_set(self):
         self.ui.button_invert_y.setChecked(self.VISpar.FlagYInvert[self.VISpar.type])
@@ -1480,6 +1618,7 @@ class Vis_Tab(gPaIRS_Tab):
             FlagVecField=self.VISpar.isDifferentFrom(self.VISpar_old,fields=fields)
             if FlagVecField and self.result: 
                 self.showVecField()
+            elif self.result is None: self.cleanVecField()
             FlagDraw=FlagDraw or FlagVecField
             
             if FlagDraw: 
@@ -1520,7 +1659,7 @@ class Vis_Tab(gPaIRS_Tab):
                 FlagXLim=True
             else: 
                 self.imgshow.set_data(img)
-                extent=self.imgExtent()
+                extent=self.imgExtent(size)
                 if extent!=self.imgshow.get_extent():
                     self.imgshow.set_extent(extent)
                     FlagExtent=True
@@ -1560,7 +1699,7 @@ class Vis_Tab(gPaIRS_Tab):
         return cmap, levs
     
     def getXYRes(self,type=None):
-        if not type: type=self.VISpar.type
+        if type is None: type=self.VISpar.type
         xres=yres=1.0 
         if self.VISpar.Process==ProcessTypes.piv and not self.VISpar.Out.FlagNone:
             if type==0: #mm/pixels
@@ -2001,46 +2140,6 @@ class Vis_Tab(gPaIRS_Tab):
     """
 
 #*************************************************** Menus
-    def contextMenuEvent(self, event):   
-        contextMenu = QMenu(self)
-        copy2clipboard = contextMenu.addAction("Copy to clipboard ("+self.QS_copy2clipboard.key().toString(QKeySequence.NativeText)+")")
-        copy2clipboard.setIcon(self.ui.plot.copyIcon)
-        copy2newfig = contextMenu.addAction("Open in new figure ("+self.QS_copy2newfig.key().toString(QKeySequence.NativeText)+")")
-        copy2newfig.setIcon(self.ui.plot.openNewWindowIcon)
-        contextMenu.addSeparator()
-        if len(self.ui.plot.fig2)>0:
-            showAll = contextMenu.addAction("Show all")
-            showAll.setIcon(self.ui.plot.showAllIcon)
-            alignAll = contextMenu.addAction("Align all")
-            alignAll.setIcon(self.ui.plot.alignAllIcon)
-            closeAll = contextMenu.addAction("Close all")
-            closeAll.setIcon(self.ui.plot.closeAllIcon)
-            contextMenu.addSeparator()
-        else:
-            showAll = None 
-            closeAll= None
-            alignAll= None
-        loadImg = contextMenu.addAction("Load image")
-        loadImg.setIcon(self.ui.plot.loadImageIcon)
-        loadRes = contextMenu.addAction("Load result")
-        loadRes.setIcon(self.ui.plot.loadResultIcon)
-
-        action = contextMenu.exec(self.mapToGlobal(event.pos()))
-        if action == copy2clipboard:
-            self.ui.plot.copy2clipboard()
-        elif action == copy2newfig:
-            self.ui.plot.copy2newfig(self.ui.name_var.toolTip())
-        elif action == showAll:
-            self.ui.plot.showAll()
-        elif action == closeAll:
-            self.ui.plot.closeAll()
-        elif action == alignAll:
-            self.ui.plot.alignAll()
-        elif action == loadImg:
-            self.load_Img_callback()
-        elif action == loadRes:
-            self.load_Res_callback()
-
     def loadImg(self,filename=None):
         if filename is None:
             filename, _ = QFileDialog.getOpenFileName(self,\
@@ -2079,6 +2178,63 @@ class Vis_Tab(gPaIRS_Tab):
             self.VISpar.type=1
             self.cleanAxes()
 
+def plotContextMenuEvent(obj, self:Vis_Tab, event):   
+    contextMenu = QMenu(obj)
+    contextMenu.setStyleSheet(gPaIRS_QMenu_style)
+    copyGraphicalSetting = contextMenu.addAction("Copy graphical settings from...")
+    copyGraphicalSetting.setIcon(self.gui.brush_icon)
+    contextMenu.addSeparator() 
+    copy2clipboard = contextMenu.addAction("Copy to clipboard ("+self.QS_copy2clipboard.key().toString(QKeySequence.NativeText)+")")
+    copy2clipboard.setIcon(self.ui.plot.copyIcon)
+    copy2newfig = contextMenu.addAction("Open in new figure ("+self.QS_copy2newfig.key().toString(QKeySequence.NativeText)+")")
+    copy2newfig.setIcon(self.ui.plot.openNewWindowIcon)
+    contextMenu.addSeparator()
+    if len(self.ui.plot.fig2)>0:
+        showAll = contextMenu.addAction("Show all")
+        showAll.setIcon(self.ui.plot.showAllIcon)
+        alignAll = contextMenu.addAction("Align all")
+        alignAll.setIcon(self.ui.plot.alignAllIcon)
+        closeAll = contextMenu.addAction("Close all")
+        closeAll.setIcon(self.ui.plot.closeAllIcon)
+        contextMenu.addSeparator()
+    else:
+        showAll = None 
+        closeAll= None
+        alignAll= None
+    loadImg = contextMenu.addAction("Load image")
+    loadImg.setIcon(self.ui.plot.loadImageIcon)
+    loadRes = contextMenu.addAction("Load result")
+    loadRes.setIcon(self.ui.plot.loadResultIcon)
+    contextMenu.addSeparator()
+    if self.button_dockVis.isVisible():
+        undockfig = contextMenu.addAction("Dock plot aera ("+self.QS_undockfig.key().toString(QKeySequence.NativeText)+")")
+        undockfig.setIcon(QIcon(icons_path+"dockVis.png"))
+        undock_fun = self.button_dockVis.click
+    else:
+        undockfig = contextMenu.addAction("Undock plot aera ("+self.QS_undockfig.key().toString(QKeySequence.NativeText)+")")
+        undockfig.setIcon(QIcon(icons_path+"undockVis.png"))
+        undock_fun = self.undockfig
+        
+    action = contextMenu.exec(obj.mapToGlobal(event.pos()))
+    if action == copyGraphicalSetting:
+        self.ui.icon.addfuncclick['copy_VIS']()
+    elif action == copy2clipboard:
+        self.ui.plot.copy2clipboard()
+    elif action == copy2newfig:
+        self.ui.plot.copy2newfig(self.ui.name_var.toolTip())
+    elif action == showAll:
+        self.ui.plot.showAll()
+    elif action == closeAll:
+        self.ui.plot.closeAll()
+    elif action == alignAll:
+        self.ui.plot.alignAll()
+    elif action == loadImg:
+        self.load_Img_callback()
+    elif action == loadRes:
+        self.load_Res_callback()
+    elif action == undockfig:
+        undock_fun()
+
 def create_colormap_image(colormap, width, height, FlagVerticalColormap, imgMapPath):
     # Create an empty image
     img = np.zeros((height, width, 3), dtype=np.uint8)

PaIRS_UniNa/Vis_Tab_CalVi.py

@@ -151,6 +151,11 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         if __name__ == "__main__": 
             self.app=app
             setAppGuiPalette(self)
+        
+        self.addButtonDockVis()
+        self.tabWin = None
+        self.QS_undockfig=QShortcut(QKeySequence('Ctrl+U'), self.calibView)
+        self.QS_undockfig.activated.connect(self.undockfig)
 
         #------------------------------------- Graphical interface: miscellanea
         self.ui.status_L.setText('')
@@ -275,13 +280,16 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
             self.buttonsToDisableNotCalibrated.append(self.functionButtons[k])
 
         functionButtons_insert=[0,0,0]
+        self.action_undock=QAction(QIcon(icons_path+"undockVis.png"),'Undock plot area',self)
+        self.action_undock.triggered.connect(self.undockfig)
+        self.action_dock=QAction(QIcon(icons_path+"dockVis.png"),'Dock plot area',self)
+        self.action_dock.triggered.connect(self.button_dockVis.click)
         for k,ind in  enumerate([f.value for f in CalibFunctions]):
             action=QAction(self.functionButtons[k].icn,calibFunctionsText[abs(ind)],self)
             self.calibView.contextMenuActions.insert(functionButtons_insert[k],action)
             action.triggered.connect(create_functionButton_action(ind))
             if ind>0:
                 self.buttonsToDisableNotCalibrated.append(action)
-
         self.originOffbox=self.ui.g_OriOff
         self.remPoinsBox=self.ui.g_GriLim
         self.buttonsToDisable=[
@@ -296,6 +304,106 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         logfont.setPixelSize(fPixSize)
         self.ui.log.setFont(logfont)
 
+    def addButtonDockVis(self):
+        # Container widget that will expand inside w_plot
+        self.dockWidget = QWidget(self.ui.w_plot)
+        self.dockWidget.setSizePolicy(
+            QSizePolicy.Expanding,
+            QSizePolicy.Expanding
+        )
+
+        # Center layout
+        vlay = QVBoxLayout(self.dockWidget)
+        vlay.setContentsMargins(0, 0, 0, 0)
+        vlay.setSpacing(15)
+
+        self.label_dockVis = QLabel(self)
+        self.label_dockVis.setText('Plot area detached and moved to a separate window.')
+        self.label_dockVis.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        font=self.label_dockVis.font()
+        font.setItalic(True)
+        self.label_dockVis.setFont(font)
+        self.label_dockVis.setStyleSheet(
+            "QLabel { color: rgb(128,128,128) }"
+        )
+
+        # Central push button (icon only, no border)
+        self.button_dockVis = QPushButton(self)
+        self.button_dockVis.setObjectName('button_dockVis')
+        self.button_dockVis.setFlat(True)  # no raised frame
+        self.button_dockVis.setCheckable(False)
+        self.button_dockVis.setText("")    # icon only
+        self.button_dockVis.setIcon(QIcon(icons_path+"dockVis_disable.png"))
+        self.button_dockVis.setIconSize(QSize(64, 64))
+        self.button_dockVis.setStyleSheet(
+            "QPushButton { border: none; background: transparent; }"
+            "QPushButton:hover { background: rgba(0,0,0,20); border-radius: 4px; }"
+            "QPushButton:hover {"
+                "border: none;"
+                "background: transparent;"
+                "image: url("+icons_path+"dockVis.png);"
+            "}"
+        )
+        self.button_dockVis.setToolTip('Dock plot area')
+        self.button_dockVis.setStatusTip('Dock plot area')
+        
+        # Center the button inside the expanding widget
+        vlay.addStretch()
+        vlay.addWidget(self.label_dockVis)
+        vlay.addWidget(self.button_dockVis, 0, Qt.AlignCenter)
+        vlay.addSpacerItem(QSpacerItem(10,self.button_dockVis.height()*2,QSizePolicy.Policy.Expanding,QSizePolicy.Policy.Fixed))
+        vlay.addStretch()
+
+        # Add the widget to w_plot layout
+        # assuming w_plot has a layout called lay_w_Plot
+        self.dockWidget.setVisible(False)
+        self.ui.verticalLayout.addWidget(self.dockWidget)
+        self.ui.verticalLayout.setStretchFactor(self.dockWidget,1)
+
+        # Optional: connect button signal
+        # self.btDock.clicked.connect(self.onDockClicked)
+
+    def undockfig(self):
+        wid=self.ui.w_plot #self.ui.w_plot_container
+        def btDock_callback():
+            self.gui.GPApar.tabWinPar[self.TABname]={
+                'active'        : False,
+                'geometry'      : save_frame_geometry_to_param(self.tabWin),
+                'windowState'   : self.tabWin.saveState().toBase64().data().decode(),
+                'visible'       : False,
+            }
+
+            self.tabWin=None
+            parent_layout = self.ui.verticalLayout
+            parent_layout.setStretchFactor(wid,1)
+            self.dockWidget.setVisible(False)
+            self.button_dockVis.clicked.disconnect(f.close)
+            self.QS_undockfig.activated.disconnect()
+            self.QS_undockfig.activated.connect(self.undockfig)
+            self.setContextMenuLayout()
+            self.gui.updateGPAparGeometry()
+        self.dockWidget.setVisible(True)
+        self.tabWin=f=self.gui.FloatingWidget(self,wid,btDock_callback)
+        f.setWindowTitle('Vis (CalVi)')
+        f.setWindowIcon(QIcon(icons_path+"vis_logo.png"))
+        if self.TABname in self.gui.GPApar.tabWinPar and 'geometry' in self.gui.GPApar.tabWinPar[self.TABname]:
+            restore_frame_geometry_from_param(f,self.gui.GPApar.tabWinPar[self.TABname]['geometry'])
+        else:
+            screen_geom = QGuiApplication.primaryScreen().availableGeometry()
+            new_w = int(screen_geom.width()  * 0.8)  
+            new_h = int(screen_geom.height() * 0.8)
+            f.resize(new_w,new_h)
+            frame = f.frameGeometry()
+            frame.moveCenter(screen_geom.center())
+            f.move(frame.topLeft())
+        f.setContentsMargins(self.gui.w_Vis.layout().contentsMargins())
+        f.setMinimumSize(QSize(480,480))
+        self.gui.FloatingWindows.append(f)
+        self.button_dockVis.clicked.connect(f.close)
+        self.QS_undockfig.activated.disconnect()
+        self.QS_undockfig.activated.connect(self.button_dockVis.click)
+        self.setContextMenuLayout()
+
 #********************************************* Adjusting parameters
     def adjustVISpar(self):
         self.calibView.hide()
@@ -383,17 +491,10 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         self.ui.button_PlotMask.setEnabled(self.VISpar.MaskType not in (2,3))
         
         self.ui.w_Commands.setVisible(self.VISpar.FlagRunning)
-        if self.VISpar.FlagRunning:
-            self.calibView.contextMenu = QtWidgets.QMenu(self)
-            for a in self.calibView.contextMenuActions:
-                self.calibView.contextMenu.addAction(a)
-            self.calibView.contextMenu.insertSeparator(self.calibView.contextMenuActions[1])
-        else:
-            self.calibView.contextMenu =None
-            
+        self.setContextMenuLayout()
+
         self.setSpinMaxMin()
         self.ui.Vis_CalVi_splitter.setSizes(self.VISpar.splitterSizes)
-        
         self.calibView.scaleFactor=self.VISpar.scaleFactor
         self.calibView.calib.LMin=self.VISpar.LMin
         self.calibView.calib.LMax=self.VISpar.LMax
@@ -425,6 +526,34 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
         self.setRunButtonText()
         return
 
+    def setContextMenuLayout(self):
+        self.calibView.contextMenu = QtWidgets.QMenu(self)
+        self.calibView.contextMenu.setStyleSheet(gPaIRS_QMenu_style)
+
+        text=self.gui.ui.button_Run_CalVi.lbl.text()
+        text=text if 'Run' not in text else 'Run'
+        action_run=QAction(self.gui.ui.button_Run_CalVi.icn,text+' CalVi',self)
+        action_run.triggered.connect(self.gui.ui.button_Run_CalVi.click)
+        self.calibView.contextMenu.addAction(action_run)
+        if self.VISpar.FlagRunning:
+            action_abort=QAction(self.gui.ui.button_Abort_CalVi.icn,self.gui.ui.button_Abort_CalVi.lbl.text()+' CalVi',self)
+            action_abort.triggered.connect(self.gui.ui.button_Abort_CalVi.click)
+            self.calibView.contextMenu.addAction(action_abort)   
+        self.calibView.contextMenu.addSeparator()
+
+        FlagSeparator=False
+        if self.VISpar.FlagRunning:
+            for a in self.calibView.contextMenuActions:
+                self.calibView.contextMenu.addAction(a)
+                FlagSeparator=True
+            self.calibView.contextMenu.insertSeparator(self.calibView.contextMenuActions[1])
+        if FlagSeparator: self.calibView.contextMenu.addSeparator()
+
+        if self.tabWin:
+            self.calibView.contextMenu.addAction(self.action_dock)
+        else:
+            self.calibView.contextMenu.addAction(self.action_undock)
+
     def setSpinMaxMin(self):
         self.ui.spin_plane.setMinimum(1*bool(self.VISpar.nPlane))
         self.ui.spin_plane.setMaximum(self.VISpar.nPlane)
@@ -968,8 +1097,6 @@ class Vis_Tab_CalVi(gPaIRS_Tab):
             FlagVisible=all([not bool(p) for p in calVect.flagPlane[:-1]])
             self.gui.ui.button_Run_CalVi.setVisible(FlagVisible)
 
-        
-    
 
 if __name__ == "__main__":
     import sys