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

#1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends.

Browse Source 
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
This commit is contained in:
Jacob Støren
2017-04-04 16:08:42 +02:00
parent fb88c7e216
commit 6c7dfdca7b
19 changed files with 131 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp
View File

@@ -89,7 +89,7 @@ QString RiuFemResultTextBuilder::mainResultText()
if (!text.isEmpty()) text += "\n";
QString topoText = this->topologyText("\n");
QString topoText = this->geometrySelectionText("\n");
text += topoText;
appendDetails(text, formationDetails());
text += "\n";
@@ -102,7 +102,7 @@ QString RiuFemResultTextBuilder::mainResultText()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuFemResultTextBuilder::topologyText(QString itemSeparator)
QString RiuFemResultTextBuilder::geometrySelectionText(QString itemSeparator)
{
QString text;

2
ApplicationCode/UserInterface/RiuFemResultTextBuilder.h
View File

@@ -49,7 +49,7 @@ public:
QString mainResultText();
QString topologyText(QString itemSeparator);
QString geometrySelectionText(QString itemSeparator);
private:
void appendDetails(QString& text, const QString& details);

2
ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.cpp
View File

@@ -74,7 +74,7 @@ RiuFemTimeHistoryResultAccessor::RiuFemTimeHistoryResultAccessor(RigGeoMechCaseD
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuFemTimeHistoryResultAccessor::topologyText() const
QString RiuFemTimeHistoryResultAccessor::geometrySelectionText() const
{
QString text;

2
ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h
View File

@@ -46,7 +46,7 @@ public:
const cvf::Vec3d& intersectionPoint,
const std::array<cvf::Vec3f, 3>& m_intersectionTriangle);
QString topologyText() const;
QString geometrySelectionText() const;
std::vector<double> timeHistoryValues() const;
int closestNodeId() const { return m_closestNodeId; }

4
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@@ -113,7 +113,7 @@ QString RiuResultTextBuilder::mainResultText()
text += "\n";
}
QString topoText = this->topologyText("\n");
QString topoText = this->geometrySelectionText("\n");
text += topoText;
appendDetails(text, formationDetails());
text += "\n";
@@ -134,7 +134,7 @@ QString RiuResultTextBuilder::mainResultText()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuResultTextBuilder::topologyText(QString itemSeparator)
QString RiuResultTextBuilder::geometrySelectionText(QString itemSeparator)
{
QString text;

2
ApplicationCode/UserInterface/RiuResultTextBuilder.h
View File

@@ -47,7 +47,7 @@ public:
QString mainResultText();
QString topologyText(QString itemSeparator);
QString geometrySelectionText(QString itemSeparator);
private:
void appendDetails(QString& text, const QString& details);

8
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@@ -123,7 +123,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec
curveName += ", ";
curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex);
curveName += ", ";
curveName += RigTimeHistoryResultAccessor::topologyText(eclipseView->eclipseCase()->eclipseCaseData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex);
curveName += RigTimeHistoryResultAccessor::geometrySelectionText(eclipseView->eclipseCase()->eclipseCaseData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex);
std::vector<double> timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->eclipseCase()->eclipseCaseData(), eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex, timeStepDates.size());
@@ -191,7 +191,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuGeoMechSelec
}
curveName.append("\n");
curveName.append(timeHistResultAccessor->topologyText());
curveName.append(timeHistResultAccessor->geometrySelectionText());
std::vector<double> timeHistoryValues = timeHistResultAccessor->timeHistoryValues();
@@ -274,7 +274,7 @@ void RiuSelectionChangedHandler::updateResultInfo(const RiuSelectionItem* itemAd
resultInfo = textBuilder.mainResultText();
pickInfo = textBuilder.topologyText(", ");
pickInfo = textBuilder.geometrySelectionText(", ");
}
else if (itemAdded->type() == RiuSelectionItem::GEOMECH_SELECTION_OBJECT)
{
@@ -288,7 +288,7 @@ void RiuSelectionChangedHandler::updateResultInfo(const RiuSelectionItem* itemAd
resultInfo = textBuilder.mainResultText();
pickInfo = textBuilder.topologyText(", ");
pickInfo = textBuilder.geometrySelectionText(", ");
}
}