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

Update naming and imports

Browse Source 
- Correct naming
- Update includes
This commit is contained in:
Jørgen Herje 2023-05-22 13:19:44 +02:00 committed by Magne Sjaastad
parent ee724633b5
commit 2247dced58
8 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/Commands/WellLogCommands/CMakeLists_files.cmake
View File

@ -1,6 +1,6 @@
set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicAddWellLogToPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogCurveExtractionFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogExtractionCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogRftCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewRftPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewPltPlotFeature.h
@ -35,7 +35,7 @@ set(SOURCE_GROUP_HEADER_FILES
set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicAddWellLogToPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogCurveExtractionFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogExtractionCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogRftCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewRftPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewPltPlotFeature.cpp

2
ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp
View File

@ -23,8 +23,6 @@
#include "RiaPlotDefines.h"
#include "RiaResultNames.h"
#include "RicNewWellLogCurveExtractionFeature.h"
#include "RicNewWellLogFileCurveFeature.h"
#include "RicNewWellLogPlotFeatureImpl.h"
#include "RicWellLogTools.h"

12
ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp → ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogExtractionCurveFeature.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicNewWellLogCurveExtractionFeature.h"
#include "RicNewWellLogExtractionCurveFeature.h"
#include "RicNewWellLogPlotFeatureImpl.h"
#include "RicWellLogPlotCurveFeatureImpl.h"
@ -48,12 +48,12 @@
#include <vector>
CAF_CMD_SOURCE_INIT( RicNewWellLogCurveExtractionFeature, "RicNewWellLogCurveExtractionFeature" );
CAF_CMD_SOURCE_INIT( RicNewWellLogExtractionCurveFeature, "RicNewWellLogExtractionCurveFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNewWellLogCurveExtractionFeature::isCommandEnabled()
bool RicNewWellLogExtractionCurveFeature::isCommandEnabled()
{
if ( RicWellLogPlotCurveFeatureImpl::parentWellAllocationPlot() ) return false;
if ( RicWellLogPlotCurveFeatureImpl::parentWellRftPlot() ) return false;
@ -67,7 +67,7 @@ bool RicNewWellLogCurveExtractionFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellLogCurveExtractionFeature::onActionTriggered( bool isChecked )
void RicNewWellLogExtractionCurveFeature::onActionTriggered( bool isChecked )
{
if ( RicWellLogPlotCurveFeatureImpl::parentWellAllocationPlot() ) return;
@ -122,7 +122,7 @@ void RicNewWellLogCurveExtractionFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellLogCurveExtractionFeature::setupActionLook( QAction* actionToSetup )
void RicNewWellLogExtractionCurveFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "New Well Log Extraction Curve" );
actionToSetup->setIcon( QIcon( ":/WellLogCurve16x16.png" ) );
@ -131,7 +131,7 @@ void RicNewWellLogCurveExtractionFeature::setupActionLook( QAction* actionToSetu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNewWellLogCurveExtractionFeature::caseAvailable()
bool RicNewWellLogExtractionCurveFeature::caseAvailable()
{
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );

2
ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.h → ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogExtractionCurveFeature.h
View File

@ -24,7 +24,7 @@
//==================================================================================================
///
//==================================================================================================
class RicNewWellLogCurveExtractionFeature : public caf::CmdFeature
class RicNewWellLogExtractionCurveFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;

2
ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp
View File

@ -19,8 +19,6 @@
#include "RicNewWellLogPlotFeature.h"
#include "RicNewWellLogCurveExtractionFeature.h"
#include "RicNewWellLogFileCurveFeature.h"
#include "RicNewWellLogPlotFeatureImpl.h"
#include "RimProject.h"

1
ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp
View File

@ -24,7 +24,6 @@
#include "RiuQwtPlotWidget.h"
#include "RiuWellLogPlot.h"
#include "RicNewWellLogCurveExtractionFeature.h"
#include "RicWellLogPlotCurveFeatureImpl.h"
#include "RicWellLogTools.h"

6
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -401,7 +401,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicShowWellAllocationPlotFeature";
menuBuilder << "RicNewWellBoreStabilityPlotFeature";
menuBuilder << "RicNewWellLogFileCurveFeature";
menuBuilder << "RicNewWellLogCurveExtractionFeature";
menuBuilder << "RicNewWellLogExtractionCurveFeature";
menuBuilder.subMenuEnd();
menuBuilder.subMenuStart( "3D Well Log Curves", QIcon( ":/WellLogCurve16x16.png" ) );
@ -634,7 +634,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicPasteWellLogTrackFeature";
menuBuilder << "RicPasteWellLogCurveFeature";
menuBuilder << "Separator";
menuBuilder << "RicNewWellLogCurveExtractionFeature";
menuBuilder << "RicNewWellLogExtractionCurveFeature";
menuBuilder << "RicNewWellLogRftCurveFeature";
menuBuilder << "RicNewWellLogFileCurveFeature";
menuBuilder << "RicNewWellMeasurementCurveFeature";
@ -870,7 +870,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
}
else if ( dynamic_cast<RimSimWellInView*>( firstUiItem ) )
{
menuBuilder << "RicNewWellLogCurveExtractionFeature";
menuBuilder << "RicNewWellLogExtractionCurveFeature";
menuBuilder << "RicNewWellLogRftCurveFeature";
menuBuilder << "RicNewSimWellIntersectionFeature";

4
ApplicationLibCode/UserInterface/RiuViewerCommands.cpp
View File

@ -484,7 +484,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
// TODO: Update so these also use RiuWellPathSelectionItem
caf::SelectionManager::instance()->setSelectedItem( wellPath );
menuBuilder << "RicNewWellLogCurveExtractionFeature";
menuBuilder << "RicNewWellLogExtractionCurveFeature";
menuBuilder << "RicNewWellLogFileCurveFeature";
menuBuilder.addSeparator();
@ -549,7 +549,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
eclipseWellSourceInfo->branchIndex() );
Riu3dSelectionManager::instance()->setSelectedItem( selItem, Riu3dSelectionManager::RUI_TEMPORARY );
menuBuilder << "RicNewWellLogCurveExtractionFeature";
menuBuilder << "RicNewWellLogExtractionCurveFeature";
menuBuilder << "RicNewWellLogRftCurveFeature";
menuBuilder.addSeparator();