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

#3343 HoloLens Export : Use factory to create option items for views

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-12 11:51:52 +02:00
parent 08449ceb9e
commit 67b9561c04
4 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
View File

@@ -20,6 +20,7 @@
#include "RicLinkVisibleViewsFeatureUi.h"
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "RimCase.h"
#include "RimGridView.h"
@@ -82,16 +83,7 @@ QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOption
{
for (RimGridView* v : m_allViews)
{
RimCase* rimCase = nullptr;
v->firstAncestorOrThisOfType(rimCase);
QIcon icon;
if (rimCase)
{
icon = rimCase->uiCapability()->uiIcon();
}
options.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(v), v, false, icon));
RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(v, &options);
}
}

4
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@@ -19,6 +19,7 @@
#include "RimMultiSnapshotDefinition.h"
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h"
@@ -108,8 +109,7 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
for (Rim3dView* view : views)
{
QString caseAndView = view->ownerCase()->caseUserDescription() + " - " + view->name();
options.push_back(caf::PdmOptionItemInfo(caseAndView, view));
RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(view, &options);
}
}
else if (fieldNeedingOptions == &eclipseResultType)

13
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -20,6 +20,7 @@
#include "RimViewController.h"
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "RigCaseToCaseCellMapper.h"
#include "RigCaseToCaseRangeFilterMapper.h"
@@ -42,13 +43,13 @@
#include "Rim3dView.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RimIntersectionCollection.h"
#include "RiuViewer.h"
#include "cafPdmUiTreeOrdering.h"
#include <QMessageBox>
#include "RimIntersectionCollection.h"
CAF_PDM_SOURCE_INIT(RimViewController, "ViewController");
//--------------------------------------------------------------------------------------------------
@@ -119,15 +120,7 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf
{
if (view != viewLinker->masterView())
{
RimCase* rimCase = nullptr;
view->firstAncestorOrThisOfType(rimCase);
QIcon icon;
if (rimCase)
{
icon = rimCase->uiCapability()->uiIcon();
}
options.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon));
RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(view, &options);
}
}

3
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@@ -85,12 +85,11 @@ public:
void updateCursorPosition(const RimGridView* sourceView, const cvf::Vec3d& domainCoord);
public:
static QString displayNameForView(RimGridView* view);
protected:
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }
virtual void initAfterRead();
static QString displayNameForView(RimGridView* view);
private:
void allViewsForCameraSync(const RimGridView* source, std::vector<RimGridView*>& views) const;