HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1373:15c8e75d755d

Added RAW graph sync implementation...

jeandet -

r1373:15c8e75d755d

parent child

Context file:

r1373:15c8e75d755d

gui/include/Visualization/VisualizationGraphWidget.h +10 -3

                 /// Sets the y-axis range based on the data of a variable
                 void setYRange(std::shared_ptr<Variable> variable);
                 DateTimeRange graphRange() const noexcept;
-                void setGraphRange(const DateTimeRange &range, bool calibration = false);
+                void setGraphRange(const DateTimeRange &range, bool updateVar = false);
                 void setAutoRangeOnVariableInitialization(bool value);
                 // Zones
                 /// Undo the last zoom  done with a zoom box
                 void undoZoom();
-                void zoom(double factor, int center, Qt::Orientation orientation);
+                void zoom(double factor, int center, Qt::Orientation orientation, bool forward=true);
-                void move(double factor, Qt::Orientation orientation);
+                void move(double factor, Qt::Orientation orientation, bool forward=true);
+                void move(double dx, double dy, bool forward=true);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 /// Signal emitted when the variable has been added to the graph
                 void variableAdded(std::shared_ptr<Variable> var);
+                void zoom_sig(double factor, int center, Qt::Orientation orientation, bool forward=true);
+                void move_sig(double factor, Qt::Orientation orientation, bool forward=true);
+                void move_sig(double dx, double dy, bool forward=true);
             protected:
                 void closeEvent(QCloseEvent *event) override;
                 void enterEvent(QEvent *event) override;
                 class VisualizationGraphWidgetPrivate;
                 spimpl::unique_impl_ptr<VisualizationGraphWidgetPrivate> impl;
+                void _ugly_sync_(const QPoint& pos,const QPointF& axisPos);
             private slots:
                 /// Slot called when right clicking on the graph (displays a menu)
                 void onGraphMenuRequested(const QPoint &pos) noexcept;

gui/src/Visualization/VisualizationGraphWidget.cpp +110 -62

@@ -85,6 +85,8 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
85	bool m_IsCalibration;	85	bool m_IsCalibration;
86	QCustomPlot* m_plot;	86	QCustomPlot* m_plot;
87	QPoint m_lastMousePos;	87	QPoint m_lastMousePos;
		88	QCPRange m_lastXRange;
		89	QCPRange m_lastYRange;
88	/// Delegate used to attach rendering features to the plot	90	/// Delegate used to attach rendering features to the plot
89	std::unique_ptr<VisualizationGraphRenderingDelegate> m_RenderingDelegate;	91	std::unique_ptr<VisualizationGraphRenderingDelegate> m_RenderingDelegate;
90		92
@@ -102,9 +104,12 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
102		104
103	bool m_VariableAutoRangeOnInit = true;	105	bool m_VariableAutoRangeOnInit = true;
104		106
105	inline void ~~updateMousePosition~~(const QPoint& position)	107	inline void enterPlotDrag(const QPoint& position)
106	{	108	{
107	m_lastMousePos = position;	109	m_lastMousePos = m_plot->mapFromParent(position);
		110	m_lastXRange = m_plot->xAxis->range();
		111	m_lastYRange = m_plot->yAxis->range();
		112
108	}	113	}
109		114
110	inline bool isDrawingZoomRect(){return m_DrawingZoomRect!=nullptr;}	115	inline bool isDrawingZoomRect(){return m_DrawingZoomRect!=nullptr;}
@@ -288,31 +293,98 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
288	}	293	}
289	}	294	}
290		295
291	void setRange(const ~~QCP~~Range &newRange)	296	void setRange(const DateTimeRange &newRange)
292	{	297	{
293	auto graphRange = DateTimeRange{newRange.lower, newRange.upper};
294
295	if (m_Flags.testFlag(GraphFlag::EnableAcquisition))	298	if (m_Flags.testFlag(GraphFlag::EnableAcquisition))
296	{	299	{
297	for (auto it = m_VariableToPlotMultiMap.begin(),	300	for (auto it = m_VariableToPlotMultiMap.begin(),
298	end = m_VariableToPlotMultiMap.end();	301	end = m_VariableToPlotMultiMap.end();
299	it != end; it = m_VariableToPlotMultiMap.upper_bound(it->first))	302	it != end; it = m_VariableToPlotMultiMap.upper_bound(it->first))
300	{	303	{
301	sqpApp->variableController().asyncChangeRange(it->first, ~~graph~~Range);	304	sqpApp->variableController().asyncChangeRange(it->first, newRange);
302	}	305	}
303	}	306	}
304	}	307	}
305		308
306	void moveGraph(const QPoint& destination)	309	void setRange(const QCPRange &newRange)
		310	{
		311	auto graphRange = DateTimeRange{newRange.lower, newRange.upper};
		312	setRange(graphRange);
		313	}
		314
		315	std::tuple<double,double> moveGraph(const QPoint& destination)
		316	{
		317	auto currentPos = m_plot->mapFromParent(destination);
		318	auto xAxis = m_plot->axisRect()->rangeDragAxis(Qt::Horizontal);
		319	auto yAxis = m_plot->axisRect()->rangeDragAxis(Qt::Vertical);
		320	auto oldXRange = xAxis->range();
		321	auto oldYRange = yAxis->range();
		322	double dx = xAxis->pixelToCoord(m_lastMousePos.x()) - xAxis->pixelToCoord(currentPos.x());
		323	xAxis->setRange(m_lastXRange.lower+dx, m_lastXRange.upper+dx);
		324	if(yAxis->scaleType() == QCPAxis::stLinear)
		325	{
		326	double dy = yAxis->pixelToCoord(m_lastMousePos.y()) - yAxis->pixelToCoord(currentPos.y());
		327	yAxis->setRange(m_lastYRange.lower+dy, m_lastYRange.upper+dy);
		328	}
		329	else
		330	{
		331	double dy = yAxis->pixelToCoord(m_lastMousePos.y()) / yAxis->pixelToCoord(currentPos.y());
		332	yAxis->setRange(m_lastYRange.lowerdy, m_lastYRange.upperdy);
		333	}
		334	auto newXRange = xAxis->range();
		335	auto newYRange = yAxis->range();
		336	setRange(xAxis->range());
		337	m_plot->replot(QCustomPlot::rpQueuedReplot);
		338	//m_lastMousePos = currentPos;
		339	return {newXRange.lower - oldXRange.lower, newYRange.lower - oldYRange.lower};
		340	}
		341
		342	void zoom(double factor, int center, Qt::Orientation orientation)
		343	{
		344	QCPAxis *axis = m_plot->axisRect()->rangeZoomAxis(orientation);
		345	axis->scaleRange(factor, axis->pixelToCoord(center));
		346	if (orientation == Qt::Horizontal)
		347	setRange(axis->range());
		348	m_plot->replot(QCustomPlot::rpQueuedReplot);
		349	}
		350
		351	void move(double dx, double dy)
307	{	352	{
308	auto currentPos = destination;
309	auto xAxis = m_plot->axisRect()->rangeDragAxis(Qt::Horizontal);	353	auto xAxis = m_plot->axisRect()->rangeDragAxis(Qt::Horizontal);
310	auto yAxis = m_plot->axisRect()->rangeDragAxis(Qt::Vertical);	354	auto yAxis = m_plot->axisRect()->rangeDragAxis(Qt::Vertical);
311	xAxis->setRange(_pixDistanceToRange(m_lastMousePos.x(), currentPos.x(), xAxis));	355	xAxis->setRange(QCPRange(xAxis->range().lower+dx, xAxis->range().upper+dx));
312	yAxis->setRange(_pixDistanceToRange(m_lastMousePos.y(), currentPos.y(), yAxis));	356	yAxis->setRange(QCPRange(yAxis->range().lower+dy, yAxis->range().upper+dy));
313	setRange(xAxis->range());	357	setRange(xAxis->range());
314	m_plot->replot(QCustomPlot::rpQueuedReplot);	358	m_plot->replot(QCustomPlot::rpQueuedReplot);
315	m_lastMousePos = destination;	359	}
		360
		361	void move(double factor, Qt::Orientation orientation)
		362	{
		363	auto oldRange = m_plot->xAxis->range();
		364	QCPAxis *axis = m_plot->axisRect()->rangeDragAxis(orientation);
		365	if (m_plot->xAxis->scaleType() == QCPAxis::stLinear) {
		366	double rg = (axis->range().upper - axis->range().lower) * (factor / 10);
		367	axis->setRange(axis->range().lower + (rg), axis->range().upper + (rg));
		368	}
		369	else if (m_plot->xAxis->scaleType() == QCPAxis::stLogarithmic) {
		370	int start = 0, stop = 0;
		371	double diff = 0.;
		372	if (factor > 0.0) {
		373	stop = m_plot->width() * factor / 10;
		374	start = 2 * m_plot->width() * factor / 10;
		375	}
		376	if (factor < 0.0) {
		377	factor *= -1.0;
		378	start = m_plot->width() * factor / 10;
		379	stop = 2 * m_plot->width() * factor / 10;
		380	}
		381	diff = axis->pixelToCoord(start) / axis->pixelToCoord(stop);
		382	axis->setRange(m_plot->axisRect()->rangeDragAxis(orientation)->range().lower * diff,
		383	m_plot->axisRect()->rangeDragAxis(orientation)->range().upper * diff);
		384	}
		385	if (orientation == Qt::Horizontal)
		386	setRange(axis->range());
		387	m_plot->replot(QCustomPlot::rpQueuedReplot);
316	}	388	}
317	};	389	};
318		390
@@ -448,18 +520,14 DateTimeRange VisualizationGraphWidget::graphRange() const noexcept
448	return DateTimeRange{graphRange.lower, graphRange.upper};	520	return DateTimeRange{graphRange.lower, graphRange.upper};
449	}	521	}
450		522
451	void VisualizationGraphWidget::setGraphRange(const DateTimeRange &range, bool ~~calibration~~)	523	void VisualizationGraphWidget::setGraphRange(const DateTimeRange &range, bool updateVar)
452	{	524	{
453	if (calibration) {
454	impl->m_IsCalibration = true;
455	}
456		525
		526	if(updateVar)
		527	impl->setRange(range);
457	impl->m_plot->xAxis->setRange(range.m_TStart, range.m_TEnd);	528	impl->m_plot->xAxis->setRange(range.m_TStart, range.m_TEnd);
458	impl->m_plot->replot(QCustomPlot::rpQueuedReplot);	529	impl->m_plot->replot(QCustomPlot::rpQueuedReplot);
459		530
460	if (calibration) {
461	impl->m_IsCalibration = false;
462	}
463	}	531	}
464		532
465	void VisualizationGraphWidget::setAutoRangeOnVariableInitialization(bool value)	533	void VisualizationGraphWidget::setAutoRangeOnVariableInitialization(bool value)
@@ -529,43 +597,25 void VisualizationGraphWidget::undoZoom()
529	plot().replot(QCustomPlot::rpQueuedReplot);	597	plot().replot(QCustomPlot::rpQueuedReplot);
530	}	598	}
531		599
532	void VisualizationGraphWidget::zoom(double factor, int center, Qt::Orientation orientation)	600	void VisualizationGraphWidget::zoom(double factor, int center, Qt::Orientation orientation, bool forward)
		601	{
		602	impl->zoom(factor, center, orientation);
		603	if(forward && orientation==Qt::Horizontal)
		604	emit this->zoom_sig(factor, center, orientation, false);
		605	}
533		606
		607	void VisualizationGraphWidget::move(double factor, Qt::Orientation orientation, bool forward)
534	{	608	{
535	QCPAxis *axis = impl->m_plot->axisRect()->rangeZoomAxis(orientation);	609	impl->move(factor, orientation);
536	axis->scaleRange(factor, axis->pixelToCoord(center));	610	if(forward)
537	if (orientation == Qt::Horizontal)	611	emit this->move_sig(factor, orientation, false);
538	impl->setRange(axis->range());
539	impl->m_plot->replot(QCustomPlot::rpQueuedReplot);
540	}	612	}
541		613
542	void VisualizationGraphWidget::move(double ~~factor~~, Qt::~~Orientation~~ ~~orientation~~)	614	void VisualizationGraphWidget::move(double dx, double dy, bool forward)
543	{	615	{
544	auto oldRange = impl->m_plot->xAxis->range();	616	impl->move(dx, dy);
545	QCPAxis *axis = impl->m_plot->axisRect()->rangeDragAxis(orientation);	617	if(forward)
546	if (impl->m_plot->xAxis->scaleType() == QCPAxis::stLinear) {	618	emit this->move_sig(dx, dy, false);
547	double rg = (axis->range().upper - axis->range().lower) * (factor / 10);
548	axis->setRange(axis->range().lower + (rg), axis->range().upper + (rg));
549	}
550	else if (impl->m_plot->xAxis->scaleType() == QCPAxis::stLogarithmic) {
551	int start = 0, stop = 0;
552	double diff = 0.;
553	if (factor > 0.0) {
554	stop = this->width() * factor / 10;
555	start = 2 * this->width() * factor / 10;
556	}
557	if (factor < 0.0) {
558	factor *= -1.0;
559	start = this->width() * factor / 10;
560	stop = 2 * this->width() * factor / 10;
561	}
562	diff = axis->pixelToCoord(start) / axis->pixelToCoord(stop);
563	axis->setRange(impl->m_plot->axisRect()->rangeDragAxis(orientation)->range().lower * diff,
564	impl->m_plot->axisRect()->rangeDragAxis(orientation)->range().upper * diff);
565	}
566	if (orientation == Qt::Horizontal)
567	impl->setRange(axis->range());
568	impl->m_plot->replot(QCustomPlot::rpQueuedReplot);
569	}	619	}
570		620
571	void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)	621	void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
@@ -782,7 +832,7 void VisualizationGraphWidget::wheelEvent(QWheelEvent *event)
782	else {	832	else {
783	move(wheelSteps, Qt::Horizontal);	833	move(wheelSteps, Qt::Horizontal);
784	}	834	}
785	QWidget::wheelEvent(event);	835	//QWidget::wheelEvent(event);
786	}	836	}
787		837
788		838
@@ -799,16 +849,14 void VisualizationGraphWidget::mouseMoveEvent(QMouseEvent *event)
799	}	849	}
800	else if (event->buttons() == Qt::LeftButton)	850	else if (event->buttons() == Qt::LeftButton)
801	{	851	{
802	~~switch~~ (sqpApp->plotsInteractionMode())	852	if(sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::None)
803	{	853	{
804	case SqpApplication::PlotsInteractionMode::None:	854	auto [dx,dy] = impl->moveGraph(event->pos());
805	impl->moveGraph(event->pos());	855	emit this->move_sig(dx,0., false); // don't sync Y transformations
806	break;	856	}
807	~~case~~ SqpApplication::PlotsInteractionMode::SelectionZones:	857	else if(sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones)
808		858	{
809	break;	859
810	default:
811	break;
812	}	860	}
813	}	861	}
814	else	862	else
@@ -872,7 +920,7 void VisualizationGraphWidget::mousePressEvent(QMouseEvent *event)
872	break;	920	break;
873	default:	921	default:
874	setCursor(Qt::ClosedHandCursor);	922	setCursor(Qt::ClosedHandCursor);
875	impl->~~updateMousePosition~~(event->pos());	923	impl->enterPlotDrag(event->pos());
876	}	924	}
877	}	925	}
878	QWidget::mousePressEvent(event);	926	QWidget::mousePressEvent(event);
@@ -960,7 +1008,7 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept
960		1008
961	// Iterates on variables (unique keys)	1009	// Iterates on variables (unique keys)
962	for (auto it = impl->m_VariableToPlotMultiMap.cbegin(),	1010	for (auto it = impl->m_VariableToPlotMultiMap.cbegin(),
963	end = impl->m_VariableToPlotMultiMap.cend();	1011	end = impl->m_VariableToPlotMultiMap.cend();
964	it != end; it = impl->m_VariableToPlotMultiMap.upper_bound(it->first)) {	1012	it != end; it = impl->m_VariableToPlotMultiMap.upper_bound(it->first)) {
965	// 'Remove variable' action	1013	// 'Remove variable' action
966	graphMenu.addAction(tr("Remove variable %1").arg(it->first->name()),	1014	graphMenu.addAction(tr("Remove variable %1").arg(it->first->name()),

gui/src/Visualization/VisualizationZoneWidget.cpp +27 0

@@ -172,14 +172,41 void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget)
172	impl->m_Synchronizer->addGraph(*graphWidget);	172	impl->m_Synchronizer->addGraph(*graphWidget);
173		173
174	ui->dragDropContainer->addDragWidget(graphWidget);	174	ui->dragDropContainer->addDragWidget(graphWidget);
		175
175	}	176	}
176		177
177	void VisualizationZoneWidget::insertGraph(int index, VisualizationGraphWidget *graphWidget)	178	void VisualizationZoneWidget::insertGraph(int index, VisualizationGraphWidget *graphWidget)
178	{	179	{
		180	DEPRECATE(
		181	auto layout = ui->dragDropContainer->layout();
		182	for(int i=0;i<layout->count();i++)
		183	{
		184	auto graph = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(i)->widget());
		185	connect(graphWidget, &VisualizationGraphWidget::zoom_sig, graph, &VisualizationGraphWidget::zoom);
		186
		187	connect(graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
		188	graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
		189	connect(graphWidget, qOverload<double,double,bool>(&VisualizationGraphWidget::move_sig),
		190	graph, qOverload<double,double,bool>(&VisualizationGraphWidget::move));
		191
		192	connect(graph, &VisualizationGraphWidget::zoom_sig, graphWidget, &VisualizationGraphWidget::zoom);
		193
		194	connect(graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
		195	graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
		196	connect(graph, qOverload<double,double,bool>(&VisualizationGraphWidget::move_sig),
		197	graphWidget, qOverload<double,double,bool>(&VisualizationGraphWidget::move));
		198	}
		199	if(auto graph = firstGraph())
		200	{
		201	graphWidget->setGraphRange(graph->graphRange(), true);
		202	}
		203	)
		204
179	// Synchronize new graph with others in the zone	205	// Synchronize new graph with others in the zone
180	impl->m_Synchronizer->addGraph(*graphWidget);	206	impl->m_Synchronizer->addGraph(*graphWidget);
181		207
182	ui->dragDropContainer->insertDragWidget(index, graphWidget);	208	ui->dragDropContainer->insertDragWidget(index, graphWidget);
		209
183	}	210	}
184		211
185	VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)	212	VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)

plugins/amda/resources/amdaresources.qrc 0 -3

             <RCC>
                 <qresource prefix="/">
-                    <file>samples/AmdaSample.json</file>
-                    <file>samples/AmdaSampleV2.json</file>
-                    <file>samples/AmdaSampleV3.json</file>
                     <file>samples/amda_tree.json</file>
                 </qresource>
             </RCC>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages