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

(#486) Renamed "trace" to "track"

Browse Source
This commit is contained in:
Pål Hagen
2015-09-18 12:29:23 +02:00
parent ecf0d19110
commit 479b2083ef
26 changed files with 203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveExtractionFeature.h
${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveLasFeature.h
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeature.h
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.h
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTraceFeature.h
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.h
${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.h
${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h
)
@@ -21,7 +21,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveExtractionFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveLasFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTraceFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.cpp
${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.cpp
${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.cpp
)

16
ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
View File

@@ -25,7 +25,7 @@
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotTrace.h"
#include "RimWellLogPlotTrack.h"
#include "RimWellLogFileCurve.h"
#include "RimProject.h"
#include "RimMainPlotCollection.h"
@@ -37,7 +37,7 @@
#include "RiaApplication.h"
#include "RiuMainWindow.h"
#include "RiuWellLogTracePlot.h"
#include "RiuWellLogTrackPlot.h"
#include "cafSelectionManager.h"
#include "cafPdmUiTreeView.h"
@@ -68,8 +68,8 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
RimWellLogPlot* plot = RicNewWellLogPlotFeatureImpl::createWellLogPlot();
RimWellLogPlotTrace* plotTrace = new RimWellLogPlotTrace();
plot->addTrace(plotTrace);
RimWellLogPlotTrack* plotTrack = new RimWellLogPlotTrack();
plot->addTrack(plotTrack);
plot->loadDataAndUpdate();
@@ -86,10 +86,10 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
wellLog->firstAnchestorOrThisOfType(wellLogFile);
if (wellLogFile)
{
size_t curveIdx = plotTrace->curveCount();
size_t curveIdx = plotTrack->curveCount();
RimWellLogFileCurve* curve = new RimWellLogFileCurve;
plotTrace->addCurve(curve);
plotTrack->addCurve(curve);
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIdx);
curve->setColor(curveColor);
@@ -108,8 +108,8 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
plot->updateAvailableDepthRange();
plot->setVisibleDepthRangeFromContents();
plotTrace->updateXAxisRangeFromCurves();
plotTrace->viewer()->replot();
plotTrack->updateXAxisRangeFromCurves();
plotTrack->viewer()->replot();
RiaApplication::instance()->project()->updateConnectedEditors();

26
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
View File

@@ -21,7 +21,7 @@
#include "RicWellLogPlotCurveFeatureImpl.h"
#include "RimWellLogPlotTrace.h"
#include "RimWellLogPlotTrack.h"
#include "RimWellLogExtractionCurve.h"
#include "RiuMainWindow.h"
@@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT(RicNewWellLogCurveExtractionFeature, "RicNewWellLogCurveExtr
//--------------------------------------------------------------------------------------------------
bool RicNewWellLogCurveExtractionFeature::isCommandEnabled()
{
return selectedWellLogPlotTrace() != NULL;
return selectedWellLogPlotTrack() != NULL;
}
//--------------------------------------------------------------------------------------------------
@@ -48,10 +48,10 @@ bool RicNewWellLogCurveExtractionFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewWellLogCurveExtractionFeature::onActionTriggered(bool isChecked)
{
RimWellLogPlotTrace* wellLogPlotTrace = selectedWellLogPlotTrace();
if (wellLogPlotTrace)
RimWellLogPlotTrack* wellLogPlotTrack = selectedWellLogPlotTrack();
if (wellLogPlotTrack)
{
addCurve(wellLogPlotTrace);
addCurve(wellLogPlotTrack);
}
}
@@ -66,9 +66,9 @@ void RicNewWellLogCurveExtractionFeature::setupActionLook(QAction* actionToSetup
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogPlotTrace* RicNewWellLogCurveExtractionFeature::selectedWellLogPlotTrace()
RimWellLogPlotTrack* RicNewWellLogCurveExtractionFeature::selectedWellLogPlotTrack()
{
std::vector<RimWellLogPlotTrace*> selection;
std::vector<RimWellLogPlotTrack*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
return selection.size() > 0 ? selection[0] : NULL;
}
@@ -76,20 +76,20 @@ RimWellLogPlotTrace* RicNewWellLogCurveExtractionFeature::selectedWellLogPlotTra
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellLogCurveExtractionFeature::addCurve(RimWellLogPlotTrace* plotTrace)
void RicNewWellLogCurveExtractionFeature::addCurve(RimWellLogPlotTrack* plotTrack)
{
CVF_ASSERT(plotTrace);
CVF_ASSERT(plotTrack);
size_t curveIndex = plotTrace->curveCount();
size_t curveIndex = plotTrack->curveCount();
RimWellLogPlotCurve* curve = new RimWellLogExtractionCurve();
plotTrace->addCurve(curve);
plotTrack->addCurve(curve);
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIndex);
curve->setColor(curveColor);
curve->setDescription(QString("Curve %1").arg(plotTrace->curveCount()));
curve->setDescription(QString("Curve %1").arg(plotTrack->curveCount()));
plotTrace->updateConnectedEditors();
plotTrack->updateConnectedEditors();
RiuMainWindow::instance()->setCurrentObjectInTreeView(curve);
}

6
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.h
View File

@@ -21,7 +21,7 @@
#include "cafCmdFeature.h"
class RimWellLogPlotTrace;
class RimWellLogPlotTrack;
//==================================================================================================
///
@@ -31,7 +31,7 @@ class RicNewWellLogCurveExtractionFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
public:
static void addCurve(RimWellLogPlotTrace* plotTrace);
static void addCurve(RimWellLogPlotTrack* plotTrack);
protected:
@@ -41,5 +41,5 @@ protected:
virtual void setupActionLook( QAction* actionToSetup );
private:
RimWellLogPlotTrace* selectedWellLogPlotTrace();
RimWellLogPlotTrack* selectedWellLogPlotTrack();
};

26
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveLasFeature.cpp
View File

@@ -22,7 +22,7 @@
#include "RicWellLogPlotCurveFeatureImpl.h"
#include "RimWellLogFileCurve.h"
#include "RimWellLogPlotTrace.h"
#include "RimWellLogPlotTrack.h"
#include "RiuMainWindow.h"
@@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT(RicNewWellLogCurveLasFeature, "RicNewWellLogCurveLasFeature"
//--------------------------------------------------------------------------------------------------
bool RicNewWellLogCurveLasFeature::isCommandEnabled()
{
return selectedWellLogPlotTrace() != NULL;
return selectedWellLogPlotTrack() != NULL;
}
//--------------------------------------------------------------------------------------------------
@@ -48,10 +48,10 @@ bool RicNewWellLogCurveLasFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewWellLogCurveLasFeature::onActionTriggered(bool isChecked)
{
RimWellLogPlotTrace* wellLogPlotTrace = selectedWellLogPlotTrace();
if (wellLogPlotTrace)
RimWellLogPlotTrack* wellLogPlotTrack = selectedWellLogPlotTrack();
if (wellLogPlotTrack)
{
addCurve(wellLogPlotTrace);
addCurve(wellLogPlotTrack);
}
}
@@ -66,9 +66,9 @@ void RicNewWellLogCurveLasFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogPlotTrace* RicNewWellLogCurveLasFeature::selectedWellLogPlotTrace()
RimWellLogPlotTrack* RicNewWellLogCurveLasFeature::selectedWellLogPlotTrack()
{
std::vector<RimWellLogPlotTrace*> selection;
std::vector<RimWellLogPlotTrack*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
return selection.size() > 0 ? selection[0] : NULL;
}
@@ -76,20 +76,20 @@ RimWellLogPlotTrace* RicNewWellLogCurveLasFeature::selectedWellLogPlotTrace()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellLogCurveLasFeature::addCurve(RimWellLogPlotTrace* plotTrace)
void RicNewWellLogCurveLasFeature::addCurve(RimWellLogPlotTrack* plotTrack)
{
CVF_ASSERT(plotTrace);
CVF_ASSERT(plotTrack);
size_t curveIndex = plotTrace->curveCount();
size_t curveIndex = plotTrack->curveCount();
RimWellLogPlotCurve* curve = new RimWellLogFileCurve();
plotTrace->addCurve(curve);
plotTrack->addCurve(curve);
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIndex);
curve->setColor(curveColor);
curve->setDescription(QString("Curve %1").arg(plotTrace->curveCount()));
curve->setDescription(QString("Curve %1").arg(plotTrack->curveCount()));
plotTrace->updateConnectedEditors();
plotTrack->updateConnectedEditors();
RiuMainWindow::instance()->setCurrentObjectInTreeView(curve);
}

6
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveLasFeature.h
View File

@@ -21,7 +21,7 @@
#include "cafCmdFeature.h"
class RimWellLogPlotTrace;
class RimWellLogPlotTrack;
//==================================================================================================
///
@@ -31,7 +31,7 @@ class RicNewWellLogCurveLasFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
public:
static void addCurve(RimWellLogPlotTrace* plotTrace);
static void addCurve(RimWellLogPlotTrack* plotTrack);
protected:
@@ -41,5 +41,5 @@ protected:
virtual void setupActionLook( QAction* actionToSetup );
private:
RimWellLogPlotTrace* selectedWellLogPlotTrace();
RimWellLogPlotTrack* selectedWellLogPlotTrack();
};

10
ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp
View File

@@ -23,7 +23,7 @@
#include "RimProject.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotTrace.h"
#include "RimWellLogPlotTrack.h"
#include "RicNewWellLogCurveExtractionFeature.h"
#include "RiaApplication.h"
@@ -49,15 +49,15 @@ void RicNewWellLogPlotFeature::onActionTriggered(bool isChecked)
{
RimWellLogPlot* plot = RicNewWellLogPlotFeatureImpl::createWellLogPlot();
RimWellLogPlotTrace* plotTrace = new RimWellLogPlotTrace();
plot->addTrace(plotTrace);
plotTrace->setDescription(QString("Track %1").arg(plot->traceCount()));
RimWellLogPlotTrack* plotTrack = new RimWellLogPlotTrack();
plot->addTrack(plotTrack);
plotTrack->setDescription(QString("Track %1").arg(plot->trackCount()));
plot->loadDataAndUpdate();
plot->updateConnectedEditors();
RiaApplication::instance()->project()->updateConnectedEditors();
RicNewWellLogCurveExtractionFeature::addCurve(plotTrace);
RicNewWellLogCurveExtractionFeature::addCurve(plotTrack);
}
//--------------------------------------------------------------------------------------------------

24
ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTraceFeature.cpp → ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp
View File

@@ -17,10 +17,10 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicNewWellLogPlotTraceFeature.h"
#include "RicNewWellLogPlotTrackFeature.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotTrace.h"
#include "RimWellLogPlotTrack.h"
#include "RiuMainWindow.h"
@@ -31,12 +31,12 @@
#include <QAction>
CAF_CMD_SOURCE_INIT(RicNewWellLogPlotTraceFeature, "RicNewWellLogPlotTraceFeature");
CAF_CMD_SOURCE_INIT(RicNewWellLogPlotTrackFeature, "RicNewWellLogPlotTrackFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNewWellLogPlotTraceFeature::isCommandEnabled()
bool RicNewWellLogPlotTrackFeature::isCommandEnabled()
{
return selectedWellLogPlot() != NULL;
}
@@ -44,32 +44,32 @@ bool RicNewWellLogPlotTraceFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellLogPlotTraceFeature::onActionTriggered(bool isChecked)
void RicNewWellLogPlotTrackFeature::onActionTriggered(bool isChecked)
{
RimWellLogPlot* wellLogPlot = selectedWellLogPlot();
if (wellLogPlot)
{
RimWellLogPlotTrace* plotTrace = new RimWellLogPlotTrace;
wellLogPlot->addTrace(plotTrace);
plotTrace->setDescription(QString("Track %1").arg(wellLogPlot->traceCount()));
RimWellLogPlotTrack* plotTrack = new RimWellLogPlotTrack;
wellLogPlot->addTrack(plotTrack);
plotTrack->setDescription(QString("Track %1").arg(wellLogPlot->trackCount()));
wellLogPlot->updateConnectedEditors();
RicNewWellLogCurveExtractionFeature::addCurve(plotTrace);
RicNewWellLogCurveExtractionFeature::addCurve(plotTrack);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellLogPlotTraceFeature::setupActionLook(QAction* actionToSetup)
void RicNewWellLogPlotTrackFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("New Trace");
actionToSetup->setText("New Track");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogPlot* RicNewWellLogPlotTraceFeature::selectedWellLogPlot()
RimWellLogPlot* RicNewWellLogPlotTrackFeature::selectedWellLogPlot()
{
std::vector<RimWellLogPlot*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);

2
ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTraceFeature.h → ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.h
View File

@@ -26,7 +26,7 @@ class RimWellLogPlot;
//==================================================================================================
///
//==================================================================================================
class RicNewWellLogPlotTraceFeature : public caf::CmdFeature
class RicNewWellLogPlotTrackFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;