Added graph window that can show dynamic data. This is now used to plot data on a curve probe.

Author: SteveMaas1978

FEBioStudio/GraphWindow.cpp

@@ -2948,3 +2948,33 @@ void CModelGraphWindow::TrackElementHistory(int nelem, float* pval, int nfield,
 		pval[n] = val;
 	}
 }
+
+//=====================================================================================
+CDynamicDataGraphWindow::CDynamicDataGraphWindow(CMainWindow* wnd, CPostDocument* doc) : CGraphWindow(wnd, doc)
+{
+	m_src = nullptr;
+	AddPlotData(new CPlotData());
+}
+
+void CDynamicDataGraphWindow::Update(bool breset, bool bfit)
+{
+	if (m_src)
+	{
+		CPlotData* plot = dynamic_cast<CPlotData*>(GetPlotData(0));
+		if (plot)
+		{
+			m_src->UpdatePlot(*plot);
+		}
+	}
+	RedrawPlot();
+}
+
+void CDynamicDataGraphWindow::showEvent(QShowEvent* ev)
+{
+	Update(true, true);
+}
+
+void CDynamicDataGraphWindow::closeEvent(QCloseEvent* ev)
+{
+	CGraphWindow::closeEvent(ev);
+}

FEBioStudio/GraphWindow.h

@@ -457,3 +457,32 @@ class CModelGraphWindow : public CGraphWindow
 	int	m_pltCounter;
 };
 
+//=================================================================================================
+// This graph window is used by plot objects for displaying their data.
+// It is not associated with a specific data field, but instead the data is passed to it directly
+
+class CPlotDataSource
+{
+public:
+	CPlotDataSource() {}
+	virtual ~CPlotDataSource() {}
+
+	virtual void UpdatePlot(CPlotData& data) = 0;
+};
+
+class CDynamicDataGraphWindow : public CGraphWindow
+{
+public:
+	CDynamicDataGraphWindow(CMainWindow* wnd, CPostDocument* doc);
+
+	void SetDataSource(CPlotDataSource* src) { m_src.reset(src); }
+
+	void Update(bool breset = true, bool bfit = false);
+
+	void showEvent(QShowEvent* ev);
+
+	void closeEvent(QCloseEvent* ev);
+
+private:
+	std::unique_ptr<CPlotDataSource> m_src;
+};

FEBioStudio/PostModelPanel.cpp

@@ -2011,37 +2011,46 @@ void CPostModelPanel::OnSwapMusclePathEndPoints()
 	GetMainWindow()->RedrawGL();
 }
 
-void CPostModelPanel::OnCurveProbePlotData()
+class CCurveProbeData : public CPlotDataSource
 {
-	CPostDocument* doc = dynamic_cast<CPostDocument*>(GetDocument());
-	if (doc == nullptr) return;
+public:
+	CCurveProbeData(Post::GLCurveProbe* po) : m_probe(po) {}
 
-	Post::GLCurveProbe* po = dynamic_cast<Post::GLCurveProbe*>(ui->currentObject());
-	if (po)
+	void UpdatePlot(CPlotData& data) override
 	{
-		int N = (int)po->Points();
-		vector<double> xpoints = po->SectionLenghts(false);
+		int N = (int)m_probe->Points();
+		vector<double> xpoints = m_probe->SectionLenghts(false);
 		vector<double> ypoints(N, 0.0);
-#pragma omp parallel for
 		for (int i = 0; i < N; ++i)
 		{
-			ypoints[i] = po->GetPointValue(i);
+			ypoints[i] = m_probe->GetPointValue(i);
 		}
 
-		CPlotData* data = new CPlotData;
-		for (int i = 0; i < po->Points(); ++i)
+		data.clear();
+		for (int i = 0; i < m_probe->Points(); ++i)
 		{
-			data->addPoint(xpoints[i], ypoints[i]);
+			data.addPoint(xpoints[i], ypoints[i]);
 		}
-		data->setLabel(QString::fromStdString(po->GetName()));
-		data->setLineColor(toQColor(po->GetColor()));
-		data->setFillColor(toQColor(po->GetColor()));
 
-		CGraphData* graph = new CGraphData;
-		graph->m_data.push_back(data);
+		data.setLabel(QString::fromStdString(m_probe->GetName()));
+		data.setLineColor(toQColor(m_probe->GetColor()));
+		data.setFillColor(toQColor(m_probe->GetColor()));
+	}
 
-		CDataGraphWindow* w = new CDataGraphWindow(GetMainWindow(), doc);
-		w->SetData(graph);
+private:
+	Post::GLCurveProbe* m_probe;
+};
+
+void CPostModelPanel::OnCurveProbePlotData()
+{
+	CPostDocument* doc = dynamic_cast<CPostDocument*>(GetDocument());
+	if (doc == nullptr) return;
+
+	Post::GLCurveProbe* po = dynamic_cast<Post::GLCurveProbe*>(ui->currentObject());
+	if (po)
+	{
+		CDynamicDataGraphWindow* w = new CDynamicDataGraphWindow(GetMainWindow(), doc);
+		w->SetDataSource(new CCurveProbeData(po));
 		GetMainWindow()->AddGraph(w);
 		w->setWindowTitle(QString::fromStdString(po->GetName()));
 		w->show();