OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 14:03:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3757 Improve position of labels when creating them in 3D view

Browse Source
This commit is contained in:
Jacob Støren 2018-12-03 10:54:26 +01:00
parent a13201e42e
commit f3c0345d3a
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationIn3dViewFeature.cpp
View File

@ -20,10 +20,11 @@
#include "RiaApplication.h"
#include "RimTextAnnotation.h"
#include "RimAnnotationInViewCollection.h"
#include "RimGridView.h"
#include "RimContourMapView.h"
#include "RimCase.h"
#include "RimGridView.h"
#include "RimTextAnnotation.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
@ -51,11 +52,15 @@ void RicCreateTextAnnotationIn3dViewFeature::onActionTriggered(bool isChecked)
{
RimGridView* activeView = RiaApplication::instance()->activeGridView();
RimContourMapView * contMapView = dynamic_cast<RimContourMapView*>(activeView);
if ( activeView )
{
cvf::Vec3d domainCoord = activeView->viewer()->lastPickPositionInDomainCoords();
cvf::BoundingBox bbox = activeView->ownerCase()->activeCellsBoundingBox();
if (contMapView) domainCoord[2] = bbox.max().z() - bbox.extent().z() * 0.2;
auto coll = activeView->annotationCollection();
if ( coll )
@ -63,12 +68,23 @@ void RicCreateTextAnnotationIn3dViewFeature::onActionTriggered(bool isChecked)
auto newAnnotation = new RimTextAnnotation();
newAnnotation->setAnchorPoint(domainCoord);
cvf::Vec3d labelPos = domainCoord;
labelPos.z() = bbox.max().z();
double height = labelPos.z() - domainCoord.z();
if (activeView->viewer()->mainCamera()->direction().z() <= 0)
{
labelPos.z() = bbox.max().z();
}
else
{
labelPos.z() = bbox.min().z();
}
cvf::Vec3d horizontalRight = activeView->viewer()->mainCamera()->direction() ^ cvf::Vec3d::Z_AXIS;
cvf::Vec3d horizontalUp = activeView->viewer()->mainCamera()->up() - (cvf::Vec3d::Z_AXIS * (activeView->viewer()->mainCamera()->up() * cvf::Vec3d::Z_AXIS) );
bool isOk = horizontalRight.normalize();
if (!isOk) horizontalRight = {1.0, 0.0, 0.0};
newAnnotation->setLabelPoint(labelPos + horizontalRight*0.5*height);
double height = fabs(labelPos.z() - domainCoord.z());
newAnnotation->setLabelPoint(labelPos + 2.0*height * (horizontalRight + horizontalUp));
coll->addAnnotation(newAnnotation);
coll->scheduleRedrawOfRelevantViews();