HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1384:e344de146add

Force range for each transformation among synchronized graphs, ignore missing X unit in data files since it's always time...

jeandet -

r1384:e344de146add

parent child

Context file:

r1384:e344de146add

Collapse all files

gui/include/Visualization/VisualizationGraphWidget.h +1 0

                 void move_sig(double factor, Qt::Orientation orientation, bool forward=true);
                 void move_sig(double dx, double dy, bool forward=true);
                 void transform_sig(const DateTimeRangeTransformation& tranformation, bool forward=true);
+                void setrange_sig(const DateTimeRange& range, bool updateVar=false, bool forward=true);
             protected:
                 void closeEvent(QCloseEvent *event) override;

gui/src/Visualization/VisualizationGraphWidget.cpp +6 -9

             void VisualizationGraphWidget::setGraphRange(const DateTimeRange &range, bool updateVar, bool forward)
             {
-                auto oldRange = graphRange();
                 impl->setRange(range, updateVar);
                 if(forward)
                 {
-                    auto newRange = graphRange();
+                    emit this->setrange_sig(this->graphRange(), true, false);
-                    if(auto tf = DateTimeRangeHelper::computeTransformation(oldRange,newRange))
-                        emit this->transform_sig(tf.value(), false);
                 }
             }
             {
                 impl->zoom(factor, center, orientation);
                 if(forward && orientation==Qt::Horizontal)
-                    emit this->zoom_sig(factor, center, orientation, false);
+                    emit this->setrange_sig(this->graphRange(), true, false);
             }
             void VisualizationGraphWidget::move(double factor, Qt::Orientation orientation, bool forward)
             {
                 impl->move(factor, orientation);
                 if(forward)
-                    emit this->move_sig(factor, orientation, false);
+                    emit this->setrange_sig(this->graphRange(), true, false);
             }
             void VisualizationGraphWidget::move(double dx, double dy, bool forward)
             {
                 impl->move(dx, dy);
                 if(forward)
-                    emit this->move_sig(dx, dy, false);
+                    emit this->setrange_sig(this->graphRange(), true, false);
             }
             void VisualizationGraphWidget::transform(const DateTimeRangeTransformation &tranformation, bool forward)
             {
                 impl->transform(tranformation);
                 if(forward)
-                    emit this->transform_sig(tranformation, false);
+                    emit this->setrange_sig(this->graphRange(), true, false);
             }
             void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
                     if(sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::None)
                     {
                         auto [dx,dy] = impl->moveGraph(event->pos());
-                        emit this->move_sig(dx,0., false); // don't sync Y transformations
+                        emit this->setrange_sig(this->graphRange(), true, false);
                     }
                     else if(sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones)
                     {

gui/src/Visualization/VisualizationZoneWidget.cpp +17 -15

@@ -183,21 +183,23 void VisualizationZoneWidget::insertGraph(int index, VisualizationGraphWidget *g
183	for(int i=0;i<layout->count();i++)	183	for(int i=0;i<layout->count();i++)
184	{	184	{
185	auto graph = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(i)->widget());	185	auto graph = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(i)->widget());
186	connect(graphWidget, &VisualizationGraphWidget::~~zoom~~_sig, graph, &VisualizationGraphWidget::~~zoom~~);	186	connect(graphWidget, &VisualizationGraphWidget::setrange_sig, graph, &VisualizationGraphWidget::setGraphRange);
187	connect(graphWidget, &VisualizationGraphWidget::transform_sig, graph, &VisualizationGraphWidget::transform);	187	connect(graph, &VisualizationGraphWidget::setrange_sig, graphWidget, &VisualizationGraphWidget::setGraphRange);
188		188	// connect(graphWidget, &VisualizationGraphWidget::zoom_sig, graph, &VisualizationGraphWidget::zoom);
189	connect(graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),	189	// connect(graphWidget, &VisualizationGraphWidget::transform_sig, graph, &VisualizationGraphWidget::transform);
190	graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));	190
191	connect(graphWidget, qOverload<double,~~double~~,bool>(&VisualizationGraphWidget::move_sig),	191	// connect(graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
192	graph, qOverload<double,~~double~~,bool>(&VisualizationGraphWidget::move));	192	// graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
193		193	// connect(graphWidget, qOverload<double,double,bool>(&VisualizationGraphWidget::move_sig),
194	connect(graph, &VisualizationGraphWidget::zoom_sig, graphWidget, &VisualizationGraphWidget::zoom);	194	// graph, qOverload<double,double,bool>(&VisualizationGraphWidget::move));
195	connect(graph, &VisualizationGraphWidget::transform_sig, graphWidget, &VisualizationGraphWidget::transform);	195
196		196	// connect(graph, &VisualizationGraphWidget::zoom_sig, graphWidget, &VisualizationGraphWidget::zoom);
197	connect(graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),	197	// connect(graph, &VisualizationGraphWidget::transform_sig, graphWidget, &VisualizationGraphWidget::transform);
198	graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));	198
199	connect(graph, qOverload<double,~~double~~,bool>(&VisualizationGraphWidget::move_sig),	199	// connect(graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
200	graphWidget, qOverload<double,~~double~~,bool>(&VisualizationGraphWidget::move));	200	// graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
		201	// connect(graph, qOverload<double,double,bool>(&VisualizationGraphWidget::move_sig),
		202	// graphWidget, qOverload<double,double,bool>(&VisualizationGraphWidget::move));
201	}	203	}
202	if(auto graph = firstGraph())	204	if(auto graph = firstGraph())
203	{	205	{

plugins/amda/src/AmdaResultParserHelper.cpp +10 -4

             bool ScalarParserHelper::checkProperties()
             {
-                return checkUnit(m_Properties, X_AXIS_UNIT_PROPERTY,
+                if(auto hasXUnit = checkUnit(m_Properties, X_AXIS_UNIT_PROPERTY, QObject::tr("The x-axis unit could not be found in the file"));!hasXUnit)
-                                 QObject::tr("The x-axis unit could not be found in the file"));
+                    m_Properties[X_AXIS_UNIT_PROPERTY] = QVariant::fromValue(Unit{"s",true});
+                }
+                return true;
             }
             IDataSeries* ScalarParserHelper::createSeries()
             bool VectorParserHelper::checkProperties()
             {
-                return checkUnit(m_Properties, X_AXIS_UNIT_PROPERTY,
+                if(auto hasXUnit = checkUnit(m_Properties, X_AXIS_UNIT_PROPERTY, QObject::tr("The x-axis unit could not be found in the file"));!hasXUnit)
-                                 QObject::tr("The x-axis unit could not be found in the file"));
+                    m_Properties[X_AXIS_UNIT_PROPERTY] = QVariant::fromValue(Unit{"s",true});
+                }
+                return true;
             }
             IDataSeries* VectorParserHelper::createSeries()

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