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

#3868 Annotations. Draw spheres on polylines + toggles conotrolling visibility

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-12-14 15:32:32 +01:00
parent 295da5658e
commit 8401e3d9f0
17 changed files with 355 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp
View File

@@ -27,6 +27,7 @@
#include "RimAnnotationCollection.h"
#include "RimAnnotationGroupCollection.h"
#include "RimAnnotationInViewCollection.h"
#include "RimAnnotationLineAppearance.h"
#include "RimProject.h"
#include "RimOilField.h"

2
ApplicationCode/Commands/AnnotationCommands/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
View File

@@ -27,6 +27,7 @@
#include "RimAnnotationCollection.h"
#include "RimAnnotationGroupCollection.h"
#include "RimAnnotationInViewCollection.h"
#include "RimAnnotationLineAppearance.h"
#include "RimProject.h"
#include "RimOilField.h"
@@ -63,6 +64,7 @@ void RicCreateUserDefinedPolylinesAnnotationFeature::onActionTriggered(bool isCh
auto newAnnotation = new RimUserDefinedPolylinesAnnotation();
auto newColor = RiaColorTables::categoryPaletteColors().cycledColor3f(coll->lineBasedAnnotationsCount());
newAnnotation->appearance()->setColor(newColor);
newAnnotation->appearance()->setSphereColor(newColor);
newAnnotation->enablePicking(true);
coll->addAnnotation(newAnnotation);
coll->updateConnectedEditors();

6
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@@ -54,7 +54,8 @@
#include "RimWellRftPlot.h"
#include "RimWellPathValve.h"
#include "RimTextAnnotation.h"
#include "RimLineBasedAnnotation.h"
#include "RimReachCircleAnnotation.h"
#include "RimPolylinesAnnotation.h"
#include "RimEllipseFractureTemplate.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
@@ -127,7 +128,8 @@ bool isDeletable(caf::PdmUiItem* uiItem)
if (dynamic_cast<RimDerivedEnsembleCaseCollection*>(uiItem)) return true;
if (dynamic_cast<RimWellPathValve*>(uiItem)) return true;
if (dynamic_cast<RimTextAnnotation*>(uiItem)) return true;
if (dynamic_cast<RimLineBasedAnnotation*>(uiItem)) return true;
if (dynamic_cast<RimReachCircleAnnotation*>(uiItem)) return true;
if (dynamic_cast<RimPolylinesAnnotation*>(uiItem)) return true;
return false;
}