OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-26 21:27:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bring back primary and controlled tags in linked views. Remove obsolete menu command.

Browse Source
This commit is contained in:
Jon Jenssen
2026-08-20 10:28:45 +02:00
committed by JJ
parent d25dad35ef
commit 35ec18a3a4
7 changed files with 20 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Commands/ViewLink/CMakeLists_files.cmake
-1
View File
@@ -1,7 +1,6 @@
set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeatureUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicShowAllLinkedViewsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicLinkViewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicUnLinkViewFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicShowLinkOptionsFeature.cpp
ApplicationLibCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
-71
View File
@@ -1,71 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicShowAllLinkedViewsFeature.h"
#include "RimGridView.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "cafSelectionManager.h"
#include <QAction>
CAF_CMD_SOURCE_INIT( RicShowAllLinkedViewsFeature, "RicShowAllLinkedViewsFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicShowAllLinkedViewsFeature::isCommandEnabled() const
{
return caf::SelectionManager::instance()->selectedItemAncestorOfType<RimViewLinkerCollection>() != nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicShowAllLinkedViewsFeature::onActionTriggered( bool isChecked )
{
auto linkedViews = caf::SelectionManager::instance()->objectsByType<RimViewLinker>();
auto managedViews = caf::SelectionManager::instance()->objectsByType<RimViewController>();
for ( auto& managedView : managedViews )
{
RimViewLinker* rimLinked = managedView->firstAncestorOrThisOfTypeAsserted<RimViewLinker>();
linkedViews.push_back( rimLinked );
}
for ( auto& linkedView : linkedViews )
{
auto views = linkedView->allViews();
for ( auto& view : views )
{
view->forceShowWindowOn();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicShowAllLinkedViewsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Open All Linked Views" );
}
ApplicationLibCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.h
-37
View File
@@ -1,37 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafCmdFeature.h"
#include <vector>
//==================================================================================================
///
//==================================================================================================
class RicShowAllLinkedViewsFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:
bool isCommandEnabled() const override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
};
ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
+10 -14
View File
@@ -405,22 +405,18 @@ void Rim3dView::assignIdIfNecessary()
//--------------------------------------------------------------------------------------------------
void Rim3dView::updateWindowTitle()
{
if ( m_viewer )
auto title = autoName();
if ( isMasterView() && assosiatedViewLinker() && assosiatedViewLinker()->isActive() )
{
auto title = autoName();
if ( isMasterView() && assosiatedViewLinker() && assosiatedViewLinker()->isActive() )
{
title += " (Primary)";
}
else if ( viewController() && viewController()->isActive() )
{
title += " (Controlled)";
}
m_viewer->layoutWidget()->setWindowTitle( title );
title += " (Primary)";
}
RimViewWindow::updateWindowTitle();
else if ( viewController() && viewController()->isActive() )
{
title += " (Controlled)";
}
RimViewWindow::updateWindowTitleIcon( title );
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
-6
View File
@@ -546,14 +546,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator";
menuBuilder << "RicDeleteScriptPathFeature";
}
else if ( dynamic_cast<RimViewController*>( firstUiItem ) )
{
menuBuilder << "RicShowAllLinkedViewsFeature";
}
else if ( dynamic_cast<RimViewLinker*>( firstUiItem ) || dynamic_cast<RimViewLinkerCollection*>( firstUiItem ) )
{
menuBuilder << "RicShowAllLinkedViewsFeature";
menuBuilder << "Separator";
menuBuilder << "RicDeleteAllLinkedViewsFeature";
}
else if ( dynamic_cast<RimWellLogPlotCollection*>( firstUiItem ) )
ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
+9 -2
View File
@@ -336,11 +336,18 @@ void RimViewWindow::fieldChangedByUi( const caf::PdmFieldHandle* changedField, c
///
//--------------------------------------------------------------------------------------------------
void RimViewWindow::updateWindowTitle()
{
updateWindowTitleIcon( windowTitle() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewWindow::updateWindowTitleIcon(QString title)
{
if ( viewWidget() && dockWidget() )
{
viewWidget()->setWindowTitle( windowTitle() );
dockWidget()->setWindowTitle( windowTitle() );
viewWidget()->setWindowTitle( title );
dockWidget()->setWindowTitle( title );
if ( isActiveViewer() )
{
ApplicationLibCode/ProjectDataModel/RimViewWindow.h
+1
View File
@@ -75,6 +75,7 @@ public:
void viewNavigationChanged();
virtual void updateWindowTitle();
void updateWindowTitleIcon(QString title);
void resetDockWindowId();
QString dockWindowName();