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

#885 Modified Gui texts to show the time lapse state "_DN"

Browse Source
This commit is contained in:
Jacob Støren
2016-10-10 16:37:13 +02:00
parent d0c70f1653
commit 97625a4cea
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -134,7 +134,7 @@ QList<caf::PdmOptionItemInfo> RimGeoMechResultDefinition::calculateValueOptions(
std::map<std::string, std::vector<std::string> > fieldCompNames = getResultMetaDataForUIFieldSetting(); std::map<std::string, std::vector<std::string> > fieldCompNames = getResultMetaDataForUIFieldSetting();
QStringList uiVarNames; QStringList uiVarNames;
QStringList varNames; QStringList varNames;
getUiAndResultVariableStringList(&uiVarNames, &varNames, fieldCompNames); getUiAndResultVariableStringList(&uiVarNames, &varNames, fieldCompNames, m_isTimeLapseResultUiField, m_timeLapseBaseTimestepUiField);
for (int oIdx = 0; oIdx < uiVarNames.size(); ++oIdx) for (int oIdx = 0; oIdx < uiVarNames.size(); ++oIdx)
{ {
@@ -179,12 +179,14 @@ void RimGeoMechResultDefinition::setGeoMechCase(RimGeoMechCase* geomCase)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if(&m_resultPositionTypeUiField == changedField) if( &m_resultPositionTypeUiField == changedField
|| &m_isTimeLapseResultUiField == changedField
|| &m_timeLapseBaseTimestepUiField == changedField)
{ {
std::map<std::string, std::vector<std::string> > fieldCompNames = getResultMetaDataForUIFieldSetting(); std::map<std::string, std::vector<std::string> > fieldCompNames = getResultMetaDataForUIFieldSetting();
QStringList uiVarNames; QStringList uiVarNames;
QStringList varNames; QStringList varNames;
getUiAndResultVariableStringList(&uiVarNames, &varNames, fieldCompNames); getUiAndResultVariableStringList(&uiVarNames, &varNames, fieldCompNames, m_isTimeLapseResultUiField, m_timeLapseBaseTimestepUiField);
if (m_resultPositionTypeUiField() == m_resultPositionType() if (m_resultPositionTypeUiField() == m_resultPositionType()
&& varNames.contains(composeFieldCompString(m_resultFieldName(), m_resultComponentName()))) && varNames.contains(composeFieldCompString(m_resultFieldName(), m_resultComponentName())))
@@ -302,7 +304,9 @@ std::map<std::string, std::vector<std::string> > RimGeoMechResultDefinition::get
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* uiNames, void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* uiNames,
QStringList* variableNames, QStringList* variableNames,
const std::map<std::string, std::vector<std::string> >& fieldCompNames) const std::map<std::string, std::vector<std::string> >& fieldCompNames,
bool isTimeLapseResultList,
int baseFrameIdx)
{ {
CVF_ASSERT(uiNames && variableNames); CVF_ASSERT(uiNames && variableNames);
@@ -313,7 +317,7 @@ void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* u
if (resultFieldName == "E" || resultFieldName == "S" || resultFieldName == "POR") continue; // We will not show the native POR, Stress and Strain if (resultFieldName == "E" || resultFieldName == "S" || resultFieldName == "POR") continue; // We will not show the native POR, Stress and Strain
QString resultFieldUiName = convertToUiResultFieldName(resultFieldName); QString resultFieldUiName = convertToUiResultFieldName(resultFieldName, isTimeLapseResultList, baseFrameIdx);
uiNames->push_back(resultFieldUiName); uiNames->push_back(resultFieldUiName);
variableNames->push_back(resultFieldName); variableNames->push_back(resultFieldName);
@@ -322,7 +326,7 @@ void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* u
for (compIt = fieldIt->second.begin(); compIt != fieldIt->second.end(); ++compIt) for (compIt = fieldIt->second.begin(); compIt != fieldIt->second.end(); ++compIt)
{ {
QString resultCompName = QString::fromStdString(*compIt); QString resultCompName = QString::fromStdString(*compIt);
uiNames->push_back(" " + convertToUIComponentName(resultCompName)); uiNames->push_back(" " + convertToUIComponentName(resultCompName, isTimeLapseResultList, baseFrameIdx));
variableNames->push_back(composeFieldCompString(resultFieldName, resultCompName)); variableNames->push_back(composeFieldCompString(resultFieldName, resultCompName));
} }
} }
@@ -397,7 +401,7 @@ bool RimGeoMechResultDefinition::hasResult()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::resultFieldUiName() QString RimGeoMechResultDefinition::resultFieldUiName()
{ {
return convertToUiResultFieldName(m_resultFieldName()); return convertToUiResultFieldName(m_resultFieldName(), m_isTimeLapseResult, m_timeLapseBaseTimestep);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -405,27 +409,37 @@ QString RimGeoMechResultDefinition::resultFieldUiName()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::resultComponentUiName() QString RimGeoMechResultDefinition::resultComponentUiName()
{ {
return convertToUIComponentName(m_resultComponentName()); return convertToUIComponentName(m_resultComponentName(), m_isTimeLapseResult, m_timeLapseBaseTimestep);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::convertToUiResultFieldName(QString resultFieldName) QString RimGeoMechResultDefinition::convertToUiResultFieldName(QString resultFieldName,
bool isTimeLapseResultList,
int baseFrameIdx)
{ {
if (resultFieldName == "E") return "NativeAbaqus Strain"; QString newName (resultFieldName);
if (resultFieldName == "S") return "NativeAbaqus Stress";
if (resultFieldName == "NE") return "E"; // Make NE and NS appear as E and SE
if (resultFieldName == "POR-Bar") return "POR"; // POR-Bar appear as POR
return resultFieldName; if (resultFieldName == "E") newName = "NativeAbaqus Strain";
if (resultFieldName == "S") newName = "NativeAbaqus Stress";
if (resultFieldName == "NE") newName = "E"; // Make NE and NS appear as E and SE
if (resultFieldName == "POR-Bar") newName = "POR"; // POR-Bar appear as POR
if (isTimeLapseResultList) newName += "_D" + QString::number(baseFrameIdx);
return newName;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::convertToUIComponentName(QString resultComponentName) QString RimGeoMechResultDefinition::convertToUIComponentName(QString resultComponentName,
bool isTimeLapseResultList,
int baseFrameIdx)
{ {
if(isTimeLapseResultList) resultComponentName += "_D" + QString::number(baseFrameIdx);
return resultComponentName; return resultComponentName;
} }

12
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
View File

@@ -83,12 +83,18 @@ private:
std::map<std::string, std::vector<std::string> > getResultMetaDataForUIFieldSetting(); std::map<std::string, std::vector<std::string> > getResultMetaDataForUIFieldSetting();
static void getUiAndResultVariableStringList(QStringList* uiNames, static void getUiAndResultVariableStringList(QStringList* uiNames,
QStringList* variableNames, QStringList* variableNames,
const std::map<std::string, std::vector<std::string> >& fieldCompNames); const std::map<std::string, std::vector<std::string> >& fieldCompNames,
bool isTimeLapseResultList,
int baseFrameIdx);
static QString composeFieldCompString(const QString& resultFieldName, static QString composeFieldCompString(const QString& resultFieldName,
const QString& resultComponentName); const QString& resultComponentName);
static QString convertToUiResultFieldName(QString resultFieldName); static QString convertToUiResultFieldName(QString resultFieldName,
static QString convertToUIComponentName(QString resultComponentName); bool isTimeLapseResultList,
int baseFrameIdx);
static QString convertToUIComponentName(QString resultComponentName,
bool isTimeLapseResultList,
int baseFrameIdx);
// Data Fields // Data Fields