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

#3806 Measurement. Display text label at last clicked position

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-12-20 12:34:17 +01:00
parent deec4c16e9
commit d6f4962ed7
7 changed files with 126 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
View File

@@ -48,34 +48,15 @@ bool RicMeasurementPickEventHandler::handlePickEvent(const Ric3DPickEvent& event
if (measurement && measurement->isInMeasurementMode())
{
{
Rim3dView* rimView = RiaApplication::instance()->activeReservoirView();
Rim3dView* rimView = RiaApplication::instance()->activeReservoirView();
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d domainCoord = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d domainCoord = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
//if (intersection->inputPolyLineFromViewerEnabled())
{
measurement->addPointInDomain(domainCoord);
measurement->addPointInDomain(domainCoord);
// Further Ui processing is stopped when true is returned
return true;
}
//else if (intersection->inputExtrusionPointsFromViewerEnabled())
//{
// intersection->appendPointToExtrusionDirection(domainCoord);
// // Further Ui processing is stopped when true is returned
// return true;
//}
//else if (intersection->inputTwoAzimuthPointsFromViewerEnabled())
//{
// intersection->appendPointToAzimuthLine(domainCoord);
// // Further Ui processing is stopped when true is returned
// return true;
//}
}
// Further Ui processing is stopped when true is returned
return true;
}
return false;

3
ApplicationCode/Commands/MeasurementCommands/RicToggleMeasurementModeFeature.cpp
View File

@@ -65,7 +65,8 @@ void RicToggleMeasurementModeFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Measurement Mode");
if(measurement()->isInMeasurementMode())
auto* meas = measurement();
if(meas && meas->isInMeasurementMode())
actionToSetup->setIcon(QIcon(":/NoRuler16x16.png"));
else
actionToSetup->setIcon(QIcon(":/Ruler16x16.png"));