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

pre-proto - Renaming RigStimPlanData to RigStimPlanResultFrames

Browse Source
This commit is contained in:
astridkbjorke 2017-05-11 14:01:58 +02:00
parent c6b329ea00
commit e31023041e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
View File

@ -749,8 +749,8 @@ std::vector<std::pair<QString, QString> > RimStimPlanFractureTemplate::getStimPl
std::vector<std::pair<QString, QString> > propertyNamesUnits; std::vector<std::pair<QString, QString> > propertyNamesUnits;
if (m_stimPlanFractureDefinitionData.notNull()) if (m_stimPlanFractureDefinitionData.notNull())
{ {
std::vector<RigStimPlanData > allStimPlanData = m_stimPlanFractureDefinitionData->stimPlanData; std::vector<RigStimPlanResultFrames > allStimPlanData = m_stimPlanFractureDefinitionData->stimPlanData;
for (RigStimPlanData stimPlanDataEntry : allStimPlanData) for (RigStimPlanResultFrames stimPlanDataEntry : allStimPlanData)
{ {
propertyNamesUnits.push_back(std::make_pair(stimPlanDataEntry.resultName, stimPlanDataEntry.unit)); propertyNamesUnits.push_back(std::make_pair(stimPlanDataEntry.resultName, stimPlanDataEntry.unit));
} }

4
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@ -25,7 +25,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigStimPlanData::RigStimPlanData() RigStimPlanResultFrames::RigStimPlanResultFrames()
{ {
} }
@ -127,7 +127,7 @@ void RigStimPlanFractureDefinition::setDataAtTimeValue(QString resultName, QStri
} }
else else
{ {
RigStimPlanData resultData; RigStimPlanResultFrames resultData;
resultData.resultName = resultName; resultData.resultName = resultName;
resultData.unit = unit; resultData.unit = unit;

6
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h
View File

@ -24,10 +24,10 @@
#include <vector> #include <vector>
class RigStimPlanData class RigStimPlanResultFrames
{ {
public: public:
RigStimPlanData(); RigStimPlanResultFrames();
QString resultName; QString resultName;
QString unit; QString unit;
@ -51,7 +51,7 @@ public:
std::vector<double> depths; std::vector<double> depths;
std::vector<RigStimPlanData> stimPlanData; std::vector<RigStimPlanResultFrames> stimPlanData;
bool timeStepExisist(double timeStepValue); bool timeStepExisist(double timeStepValue);
void reorderYgridToDepths(); void reorderYgridToDepths();