mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
(#499) Added a custom track delete feature
Added infrastructure needed to delete track from plot and plot collection
This commit is contained in:
parent
4d42fd37f5
commit
2b7d7be3f1
@ -49,20 +49,6 @@ bool RicDeleteItemFeature::isCommandEnabled()
|
|||||||
caf::PdmChildArrayFieldHandle* childArrayFieldHandle = dynamic_cast<caf::PdmChildArrayFieldHandle*>(currentPdmObject->parentField());
|
caf::PdmChildArrayFieldHandle* childArrayFieldHandle = dynamic_cast<caf::PdmChildArrayFieldHandle*>(currentPdmObject->parentField());
|
||||||
if (!childArrayFieldHandle) return false;
|
if (!childArrayFieldHandle) return false;
|
||||||
|
|
||||||
if (dynamic_cast<RimWellLogPlotTrack*>(currentPdmObject))
|
|
||||||
{
|
|
||||||
RimWellLogPlotTrack* plotTrack = dynamic_cast<RimWellLogPlotTrack*>(currentPdmObject);
|
|
||||||
RimWellLogPlot* wellLogPlot;
|
|
||||||
plotTrack->firstAnchestorOrThisOfType(wellLogPlot);
|
|
||||||
if (wellLogPlot)
|
|
||||||
{
|
|
||||||
if (wellLogPlot->trackCount() < 2)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.h
|
|||||||
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.h
|
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.h
|
||||||
${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.h
|
${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.h
|
||||||
${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h
|
${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h
|
||||||
|
${CEE_CURRENT_LIST_DIR}RicDeleteWellLogPlotTrackFeature.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set (SOURCE_GROUP_SOURCE_FILES
|
set (SOURCE_GROUP_SOURCE_FILES
|
||||||
@ -24,6 +25,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.cpp
|
|||||||
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.cpp
|
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.cpp
|
${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.cpp
|
${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.cpp
|
||||||
|
${CEE_CURRENT_LIST_DIR}RicDeleteWellLogPlotTrackFeature.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND CODE_HEADER_FILES
|
list(APPEND CODE_HEADER_FILES
|
||||||
|
@ -0,0 +1,86 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Copyright (C) 2015- Statoil ASA
|
||||||
|
// Copyright (C) 2015- Ceetron Solutions AS
|
||||||
|
//
|
||||||
|
// ResInsight is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
//
|
||||||
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||||
|
// for more details.
|
||||||
|
//
|
||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include "RicDeleteWellLogPlotTrackFeature.h"
|
||||||
|
|
||||||
|
#include "RimWellLogPlotTrack.h"
|
||||||
|
#include "RimWellLogPlot.h"
|
||||||
|
|
||||||
|
#include "cafSelectionManager.h"
|
||||||
|
|
||||||
|
#include <QAction>
|
||||||
|
|
||||||
|
|
||||||
|
CAF_CMD_SOURCE_INIT(RicDeleteWellLogPlotTrackFeature, "RicDeleteWellLogPlotTrackFeature");
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RicDeleteWellLogPlotTrackFeature::isCommandEnabled()
|
||||||
|
{
|
||||||
|
std::vector<RimWellLogPlotTrack*> selection;
|
||||||
|
caf::SelectionManager::instance()->objectsByType(&selection);
|
||||||
|
|
||||||
|
if (selection.size() > 0)
|
||||||
|
{
|
||||||
|
RimWellLogPlot* wellLogPlot = NULL;
|
||||||
|
selection[0]->firstAnchestorOrThisOfType(wellLogPlot);
|
||||||
|
if (wellLogPlot->trackCount() > 1)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RicDeleteWellLogPlotTrackFeature::onActionTriggered(bool isChecked)
|
||||||
|
{
|
||||||
|
std::vector<RimWellLogPlotTrack*> selection;
|
||||||
|
caf::SelectionManager::instance()->objectsByType(&selection);
|
||||||
|
|
||||||
|
for (size_t i = 0; i < selection.size(); i++)
|
||||||
|
{
|
||||||
|
RimWellLogPlotTrack* track = selection[i];
|
||||||
|
|
||||||
|
RimWellLogPlot* wellLogPlot = NULL;
|
||||||
|
track->firstAnchestorOrThisOfType(wellLogPlot);
|
||||||
|
if (wellLogPlot && wellLogPlot->trackCount() > 1)
|
||||||
|
{
|
||||||
|
wellLogPlot->removeTrack(track);
|
||||||
|
wellLogPlot->updateAvailableDepthRange();
|
||||||
|
wellLogPlot->uiCapability()->updateConnectedEditors();
|
||||||
|
|
||||||
|
caf::SelectionManager::instance()->removeObjectFromAllSelections(track);
|
||||||
|
|
||||||
|
delete track;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RicDeleteWellLogPlotTrackFeature::setupActionLook(QAction* actionToSetup)
|
||||||
|
{
|
||||||
|
actionToSetup->setText("Delete Track");
|
||||||
|
}
|
@ -0,0 +1,36 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Copyright (C) 2015- Statoil ASA
|
||||||
|
// Copyright (C) 2015- Ceetron Solutions AS
|
||||||
|
//
|
||||||
|
// ResInsight is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
//
|
||||||
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||||
|
// for more details.
|
||||||
|
//
|
||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "cafCmdFeature.h"
|
||||||
|
|
||||||
|
//==================================================================================================
|
||||||
|
///
|
||||||
|
//==================================================================================================
|
||||||
|
class RicDeleteWellLogPlotTrackFeature : public caf::CmdFeature
|
||||||
|
{
|
||||||
|
CAF_CMD_HEADER_INIT;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
// Overrides
|
||||||
|
virtual bool isCommandEnabled();
|
||||||
|
virtual void onActionTriggered( bool isChecked );
|
||||||
|
virtual void setupActionLook( QAction* actionToSetup );
|
||||||
|
};
|
@ -822,7 +822,7 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
|
|||||||
{
|
{
|
||||||
commandIds << "RicNewWellLogCurveExtractionFeature";
|
commandIds << "RicNewWellLogCurveExtractionFeature";
|
||||||
commandIds << "RicNewWellLogFileCurveFeature";
|
commandIds << "RicNewWellLogFileCurveFeature";
|
||||||
commandIds << "RicDeleteItemFeature";
|
commandIds << "RicDeleteWellLogPlotTrackFeature";
|
||||||
}
|
}
|
||||||
else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
|
else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
|
||||||
{
|
{
|
||||||
|
@ -175,6 +175,18 @@ void RimWellLogPlot::addTrack(RimWellLogPlotTrack* track)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RimWellLogPlot::removeTrack(RimWellLogPlotTrack* track)
|
||||||
|
{
|
||||||
|
if (track)
|
||||||
|
{
|
||||||
|
m_viewer->removeTrackPlot(track->viewer());
|
||||||
|
tracks.removeChildObject(track);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -457,3 +469,4 @@ QString RimWellLogPlot::depthPlotTitle() const
|
|||||||
depthTitle += " [m]";
|
depthTitle += " [m]";
|
||||||
return depthTitle;
|
return depthTitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,6 +54,7 @@ public:
|
|||||||
|
|
||||||
void addTrack(RimWellLogPlotTrack* track);
|
void addTrack(RimWellLogPlotTrack* track);
|
||||||
size_t trackCount() { return tracks.size();}
|
size_t trackCount() { return tracks.size();}
|
||||||
|
void removeTrack(RimWellLogPlotTrack* track);
|
||||||
|
|
||||||
void loadDataAndUpdate();
|
void loadDataAndUpdate();
|
||||||
void updateTracks();
|
void updateTracks();
|
||||||
|
@ -86,6 +86,15 @@ void RiuWellLogPlot::insertTrackPlot(RiuWellLogTrackPlot* trackPlot)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RiuWellLogPlot::removeTrackPlot(RiuWellLogTrackPlot* trackPlot)
|
||||||
|
{
|
||||||
|
m_layout->removeWidget(trackPlot);
|
||||||
|
m_trackPlots.removeAll(trackPlot);
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -139,3 +148,4 @@ RimWellLogPlot* RiuWellLogPlot::ownerPlotDefinition()
|
|||||||
{
|
{
|
||||||
return m_plotDefinition;
|
return m_plotDefinition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,6 +46,7 @@ public:
|
|||||||
RimWellLogPlot* ownerPlotDefinition();
|
RimWellLogPlot* ownerPlotDefinition();
|
||||||
|
|
||||||
void insertTrackPlot(RiuWellLogTrackPlot* trackPlot);
|
void insertTrackPlot(RiuWellLogTrackPlot* trackPlot);
|
||||||
|
void removeTrackPlot(RiuWellLogTrackPlot* trackPlot);
|
||||||
|
|
||||||
void setDepthRangeAndReplot(double minDepth, double maxDepth);
|
void setDepthRangeAndReplot(double minDepth, double maxDepth);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user