mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#846 Make sure plots widgets are updated when the plot main window is created
This commit is contained in:
parent
b62bf68c07
commit
98643a7b84
@ -506,41 +506,8 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
|
|||||||
m_project->viewLinkerCollection()->viewLinker()->updateOverrides();
|
m_project->viewLinkerCollection()->viewLinker()->updateOverrides();
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
loadAndUpdatePlotData();
|
||||||
RimWellLogPlotCollection* wlpColl = nullptr;
|
|
||||||
RimSummaryPlotCollection* spColl = nullptr;
|
|
||||||
|
|
||||||
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection())
|
|
||||||
{
|
|
||||||
wlpColl = m_project->mainPlotCollection()->wellLogPlotCollection();
|
|
||||||
}
|
|
||||||
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->summaryPlotCollection())
|
|
||||||
{
|
|
||||||
spColl = m_project->mainPlotCollection()->summaryPlotCollection();
|
|
||||||
}
|
|
||||||
size_t plotCount = 0;
|
|
||||||
plotCount += wlpColl ? wlpColl->wellLogPlots().size(): 0;
|
|
||||||
plotCount += spColl ? spColl->m_summaryPlots().size(): 0;
|
|
||||||
|
|
||||||
caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data");
|
|
||||||
if (wlpColl)
|
|
||||||
{
|
|
||||||
for (size_t wlpIdx = 0; wlpIdx < wlpColl->wellLogPlots().size(); ++wlpIdx)
|
|
||||||
{
|
|
||||||
wlpColl->wellLogPlots[wlpIdx]->loadDataAndUpdate();
|
|
||||||
plotProgress.incrementProgress();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (spColl)
|
|
||||||
{
|
|
||||||
for (size_t wlpIdx = 0; wlpIdx < spColl->m_summaryPlots().size(); ++wlpIdx)
|
|
||||||
{
|
|
||||||
spColl->m_summaryPlots[wlpIdx]->loadDataAndUpdate();
|
|
||||||
plotProgress.incrementProgress();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// NB! This function must be called before executing command objects,
|
// NB! This function must be called before executing command objects,
|
||||||
// because the tree view state is restored from project file and sets
|
// because the tree view state is restored from project file and sets
|
||||||
// current active view ( see restoreTreeViewState() )
|
// current active view ( see restoreTreeViewState() )
|
||||||
@ -563,7 +530,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -572,6 +538,45 @@ bool RiaApplication::loadProject(const QString& projectFileName)
|
|||||||
return loadProject(projectFileName, PLA_NONE, NULL);
|
return loadProject(projectFileName, PLA_NONE, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RiaApplication::loadAndUpdatePlotData()
|
||||||
|
{
|
||||||
|
RimWellLogPlotCollection* wlpColl = nullptr;
|
||||||
|
RimSummaryPlotCollection* spColl = nullptr;
|
||||||
|
|
||||||
|
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection())
|
||||||
|
{
|
||||||
|
wlpColl = m_project->mainPlotCollection()->wellLogPlotCollection();
|
||||||
|
}
|
||||||
|
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->summaryPlotCollection())
|
||||||
|
{
|
||||||
|
spColl = m_project->mainPlotCollection()->summaryPlotCollection();
|
||||||
|
}
|
||||||
|
size_t plotCount = 0;
|
||||||
|
plotCount += wlpColl ? wlpColl->wellLogPlots().size() : 0;
|
||||||
|
plotCount += spColl ? spColl->m_summaryPlots().size() : 0;
|
||||||
|
|
||||||
|
caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data");
|
||||||
|
if (wlpColl)
|
||||||
|
{
|
||||||
|
for (size_t wlpIdx = 0; wlpIdx < wlpColl->wellLogPlots().size(); ++wlpIdx)
|
||||||
|
{
|
||||||
|
wlpColl->wellLogPlots[wlpIdx]->loadDataAndUpdate();
|
||||||
|
plotProgress.incrementProgress();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spColl)
|
||||||
|
{
|
||||||
|
for (size_t wlpIdx = 0; wlpIdx < spColl->m_summaryPlots().size(); ++wlpIdx)
|
||||||
|
{
|
||||||
|
spColl->m_summaryPlots[wlpIdx]->loadDataAndUpdate();
|
||||||
|
plotProgress.incrementProgress();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
/// Add a list of well path file paths (JSON files) to the well path collection
|
/// Add a list of well path file paths (JSON files) to the well path collection
|
||||||
@ -1385,6 +1390,7 @@ RiuMainPlotWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
|
|||||||
if (!m_mainPlotWindow)
|
if (!m_mainPlotWindow)
|
||||||
{
|
{
|
||||||
createMainPlotWindow();
|
createMainPlotWindow();
|
||||||
|
loadAndUpdatePlotData();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_mainPlotWindow->show();
|
m_mainPlotWindow->show();
|
||||||
|
@ -200,6 +200,7 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool loadProject(const QString& projectFileName, ProjectLoadAction loadAction, RiaProjectModifier* projectModifier);
|
bool loadProject(const QString& projectFileName, ProjectLoadAction loadAction, RiaProjectModifier* projectModifier);
|
||||||
|
|
||||||
void onProjectOpenedOrClosed();
|
void onProjectOpenedOrClosed();
|
||||||
std::vector<QString> readFileListFromTextFile(QString listFileName);
|
std::vector<QString> readFileListFromTextFile(QString listFileName);
|
||||||
void setWindowCaptionFromAppState();
|
void setWindowCaptionFromAppState();
|
||||||
@ -209,6 +210,8 @@ private:
|
|||||||
|
|
||||||
void createMainPlotWindow();
|
void createMainPlotWindow();
|
||||||
void deleteMainPlotWindow();
|
void deleteMainPlotWindow();
|
||||||
|
|
||||||
|
void loadAndUpdatePlotData();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
||||||
|
@ -304,6 +304,8 @@ void RimSummaryPlot::loadDataAndUpdate()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimSummaryPlot::updateZoom()
|
void RimSummaryPlot::updateZoom()
|
||||||
{
|
{
|
||||||
|
if (!m_qwtPlot) return;
|
||||||
|
|
||||||
// Todo: introduce autoscale
|
// Todo: introduce autoscale
|
||||||
|
|
||||||
if(m_visibleWindow().size() == 4)
|
if(m_visibleWindow().size() == 4)
|
||||||
|
Loading…
Reference in New Issue
Block a user