OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 04:00:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1996 Renaming. Remove unused includes and rename local variables

Browse Source
This commit is contained in:
Rebecca Cox 2017-10-13 10:16:01 +02:00
parent d748803159
commit 7d908394db
31 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.h
View File

@ -129,7 +129,7 @@ protected:
virtual void setupActionLook(QAction* actionToSetup) override;
std::vector<RimWellPath*> selectedWellPaths();
std::vector<RimSimWellInView*> selectedSimWells();
std::vector<RimSimWellInView*> selectedSimWells();
bool noWellPathsSelectedDirectly();

6
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp
View File

@ -50,13 +50,13 @@ void RicNewSimWellIntersectionFeature::onActionTriggered(bool isChecked)
caf::SelectionManager::instance()->objectsByType(&collection);
CVF_ASSERT(collection.size() == 1);
RimSimWellInView* eclWell = collection[0];
RimSimWellInView* simWell = collection[0];
RimEclipseView* eclView = NULL;
eclWell->firstAncestorOrThisOfType(eclView);
simWell->firstAncestorOrThisOfType(eclView);
CVF_ASSERT(eclView);
RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd(eclView->crossSectionCollection, eclWell);
RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd(eclView->crossSectionCollection, simWell);
caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd);
}

3
ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.h
View File

@ -20,9 +20,6 @@
#include "cafCmdFeature.h"
class RimSimWellInView;
//==================================================================================================
///
//==================================================================================================

4
ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
View File

@ -62,14 +62,14 @@ void RicShowWellAllocationPlotFeature::onActionTriggered(bool isChecked)
if (collection.size() > 0)
{
RimSimWellInView* eclWell = collection[0];
RimSimWellInView* simWell = collection[0];
if (RiaApplication::instance()->project())
{
RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
if (flowPlotColl)
{
flowPlotColl->defaultWellAllocPlot()->setFromSimulationWell(eclWell);
flowPlotColl->defaultWellAllocPlot()->setFromSimulationWell(simWell);
flowPlotColl->defaultWellAllocPlot()->updateConnectedEditors();
// Make sure the summary plot window is created and visible

3
ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.h
View File

@ -20,9 +20,6 @@
#include "cafCmdFeature.h"
class RimSimWellInView;
//==================================================================================================
///
//==================================================================================================

6
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -126,9 +126,9 @@ void RicDeleteItemExec::redo()
}
// SimWell Fractures
RimSimWellInView* eclipseWell;
parentObj->firstAncestorOrThisOfType(eclipseWell);
if (view && eclipseWell)
RimSimWellInView* simWell;
parentObj->firstAncestorOrThisOfType(simWell);
if (view && simWell)
{
view->scheduleCreateDisplayModelAndRedraw();
}

6
ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp
View File

@ -115,10 +115,10 @@ bool RicNewSimWellFractureFeature::isCommandEnabled()
caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(pdmUiItem);
if (!objHandle) return false;
RimSimWellInView* eclipseWell = nullptr;
objHandle->firstAncestorOrThisOfType(eclipseWell);
RimSimWellInView* simWell = nullptr;
objHandle->firstAncestorOrThisOfType(simWell);
if (eclipseWell)
if (simWell)
{
return true;
}

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

@ -78,14 +78,14 @@ bool RicNewRftPlotFeature::isCommandEnabled()
//int branchIndex;
auto eclWell = selectedPdmObject<RimSimWellInView*>();
auto rimWellPath = eclWell == nullptr ? selectedPdmObject<RimWellPath*>() : nullptr;
RimSimWellInView* simWell = selectedPdmObject<RimSimWellInView*>();
RimWellPath* rimWellPath = simWell == nullptr ? selectedPdmObject<RimWellPath*>() : nullptr;
bool enable = true;
if (eclWell != nullptr)
if (simWell != nullptr)
{
auto eclCase = selectedPdmObject<RimEclipseResultCase*>();
if (eclWell != nullptr)
RimEclipseResultCase* eclCase = selectedPdmObject<RimEclipseResultCase*>();
if (simWell != nullptr)
{
enable &= RimWellRftPlot::hasPressureData(eclCase);
}

2
ApplicationCode/Commands/WellLogCommands/RicNewRftPlotFeature.h
View File

@ -46,7 +46,7 @@ protected:
private:
RimWellLogTrack* selectedWellLogPlotTrack() const;
RimWellPath* selectedWellPath() const;
RimSimWellInView* selectedSimulationWell(int * branchIndex) const;
RimSimWellInView* selectedSimulationWell(int * branchIndex) const;
bool caseAvailable() const;
};

6
ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.cpp
View File

@ -27,8 +27,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivSimWellPipeSourceInfo::RivSimWellPipeSourceInfo(RimSimWellInView* eclipseWell, size_t branchIndex)
: m_eclipseWell(eclipseWell),
RivSimWellPipeSourceInfo::RivSimWellPipeSourceInfo(RimSimWellInView* simWell, size_t branchIndex)
: m_simWell(simWell),
m_branchIndex(branchIndex)
{
}
@ -38,7 +38,7 @@ RivSimWellPipeSourceInfo::RivSimWellPipeSourceInfo(RimSimWellInView* eclipseWell
//--------------------------------------------------------------------------------------------------
RimSimWellInView* RivSimWellPipeSourceInfo::well() const
{
return m_eclipseWell.p();
return m_simWell.p();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.h
View File

@ -35,6 +35,6 @@ public:
size_t branchIndex() const;
private:
caf::PdmPointer<RimSimWellInView> m_eclipseWell;
caf::PdmPointer<RimSimWellInView> m_simWell;
size_t m_branchIndex;
};

1
ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
View File

@ -31,7 +31,6 @@
#include "RimFractureContainment.h"
#include "RimFractureTemplate.h"
#include "RimLegendConfig.h"
#include "RimSimWellInView.h"
#include "RimStimPlanColors.h"
#include "RimStimPlanFractureTemplate.h"

2
ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h
View File

@ -60,5 +60,5 @@ private:
private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimSimWellInView> m_rimWell;
caf::PdmPointer<RimSimWellInView> m_rimWell;
};

1
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
View File

@ -22,7 +22,6 @@
#include "RimFishboneWellPath.h"
#include "RimFishbonesCollection.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "RigWellPath.h"

1
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@ -21,7 +21,6 @@
#include "RimPerforationInterval.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimView.h"
#include "RigWellPath.h"

1
ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
View File

@ -31,7 +31,6 @@
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution");

1
ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h
View File

@ -26,7 +26,6 @@
#include "cvfColor3.h"
class RigFlowDiagResults;
class RimSimWellInView;
//==================================================================================================
///

1
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
View File

@ -22,7 +22,6 @@
#include "RimEclipseView.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RimWellAllocationPlot.h"
#include "RigSingleWellResultsData.h"

1
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h
View File

@ -30,7 +30,6 @@
#include <vector>
class RimEclipseResultCase;
class RimSimWellInView;
class RimWellLogPlot;
class RiuTofAccumulatedPhaseFractionsPlot;
class RiuWellAllocationPlot;

1
ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
View File

@ -22,7 +22,6 @@
#include "RimEclipseView.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RigSingleWellResultsData.h"

1
ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h
View File

@ -29,7 +29,6 @@
#include <vector>
class RimSimWellInView;
class RimWellLogPlot;
class RiuNightchartsWidget;
class RiuWellAllocationPlot;

1
ApplicationCode/ProjectDataModel/Flow/RimWellRftAddress.h
View File

@ -32,7 +32,6 @@
class RigSingleWellResultsData;
class RimEclipseResultCase;
class RimFlowDiagSolution;
class RimSimWellInView;
class RimTofAccumulatedPhaseFractionsPlot;
class RimTotalWellAllocationPlot;
class RimWellLogFile;

1
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
View File

@ -38,7 +38,6 @@ class RigWellPath;
class RimEclipseCase;
class RimEclipseResultCase;
class RimFlowDiagSolution;
class RimSimWellInView;
class RimTofAccumulatedPhaseFractionsPlot;
class RimTotalWellAllocationPlot;
class RimWellLogCurve;

8
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -705,11 +705,11 @@ void RimEclipseView::updateCurrentTimeStep()
this->descendantsIncludingThisOfType(fractures);
for (RimFracture* f : fractures)
{
RimSimWellInView* eclWell = nullptr;
f->firstAncestorOrThisOfType(eclWell);
if (eclWell)
RimSimWellInView* simWell = nullptr;
f->firstAncestorOrThisOfType(simWell);
if (simWell)
{
bool isAnyGeometryPresent = eclWell->isWellPipeVisible(m_currentTimeStep) || eclWell->isWellSpheresVisible(m_currentTimeStep);
bool isAnyGeometryPresent = simWell->isWellPipeVisible(m_currentTimeStep) || simWell->isWellSpheresVisible(m_currentTimeStep);
if (!isAnyGeometryPresent)
{
continue;

1
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -53,7 +53,6 @@ class RimEclipseWellCollection;
class RimFaultCollection;
class RimReservoirCellResultsStorage;
class RimReservoirCellResultsStorage;
class RimSimWellInView;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimStimPlanColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES

2
ApplicationCode/ProjectDataModel/RimEclipseWellCollection.h
View File

@ -112,7 +112,7 @@ public:
caf::PdmChildArrayField<RimSimWellInView*> wells;
RimSimWellInView* findWell(QString name);
RimSimWellInView* findWell(QString name);
bool hasVisibleWellCells();
bool hasVisibleWellPipes();
void sortWellsByName();

4
ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@ -252,10 +252,10 @@ QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions(const caf::
RimEclipseWellCollection* coll = simulationWellCollection();
if (coll)
{
caf::PdmChildArrayField<RimSimWellInView*>& eclWells = coll->wells;
caf::PdmChildArrayField<RimSimWellInView*>& simWells = coll->wells;
QIcon simWellIcon(":/Well.png");
for (RimSimWellInView* eclWell : eclWells)
for (RimSimWellInView* eclWell : simWells)
{
options.push_back(caf::PdmOptionItemInfo(eclWell->name(), eclWell, false, simWellIcon));
}

4
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@ -191,7 +191,7 @@ void RimIntersectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(const RimSimWellInView* eclipseWell) const
bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(const RimSimWellInView* simWell) const
{
if (!isActive) return false;
@ -199,7 +199,7 @@ bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(const Rim
{
if (cs->isActive &&
cs->type() == RimIntersection::CS_SIMULATION_WELL &&
cs->simulationWell() == eclipseWell)
cs->simulationWell() == simWell)
{
return true;
}

2
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@ -51,7 +51,7 @@ public:
void appendIntersection(RimIntersection* intersection);
void appendIntersectionBox(RimIntersectionBox* intersectionBox);
bool hasActiveIntersectionForSimulationWell(const RimSimWellInView* eclipseWell) const;
bool hasActiveIntersectionForSimulationWell(const RimSimWellInView* simWell) const;
void updateIntersectionBoxGeometry();

1
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -44,7 +44,6 @@
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimTools.h"
#include "RimWellLogCurve.h"
#include "RimWellLogPlot.h"

4
ApplicationCode/UserInterface/RiuSelectionManager.h
View File

@ -235,6 +235,6 @@ public:
public:
RimSimWellInView* m_simWell;
cvf::Vec3d m_domainCoord;
size_t m_branchIndex;
cvf::Vec3d m_domainCoord;
size_t m_branchIndex;
};