From 6b06460985b38776d2078b7e5940a124418f389b Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Wed, 1 Apr 2009 16:19:02 +0200
Subject: [PATCH] ENH : lock the hideALL and ShowHide Buttons when Link or
Diapo gui is displayed
---
.../View/otbImageViewerManagerViewGUI.cxx | 39 +++++++++++--------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
index 259a70b7dd..25e77425ce 100644
--- a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
+++ b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
@@ -333,21 +333,21 @@ ImageViewerManagerViewGUI
// no image selected, return
return;
}
-
- //check what to do
- if(!m_DisplayStatusList[selectedItem-1].first)
- {
- //New Display
- m_DisplayStatusList[selectedItem-1].first = true;
- this->UpdateImageListShowed(selectedItem, m_DisplayedLabel);
- this->Display(m_WidgetManagerList,selectedItem);
- }
- else
- {
- m_DisplayStatusList[selectedItem-1].first = false;
- this->UpdateImageListShowed(selectedItem, m_UndisplayedLabel);
- this->Undisplay(selectedItem);
- }
+ if(guiDiaporama->shown() == 0 && guiLinkSetupWindow->shown() == 0)
+ //check what to do
+ if(!m_DisplayStatusList[selectedItem-1].first)
+ {
+ //New Display
+ m_DisplayStatusList[selectedItem-1].first = true;
+ this->UpdateImageListShowed(selectedItem, m_DisplayedLabel);
+ this->Display(m_WidgetManagerList,selectedItem);
+ }
+ else
+ {
+ m_DisplayStatusList[selectedItem-1].first = false;
+ this->UpdateImageListShowed(selectedItem, m_UndisplayedLabel);
+ this->Undisplay(selectedItem);
+ }
}
/**
@@ -474,6 +474,11 @@ ImageViewerManagerViewGUI
m_LinkWidgetManagerList->GetNthElement(selectedItem-1)->Hide();
m_LinkWidgetManagerList->SetNthElement(selectedItem-1,widgetManager);
+ if(m_LinkedDisplayStatusList[selectedItem-1])
+ {
+ this->Display(m_LinkWidgetManagerList, selectedItem);
+ }
+
//Update the view mode
if(!m_DisplayStatusList[selectedItem-1].first && !m_LinkedDisplayStatusList[selectedItem-1])
{
@@ -525,7 +530,9 @@ void
ImageViewerManagerViewGUI
::HideAll()
{
- this->CloseAllDisplayedImages(true);
+ //Hide all only if the diaporama and link window are not displayed
+ if(guiDiaporama->shown() == 0 && guiLinkSetupWindow->shown() == 0)
+ this->CloseAllDisplayedImages(true);
}
/**
--
GitLab