OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#395) Hide master view in property view, use view icons in tree view

Browse Source
This commit is contained in:
Magne Sjaastad 2015-09-02 13:44:56 +02:00
parent 3afa94bb3b
commit ccc7703e1f
8 changed files with 235 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@ -52,6 +52,7 @@ ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h
${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.h
${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.h
${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.h
# General delete of any object in a child array field
@ -107,6 +108,7 @@ ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp
${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.cpp
${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.cpp
${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.cpp
# General delete of any object in a child array field
${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.cpp

22
ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
View File

@ -32,6 +32,8 @@
#include <QAction>
#include <QTreeView>
#include "RicLinkVisibleViewsFeatureUi.h"
#include "cafPdmUiPropertyViewDialog.h"
CAF_CMD_SOURCE_INIT(RicLinkVisibleViewsFeature, "RicLinkVisibleViewsFeature");
@ -58,17 +60,25 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
std::vector<RimView*> views;
proj->allVisibleViews(views);
CVF_ASSERT(views.size() > 1);
RimView* masterView = views[0];
RimLinkedViews* linkedViews = new RimLinkedViews;
linkedViews->mainView = masterView;
for (size_t i = 1; i < views.size(); i++)
RicLinkVisibleViewsFeatureUi featureUi;
featureUi.setViews(views);
caf::PdmUiPropertyViewDialog propertyDialog(NULL, &featureUi, "New View Group", "");
propertyDialog.setWindowIcon(QIcon(":/chain.png"));
if (propertyDialog.exec() != QDialog::Accepted) return;
RimView* masterView = featureUi.masterView();
RimLinkedViews* linkedViews = new RimLinkedViews;
linkedViews->setMainView(masterView);
for (size_t i = 0; i < views.size(); i++)
{
RimView* rimView = views[i];
if (rimView == masterView) continue;
RimManagedViewConfig* viewConfig = new RimManagedViewConfig;
viewConfig->managedView = rimView;
viewConfig->setManagedView(rimView);
linkedViews->viewConfigs.push_back(viewConfig);

89
ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.cpp Normal file
View File

@ -0,0 +1,89 @@
/////////////////////////////////////////////////////////////////////////////////
//
// 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 "RicLinkVisibleViewsFeatureUi.h"
#include "cafPdmUiTextEditor.h"
#include "cafPdmObjectGroup.h"
#include "RimView.h"
#include "RimLinkedViews.h"
CAF_PDM_SOURCE_INIT(RicLinkVisibleViewsFeatureUi, "RicLinkVisibleViewsFeatureUi");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi(void)
{
CAF_PDM_InitObject("Link Visible Views Feature UI", ":/chain.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_allViewsAsText, "VisibleViews", "Visible Views", "", "", "");
m_allViewsAsText.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_masterView, "MasterView", "Master View", "", "", "");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicLinkVisibleViewsFeatureUi::setViews(const std::vector<RimView*>& allViews)
{
m_allViews = allViews;
QString viewNames;
for (int i = 0; i < m_allViews.size(); i++)
{
viewNames += RimLinkedViews::displayNameForView(m_allViews[i]);
viewNames += "\n";
}
m_allViewsAsText = viewNames;
if (allViews.size() > 0)
{
m_masterView = allViews[0];
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RicLinkVisibleViewsFeatureUi::masterView()
{
return m_masterView;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> optionList;
if (fieldNeedingOptions == &m_masterView)
{
for (int i = 0; i < m_allViews.size(); i++)
{
optionList.push_back(caf::PdmOptionItemInfo(RimLinkedViews::displayNameForView(m_allViews[i]),
QVariant::fromValue(caf::PdmPointer<PdmObjectHandle>(m_allViews[i]))));
}
}
return optionList;
}

51
ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.h Normal file
View File

@ -0,0 +1,51 @@
/////////////////////////////////////////////////////////////////////////////////
//
// 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 "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
#include <vector>
class RimView;
//==================================================================================================
///
//==================================================================================================
class RicLinkVisibleViewsFeatureUi : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RicLinkVisibleViewsFeatureUi(void);
void setViews(const std::vector<RimView*>& allViews);
RimView* masterView();
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
private:
caf::PdmField<QString> m_allViewsAsText;
caf::PdmPtrField<RimView*> m_masterView;
std::vector<RimView*> m_allViews;
};

48
ApplicationCode/ProjectDataModel/RimLinkedViews.cpp
View File

@ -46,12 +46,14 @@ CAF_PDM_SOURCE_INIT(RimLinkedViews, "RimLinkedViews");
//--------------------------------------------------------------------------------------------------
RimLinkedViews::RimLinkedViews(void)
{
CAF_PDM_InitObject("Linked Views", ":/chain.png", "", "");
CAF_PDM_InitObject("Linked Views", "", "", "");
CAF_PDM_InitField(&name, "Name", QString("View Group Name"), "View Group Name", "", "", "");
CAF_PDM_InitField(&m_name, "Name", QString("View Group Name"), "View Group Name", "", "", "");
m_name.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&mainView, "MainView", "Main View", "", "", "");
mainView.uiCapability()->setUiChildrenHidden(true);
CAF_PDM_InitFieldNoDefault(&m_mainView, "MainView", "Main View", "", "", "");
m_mainView.uiCapability()->setUiChildrenHidden(true);
m_mainView.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&viewConfigs, "ManagedViews", "Managed Views", "", "", "");
viewConfigs.uiCapability()->setUiHidden(true);
@ -75,13 +77,13 @@ void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
return;
}
if (sourceView && sourceView != mainView)
if (sourceView && sourceView != m_mainView)
{
mainView->viewer()->setCurrentFrame(timeStep);
m_mainView->viewer()->setCurrentFrame(timeStep);
}
else
{
mainView->viewer()->setCurrentFrame(timeStep);
m_mainView->viewer()->setCurrentFrame(timeStep);
}
for (size_t i = 0; i < viewConfigs.size(); i++)
@ -102,7 +104,7 @@ void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
//--------------------------------------------------------------------------------------------------
void RimLinkedViews::updateCellResult()
{
RimView* rimView = mainView;
RimView* rimView = m_mainView;
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (masterEclipseView && masterEclipseView->cellResult())
{
@ -238,7 +240,7 @@ void RimLinkedViews::configureOverrides()
//--------------------------------------------------------------------------------------------------
void RimLinkedViews::allViewsForCameraSync(std::vector<RimView*>& views)
{
views.push_back(mainView());
views.push_back(m_mainView());
for (size_t i = 0; i < viewConfigs.size(); i++)
{
@ -257,7 +259,7 @@ void RimLinkedViews::applyAllOperations()
configureOverrides();
updateCellResult();
updateTimeStep(NULL, mainView->currentTimeStep());
updateTimeStep(NULL, m_mainView->currentTimeStep());
updateRangeFilters();
updatePropertyFilters();
}
@ -269,7 +271,7 @@ QList<caf::PdmOptionItemInfo> RimLinkedViews::calculateValueOptions(const caf::P
{
QList<caf::PdmOptionItemInfo> optionList;
if (fieldNeedingOptions == &mainView)
if (fieldNeedingOptions == &m_mainView)
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimView*> views;
@ -335,14 +337,20 @@ RimManagedViewConfig* RimLinkedViews::viewConfigForView(RimView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimLinkedViews::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimLinkedViews::setMainView(RimView* view)
{
if (changedField == &mainView)
{
for (size_t i = 0; i < viewConfigs.size(); i++)
{
viewConfigs[i]->updateViewChanged();
viewConfigs[i]->updateConnectedEditors();
}
}
m_mainView = view;
m_name = displayNameForView(view);
this->uiCapability()->setUiIcon(view->uiCapability()->uiIcon());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimLinkedViews::mainView()
{
return m_mainView;
}

12
ApplicationCode/ProjectDataModel/RimLinkedViews.h
View File

@ -42,8 +42,8 @@ public:
RimLinkedViews(void);
virtual ~RimLinkedViews(void);
caf::PdmPtrField<RimView*> mainView;
caf::PdmField<QString> name;
void setMainView(RimView* view);
RimView* mainView();
caf::PdmChildArrayField<RimManagedViewConfig*> viewConfigs;
@ -64,8 +64,12 @@ public:
RimManagedViewConfig* viewConfigForView(RimView* view);
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
virtual caf::PdmFieldHandle* userDescriptionField() { return &name; }
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
private:
caf::PdmPtrField<RimView*> m_mainView;
caf::PdmField<QString> m_name;
};

54
ApplicationCode/ProjectDataModel/RimManagedViewConfig.cpp
View File

@ -48,8 +48,8 @@ RimManagedViewConfig::RimManagedViewConfig(void)
CAF_PDM_InitField(&name, "Name", defaultName, "Managed View Name", "", "", "");
name.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&managedView, "ManagedView", "Managed View", "", "", "");
managedView.uiCapability()->setUiChildrenHidden(true);
CAF_PDM_InitFieldNoDefault(&m_managedView, "ManagedView", "Managed View", "", "", "");
m_managedView.uiCapability()->setUiChildrenHidden(true);
CAF_PDM_InitField(&syncCamera, "SyncCamera", true, "Sync Camera", "", "", "");
CAF_PDM_InitField(&syncTimeStep, "SyncTimeStep", true, "Sync Time Step", "", "", "");
@ -72,7 +72,7 @@ QList<caf::PdmOptionItemInfo> RimManagedViewConfig::calculateValueOptions(const
{
QList<caf::PdmOptionItemInfo> optionList;
if (fieldNeedingOptions == &managedView)
if (fieldNeedingOptions == &m_managedView)
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimView*> views;
@ -113,15 +113,15 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
{
if (changedField == &syncCamera && syncCamera())
{
if (managedView && managedView->viewer()) managedView->viewer()->update();
if (m_managedView && m_managedView->viewer()) m_managedView->viewer()->update();
}
else if (changedField == &syncTimeStep && syncTimeStep())
{
if (managedView)
if (m_managedView)
{
RimLinkedViews* linkedViews = NULL;
this->firstAnchestorOrThisOfType(linkedViews);
linkedViews->updateTimeStep(managedView, managedView->currentTimeStep());
linkedViews->updateTimeStep(m_managedView, m_managedView->currentTimeStep());
}
}
else if (changedField == &syncCellResult && syncCellResult())
@ -138,11 +138,11 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
{
configureOverridesUpdateDisplayModel();
}
else if (changedField == &managedView)
else if (changedField == &m_managedView)
{
configureOverridesUpdateDisplayModel();
if (managedView)
if (m_managedView)
{
if (syncCellResult())
{
@ -151,7 +151,7 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
linkedViews->updateCellResult();
}
name = RimLinkedViews::displayNameForView(managedView);
name = RimLinkedViews::displayNameForView(m_managedView);
}
PdmObjectHandle* prevValue = oldValue.value<caf::PdmPointer<PdmObjectHandle> >().rawPtr();
@ -200,7 +200,7 @@ void RimManagedViewConfig::initAfterRead()
//--------------------------------------------------------------------------------------------------
RimEclipseView* RimManagedViewConfig::managedEclipseView()
{
RimView* rimView = managedView;
RimView* rimView = m_managedView;
return dynamic_cast<RimEclipseView*>(rimView);
}
@ -210,7 +210,7 @@ RimEclipseView* RimManagedViewConfig::managedEclipseView()
//--------------------------------------------------------------------------------------------------
RimGeoMechView* RimManagedViewConfig::managedGeoView()
{
RimView* rimView = managedView;
RimView* rimView = m_managedView;
return dynamic_cast<RimGeoMechView*>(rimView);
}
@ -222,9 +222,9 @@ void RimManagedViewConfig::configureOverridesUpdateDisplayModel()
{
configureOverrides();
if (managedView)
if (m_managedView)
{
managedView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews();
m_managedView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews();
}
RimEclipseView* eclipseView = managedEclipseView();
@ -250,15 +250,15 @@ void RimManagedViewConfig::configureOverrides()
RimView* masterView = linkedViews->mainView();
if (managedView)
if (m_managedView)
{
if (syncRangeFilters)
{
managedView->setOverrideRangeFilterCollection(masterView->rangeFilterCollection());
m_managedView->setOverrideRangeFilterCollection(masterView->rangeFilterCollection());
}
else
{
managedView->setOverrideRangeFilterCollection(NULL);
m_managedView->setOverrideRangeFilterCollection(NULL);
}
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(masterView);
@ -342,9 +342,9 @@ void RimManagedViewConfig::updateViewChanged()
//--------------------------------------------------------------------------------------------------
void RimManagedViewConfig::updateDisplayName()
{
if (managedView)
if (m_managedView)
{
name = RimLinkedViews::displayNameForView(managedView);
name = RimLinkedViews::displayNameForView(m_managedView);
}
else
{
@ -352,3 +352,21 @@ void RimManagedViewConfig::updateDisplayName()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView* RimManagedViewConfig::managedView()
{
return m_managedView;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimManagedViewConfig::setManagedView(RimView* view)
{
m_managedView = view;
this->uiCapability()->setUiIcon(view->uiCapability()->uiIcon());
}

7
ApplicationCode/ProjectDataModel/RimManagedViewConfig.h
View File

@ -41,8 +41,9 @@ public:
caf::PdmField<QString> name;
caf::PdmPtrField<RimView*> managedView;
RimView* managedView();
void setManagedView(RimView* view);
caf::PdmField<bool> syncCamera;
caf::PdmField<bool> syncTimeStep;
caf::PdmField<bool> syncCellResult;
@ -66,4 +67,6 @@ private:
RimEclipseView* managedEclipseView();
RimGeoMechView* managedGeoView();
caf::PdmPtrField<RimView*> m_managedView;
};