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

(#443) Linked views default is to not link the result color

Browse Source 
Did some cosmetics as well.
This commit is contained in:
Jacob Støren 2015-09-11 14:16:13 +02:00
parent 8b26726672
commit 379cce41f4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimViewLink.cpp
View File

@ -44,16 +44,16 @@ RimViewLink::RimViewLink(void)
{ {
CAF_PDM_InitObject("View Config", ":/ReservoirView.png", "", ""); CAF_PDM_InitObject("View Config", ":/ReservoirView.png", "", "");
QString defaultName = "View Config : Empty view"; QString defaultName = "View Config: Empty view";
CAF_PDM_InitField(&name, "Name", defaultName, "Managed View Name", "", "", ""); CAF_PDM_InitField(&name, "Name", defaultName, "Managed View Name", "", "", "");
name.uiCapability()->setUiHidden(true); name.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_managedView, "ManagedView", "Managed View", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_managedView, "ManagedView", "Linked View", "", "", "");
m_managedView.uiCapability()->setUiChildrenHidden(true); m_managedView.uiCapability()->setUiChildrenHidden(true);
CAF_PDM_InitField(&syncCamera, "SyncCamera", true, "Camera", "", "", ""); CAF_PDM_InitField(&syncCamera, "SyncCamera", true, "Camera", "", "", "");
CAF_PDM_InitField(&syncTimeStep, "SyncTimeStep", true, "Time Step", "", "", ""); CAF_PDM_InitField(&syncTimeStep, "SyncTimeStep", true, "Time Step", "", "", "");
CAF_PDM_InitField(&syncCellResult, "SyncCellResult", true, "Cell Result", "", "", ""); CAF_PDM_InitField(&syncCellResult, "SyncCellResult", false, "Cell Result", "", "", "");
CAF_PDM_InitField(&syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", ""); CAF_PDM_InitField(&syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", "");
CAF_PDM_InitField(&syncPropertyFilters, "SyncPropertyFilters", true,"Property Filters", "", "", ""); CAF_PDM_InitField(&syncPropertyFilters, "SyncPropertyFilters", true,"Property Filters", "", "", "");
} }
@ -382,7 +382,7 @@ void RimViewLink::updateDisplayNameAndIcon()
} }
else else
{ {
name = "View Config : Empty view"; name = "View Config: Empty view";
} }
QIcon icon; QIcon icon;
@ -420,12 +420,14 @@ void RimViewLink::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
{ {
uiOrdering.add(&m_managedView); uiOrdering.add(&m_managedView);
caf::PdmUiGroup* scriptGroup = uiOrdering.addNewGroup("Properties for sync"); caf::PdmUiGroup* scriptGroup = uiOrdering.addNewGroup("Link Options");
scriptGroup->add(&syncCamera); scriptGroup->add(&syncCamera);
scriptGroup->add(&syncTimeStep); scriptGroup->add(&syncTimeStep);
scriptGroup->add(&syncCellResult); scriptGroup->add(&syncCellResult);
scriptGroup->add(&syncRangeFilters);
scriptGroup->add(&syncPropertyFilters); caf::PdmUiGroup* visibleCells = uiOrdering.addNewGroup("Link Cell Filters");
visibleCells->add(&syncRangeFilters);
visibleCells->add(&syncPropertyFilters);
} }

2
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@ -296,7 +296,7 @@ QString RimViewLinker::displayNameForView(RimView* view)
RimCase* rimCase = NULL; RimCase* rimCase = NULL;
view->firstAnchestorOrThisOfType(rimCase); view->firstAnchestorOrThisOfType(rimCase);
displayName = rimCase->caseUserDescription() + " : " + view->name; displayName = rimCase->caseUserDescription() + ": " + view->name;
} }
return displayName; return displayName;