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

#1853 Curve Creator. Plot tree view displays curves only

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-09-19 09:29:24 +02:00
parent 17e01cd11c
commit da9421485e
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@@ -32,6 +32,7 @@
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
#include "RimSummaryCurveCollection.h"
#include "RiuMainPlotWindow.h" #include "RiuMainPlotWindow.h"
@@ -247,7 +248,7 @@ void RicSummaryCurveCreator::updateFromSummaryPlot(RimSummaryPlot* targetPlot)
loadDataAndUpdatePlot(); loadDataAndUpdatePlot();
} }
updateConnectedEditors(); caf::PdmUiItem::updateConnectedEditors();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -912,8 +913,8 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(const std::
} }
m_previewPlot->loadDataAndUpdate(); m_previewPlot->loadDataAndUpdate();
m_previewPlot->updateConnectedEditors();
m_previewPlot->zoomAll(); m_previewPlot->zoomAll();
updateEditorsConnectedToPreviewPlot();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -1046,7 +1047,7 @@ void RicSummaryCurveCreator::populateCurveCreator(const RimSummaryPlot& sourceSu
if (sourceCurveDefs.count(curveDef) == 0) if (sourceCurveDefs.count(curveDef) == 0)
curve->setCurveVisiblity(false); curve->setCurveVisiblity(false);
} }
m_previewPlot->updateConnectedEditors(); updateEditorsConnectedToPreviewPlot();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -1156,3 +1157,9 @@ void RicSummaryCurveCreator::resetAllFields()
} }
} }
} }
void RicSummaryCurveCreator::updateEditorsConnectedToPreviewPlot()
{
m_previewPlot->updateConnectedEditors();
m_previewPlot->summaryCurveCollection()->updateConnectedEditors();
}

1
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.h
View File

@@ -114,6 +114,7 @@ private:
static void copyCurveAndAddToPlot(const RimSummaryCurve *curve, RimSummaryPlot *plot, bool forceVisible = false); static void copyCurveAndAddToPlot(const RimSummaryCurve *curve, RimSummaryPlot *plot, bool forceVisible = false);
void resetAllFields(); void resetAllFields();
void updateEditorsConnectedToPreviewPlot();
private: private:
caf::PdmPtrArrayField<RimSummaryCase*> m_selectedCases; caf::PdmPtrArrayField<RimSummaryCase*> m_selectedCases;

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp
View File

@@ -32,7 +32,8 @@
#include <QSplitter> #include <QSplitter>
#include <QFrame> #include <QFrame>
#include <QTreeView> #include <QTreeView>
#include "RimSummaryPlot.h"
#include "RimSummaryCurveCollection.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -187,7 +188,8 @@ QWidget* RicSummaryCurveCreatorSplitterUi::getOrCreateCurveTreeWidget()
RicSummaryCurveCreator* sumCurveCreator = dynamic_cast<RicSummaryCurveCreator*>(this->pdmItem()); RicSummaryCurveCreator* sumCurveCreator = dynamic_cast<RicSummaryCurveCreator*>(this->pdmItem());
if (sumCurveCreator) if (sumCurveCreator)
{ {
curveTreeView->setPdmItem(sumCurveCreator->previewPlot()); RimSummaryCurveCollection* sumColl = sumCurveCreator->previewPlot()->summaryCurveCollection();
curveTreeView->setPdmItem(sumColl);
} }
curveTreeView->treeView()->setHeaderHidden(true); curveTreeView->treeView()->setHeaderHidden(true);

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -464,6 +464,14 @@ void RimSummaryPlot::deleteAllSummaryCurves()
m_summaryCurveCollection->deleteAllCurves(); m_summaryCurveCollection->deleteAllCurves();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurveCollection* RimSummaryPlot::summaryCurveCollection() const
{
return m_summaryCurveCollection();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -101,7 +101,7 @@ public:
std::vector<RimSummaryCurve*> summaryCurves() const; std::vector<RimSummaryCurve*> summaryCurves() const;
void deleteAllSummaryCurves(); void deleteAllSummaryCurves();
RimSummaryCurveCollection* summaryCurveCollection() const;
// RimViewWindow overrides // RimViewWindow overrides
public: public:
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override; virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;