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

(#641) Use checkable button for point input from viewer

Browse Source
This commit is contained in:
Magne Sjaastad
2015-11-30 13:23:11 +01:00
parent 8b3adf0f5b
commit 3eade62961
7 changed files with 33 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -649,20 +649,3 @@ cvf::Color3f RiuViewer::computeContrastColor() const
return contrastColor;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::setActiveUiCommandFeature(RicCommandFeature* uiCommandFeature)
{
CVF_ASSERT(m_viewerCommands);
m_viewerCommands->setActiveUiCommandFeature(uiCommandFeature);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicCommandFeature* RiuViewer::activeUiCommandFeature() const
{
return m_viewerCommands->activeUiCommandFeature();
}

3
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -89,9 +89,6 @@ public:
void setAxisLabels(const cvf::String& xLabel, const cvf::String& yLabel, const cvf::String& zLabel);
void setActiveUiCommandFeature(RicCommandFeature* uiCommandFeature);
RicCommandFeature* activeUiCommandFeature() const;
public slots:
virtual void slotSetCurrentFrame(int frameIndex);
virtual void slotEndAnimation();

23
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -57,6 +57,7 @@
#include "RivWellPipeSourceInfo.h"
#include "cafCmdExecCommandManager.h"
#include "cafCmdFeatureManager.h"
#include "cafPdmUiTreeView.h"
#include "cafSelectionManager.h"
@@ -83,7 +84,13 @@ RiuViewerCommands::RiuViewerCommands(RiuViewer* ownerViewer)
m_currentGridIdx(-1),
m_currentCellIndex(-1)
{
caf::CmdFeature* cmdFeature = caf::CmdFeatureManager::instance()->getCommandFeature("RicNewPolylineCrossSectionFeature");
CVF_ASSERT(cmdFeature);
RicCommandFeature* riCommandFeature = dynamic_cast<RicCommandFeature*>(cmdFeature);
CVF_ASSERT(riCommandFeature);
m_activeUiCommandFeature = riCommandFeature;
}
//--------------------------------------------------------------------------------------------------
@@ -563,22 +570,6 @@ void RiuViewerCommands::findCellAndGridIndex(const RivCrossSectionSourceInfo* cr
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewerCommands::setActiveUiCommandFeature(RicCommandFeature* uiCommandFeature)
{
m_activeUiCommandFeature = uiCommandFeature;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicCommandFeature* RiuViewerCommands::activeUiCommandFeature() const
{
return m_activeUiCommandFeature;
}
//--------------------------------------------------------------------------------------------------
/// Perform picking and return the index of the face that was hit, if a drawable geo was hit
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -55,10 +55,6 @@ public:
void findCellAndGridIndex(const RivCrossSectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex);
void setActiveUiCommandFeature(RicCommandFeature* uiCommandFeature);
RicCommandFeature* activeUiCommandFeature() const;
private slots:
void slotRangeFilterI();
void slotRangeFilterJ();