diff --git a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp index 8635adbb51..289a3c6704 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp @@ -44,9 +44,9 @@ CAF_PDM_SOURCE_INIT(RimTotalWellAllocationPlot, "TotalWellAllocationPlot"); //-------------------------------------------------------------------------------------------------- RimTotalWellAllocationPlot::RimTotalWellAllocationPlot() { - CAF_PDM_InitObject("Total Well Allocation Plot", ":/WellAllocPie16x16.png", "", ""); + CAF_PDM_InitObject("Total Allocation", ":/WellAllocPie16x16.png", "", ""); - CAF_PDM_InitField(&m_userName, "PlotDescription", QString("Total Well Allocation Plot"), "Name", "", "", ""); + CAF_PDM_InitField(&m_userName, "PlotDescription", QString("Total Allocation"), "Name", "", "", ""); m_userName.uiCapability()->setUiReadOnly(true); CAF_PDM_InitField(&m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index e7979a3c6d..36203f65ab 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -175,7 +175,11 @@ void RimWellAllocationPlot::updateFromWell() CVF_ASSERT(accumulatedWellFlowPlot()->trackCount() == 0); - accumulatedWellFlowPlot()->setDescription("Accumulated Well Flow (" + m_wellName + ")"); + QString description; + if (m_flowType() == ACCUMULATED) description = "Accumulated Flow"; + if (m_flowType() == INFLOW) description = "Inflow Rates"; + + accumulatedWellFlowPlot()->setDescription(description + " (" + m_wellName + ")"); if (!m_case) return; @@ -296,8 +300,8 @@ void RimWellAllocationPlot::updateFromWell() QString wellStatusText = QString("(%1)").arg(RimWellAllocationPlot::wellStatusTextForTimeStep(m_wellName, m_case, m_timeStep)); - QString flowTypeText = m_flowType().uiText(); - setDescription(flowTypeText + " : " + m_wellName + " " + wellStatusText + ", " + m_case->timeStepStrings()[m_timeStep] + " (" + m_case->caseUserDescription() + ")"); + QString flowTypeText = m_flowDiagSolution() ? "Well Allocation": "Well Flow"; + setDescription(flowTypeText + ": " + m_wellName + " " + wellStatusText + ", " + m_case->timeStepStrings()[m_timeStep] + " (" + m_case->caseUserDescription() + ")"); /// Pie chart diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp index 3eda5a216c..0a16a09094 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp @@ -26,7 +26,7 @@ CAF_PDM_SOURCE_INIT(RimWellAllocationPlotLegend, "WellAllocationPlotLegend"); //-------------------------------------------------------------------------------------------------- RimWellAllocationPlotLegend::RimWellAllocationPlotLegend() { - CAF_PDM_InitObject("Well Allocation Plot Legend", ":/WellAllocLegend16x16.png", "", ""); + CAF_PDM_InitObject("Legend", ":/WellAllocLegend16x16.png", "", ""); CAF_PDM_InitField(&m_showLegend, "ShowPlotLegend", true, "Show Plot Legend", "", "", ""); }