Skip to content
Snippets Groups Projects
Commit 3b7d6329 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

use conditional subscription

parent 3ef7f270
No related branches found
No related tags found
1 merge request!2761Fix serialization and plotting jobs without loaded data
...@@ -27,7 +27,7 @@ public: ...@@ -27,7 +27,7 @@ public:
const DataSource* dataSource() const { return m_data_source.get(); } const DataSource* dataSource() const { return m_data_source.get(); }
private: protected:
std::unique_ptr<DataSource> m_data_source; std::unique_ptr<DataSource> m_data_source;
}; };
......
...@@ -105,8 +105,15 @@ Plot2DFrame::Plot2DFrame(std::unique_ptr<DataSource>&& data_source) ...@@ -105,8 +105,15 @@ Plot2DFrame::Plot2DFrame(std::unique_ptr<DataSource>&& data_source)
connect(m_canvas1D, &ProjectedGraphsCanvas::changeActivityRequest, toolbar, connect(m_canvas1D, &ProjectedGraphsCanvas::changeActivityRequest, toolbar,
&Data2DToolbar::onProjectionTabChange); &Data2DToolbar::onProjectionTabChange);
connect(gDoc->datafiles(), &DatafilesSet::setChanged, this, &Plot2DFrame::updateFrame); // subscription type depends on the context
connect(gDoc->jobs(), &JobsSet::jobMeritsAttention, this, &Plot2DFrame::updateFrame); if (dynamic_cast<DataFromData*>(m_data_source.get()))
connect(gDoc->datafiles(), &DatafilesSet::setChanged, this, &Plot2DFrame::updateFrame);
else if (dynamic_cast<DataFromSim*>(m_data_source.get())
|| dynamic_cast<DataFromJob*>(m_data_source.get()))
connect(gDoc->jobs(), &JobsSet::jobMeritsAttention, this, &Plot2DFrame::updateFrame);
else
ASSERT_NEVER;
updateFrame(); updateFrame();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment