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

#2109 Remove automatic color on well labels on background change

Browse Source
This commit is contained in:
Rebecca Cox
2017-11-09 13:50:55 +01:00
parent cc4041b09b
commit 75c506e257
5 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@@ -460,21 +460,6 @@ size_t RivWellPathPartMgr::segmentIndexFromTriangleIndex(size_t triangleIndex)
return m_pipeBranchData.m_pipeGeomGenerator->segmentIndexFromTriangleIndex(triangleIndex); return m_pipeBranchData.m_pipeGeomGenerator->segmentIndexFromTriangleIndex(triangleIndex);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivWellPathPartMgr::updateWellLabelTextColor(cvf::Color3f color)
{
if (m_wellLabelPart.p())
{
cvf::DrawableText* drawableText = dynamic_cast<cvf::DrawableText*>(m_wellLabelPart->drawable());
if (drawableText)
{
drawableText->setTextColor(color);
}
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
View File

@@ -72,8 +72,6 @@ public:
size_t segmentIndexFromTriangleIndex(size_t triangleIndex); size_t segmentIndexFromTriangleIndex(size_t triangleIndex);
void updateWellLabelTextColor(cvf::Color3f color);
private: private:
void appendFishboneSubsPartsToModel(cvf::ModelBasicList* model, void appendFishboneSubsPartsToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform, const caf::DisplayCoordTransform* displayCoordTransform,

1
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -462,7 +462,6 @@ void RimEclipseView::createDisplayModel()
wellPathCollection()->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p(), this); wellPathCollection()->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p(), this);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #endif // USE_PROTOTYPE_FEATURE_FRACTURES
m_wellPathPipeVizModel->updateBoundingBoxesRecursive(); m_wellPathPipeVizModel->updateBoundingBoxesRecursive();
m_viewer->updateWellPathTextColor();
m_viewer->addStaticModelOnce(m_wellPathPipeVizModel.p()); m_viewer->addStaticModelOnce(m_wellPathPipeVizModel.p());
// Create Scenes from the frameModels // Create Scenes from the frameModels

27
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -59,11 +59,6 @@
#include <QLabel> #include <QLabel>
#include <QMouseEvent> #include <QMouseEvent>
#include <QProgressBar> #include <QProgressBar>
#include "RimWellPathCollection.h"
#include "RimWellPath.h"
#include "RivWellPathPartMgr.h"
#include "RimSimWellInViewCollection.h"
#include "RimEclipseView.h"
using cvf::ManipulatorTrackball; using cvf::ManipulatorTrackball;
@@ -785,28 +780,6 @@ cvf::Model* RiuViewer::gridBoxModel() const
void RiuViewer::updateAnnotationItems() void RiuViewer::updateAnnotationItems()
{ {
updateTextAndTickMarkColorForOverlayItems(); updateTextAndTickMarkColorForOverlayItems();
updateWellPathTextColor();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::updateWellPathTextColor()
{
RimView* rimView = ownerReservoirView();
if (!rimView) return;
cvf::Color3f color = computeContrastColor();
RimWellPathCollection* wellPathCollection = rimView->wellPathCollection();
if (wellPathCollection)
{
for (RimWellPath* path : wellPathCollection->wellPaths())
{
path->partMgr()->updateWellLabelTextColor(color);
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -80,8 +80,6 @@ public:
void updateAnnotationItems(); void updateAnnotationItems();
void updateWellPathTextColor();
void showAnimationProgress(bool enable); void showAnimationProgress(bool enable);
void removeAllColorLegends(); void removeAllColorLegends();