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

#3935 Measurements : Add Esc button to abort measurement mode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-01-08 14:51:45 +01:00
parent f099b8a747
commit 20f9bf4318
8 changed files with 184 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@ void RicToggleMeasurementModeFeature::onActionTriggered(bool isChecked)
{
auto meas = measurement();
meas->setMeasurementMode(!meas->isInMeasurementMode());
refreshActionLook();
}
@@ -64,12 +65,29 @@ void RicToggleMeasurementModeFeature::onActionTriggered(bool isChecked)
void RicToggleMeasurementModeFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Measurement Mode");
actionToSetup->setIcon(QIcon(":/Ruler16x16.png"));
/*
auto* meas = measurement();
if (meas && meas->isInMeasurementMode())
actionToSetup->setIcon(QIcon(":/NoRuler16x16.png"));
else
actionToSetup->setIcon(QIcon(":/Ruler16x16.png"));
*/
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicToggleMeasurementModeFeature::isCommandChecked()
{
auto meas = measurement();
if (meas)
{
return meas->isInMeasurementMode();
}
return false;
}
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/Commands/MeasurementCommands/RicToggleMeasurementModeFeature.h
View File

@@ -33,14 +33,14 @@ class RicToggleMeasurementModeFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
public:
void refreshActionLook();
protected:
// Overrides
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
bool isCommandChecked() override;
private:
void refreshActionLook();
private:
RimMeasurement* measurement() const;