|
@@
-185,21
+185,6
void VisualizationZoneWidget::insertGraph(int index, VisualizationGraphWidget *g
|
|
185
|
auto graph = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(i)->widget());
|
|
185
|
auto graph = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(i)->widget());
|
|
186
|
connect(graphWidget, &VisualizationGraphWidget::setrange_sig, graph, &VisualizationGraphWidget::setGraphRange);
|
|
186
|
connect(graphWidget, &VisualizationGraphWidget::setrange_sig, graph, &VisualizationGraphWidget::setGraphRange);
|
|
187
|
connect(graph, &VisualizationGraphWidget::setrange_sig, graphWidget, &VisualizationGraphWidget::setGraphRange);
|
|
187
|
connect(graph, &VisualizationGraphWidget::setrange_sig, graphWidget, &VisualizationGraphWidget::setGraphRange);
|
|
188
|
// connect(graphWidget, &VisualizationGraphWidget::zoom_sig, graph, &VisualizationGraphWidget::zoom);
|
|
|
|
|
189
|
// connect(graphWidget, &VisualizationGraphWidget::transform_sig, graph, &VisualizationGraphWidget::transform);
|
|
|
|
|
190
|
|
|
|
|
|
191
|
// connect(graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
|
|
|
|
|
192
|
// graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
|
|
|
|
|
193
|
// connect(graphWidget, qOverload<double,double,bool>(&VisualizationGraphWidget::move_sig),
|
|
|
|
|
194
|
// graph, qOverload<double,double,bool>(&VisualizationGraphWidget::move));
|
|
|
|
|
195
|
|
|
|
|
|
196
|
// connect(graph, &VisualizationGraphWidget::zoom_sig, graphWidget, &VisualizationGraphWidget::zoom);
|
|
|
|
|
197
|
// connect(graph, &VisualizationGraphWidget::transform_sig, graphWidget, &VisualizationGraphWidget::transform);
|
|
|
|
|
198
|
|
|
|
|
|
199
|
// connect(graph, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
|
|
|
|
|
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));
|
|
|
|
|
203
|
}
|
|
188
|
}
|
|
204
|
if(auto graph = firstGraph())
|
|
189
|
if(auto graph = firstGraph())
|
|
205
|
{
|
|
190
|
{
|
|
@@
-232,65
+217,65
VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
|
|
232
|
|
|
217
|
|
|
233
|
|
|
218
|
|
|
234
|
// Lambda to synchronize zone widget
|
|
219
|
// Lambda to synchronize zone widget
|
|
235
|
auto synchronizeZoneWidget = [this, graphWidget](const DateTimeRange &graphRange,
|
|
220
|
// auto synchronizeZoneWidget = [this, graphWidget](const DateTimeRange &graphRange,
|
|
236
|
const DateTimeRange &oldGraphRange) {
|
|
221
|
// const DateTimeRange &oldGraphRange) {
|
|
237
|
|
|
222
|
|
|
238
|
auto zoomType = DateTimeRangeHelper::getTransformationType(oldGraphRange, graphRange);
|
|
223
|
// auto zoomType = DateTimeRangeHelper::getTransformationType(oldGraphRange, graphRange);
|
|
239
|
auto frameLayout = ui->dragDropContainer->layout();
|
|
224
|
// auto frameLayout = ui->dragDropContainer->layout();
|
|
240
|
for (auto i = 0; i < frameLayout->count(); ++i) {
|
|
225
|
// for (auto i = 0; i < frameLayout->count(); ++i) {
|
|
241
|
auto graphChild
|
|
226
|
// auto graphChild
|
|
242
|
= dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget());
|
|
227
|
// = dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget());
|
|
243
|
if (graphChild && (graphChild != graphWidget)) {
|
|
228
|
// if (graphChild && (graphChild != graphWidget)) {
|
|
244
|
|
|
229
|
|
|
245
|
auto graphChildRange = graphChild->graphRange();
|
|
230
|
// auto graphChildRange = graphChild->graphRange();
|
|
246
|
switch (zoomType) {
|
|
231
|
// switch (zoomType) {
|
|
247
|
case TransformationType::ZoomIn: {
|
|
232
|
// case TransformationType::ZoomIn: {
|
|
248
|
auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
|
|
233
|
// auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
|
|
249
|
auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
|
|
234
|
// auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
|
|
250
|
graphChildRange.m_TStart += deltaLeft;
|
|
235
|
// graphChildRange.m_TStart += deltaLeft;
|
|
251
|
graphChildRange.m_TEnd -= deltaRight;
|
|
236
|
// graphChildRange.m_TEnd -= deltaRight;
|
|
252
|
break;
|
|
237
|
// break;
|
|
253
|
}
|
|
238
|
// }
|
|
254
|
|
|
239
|
|
|
255
|
case TransformationType::ZoomOut: {
|
|
240
|
// case TransformationType::ZoomOut: {
|
|
256
|
auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
|
|
241
|
// auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
|
|
257
|
auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
|
|
242
|
// auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
|
|
258
|
graphChildRange.m_TStart -= deltaLeft;
|
|
243
|
// graphChildRange.m_TStart -= deltaLeft;
|
|
259
|
graphChildRange.m_TEnd += deltaRight;
|
|
244
|
// graphChildRange.m_TEnd += deltaRight;
|
|
260
|
break;
|
|
245
|
// break;
|
|
261
|
}
|
|
246
|
// }
|
|
262
|
case TransformationType::PanRight: {
|
|
247
|
// case TransformationType::PanRight: {
|
|
263
|
auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
|
|
248
|
// auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
|
|
264
|
auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
|
|
249
|
// auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
|
|
265
|
graphChildRange.m_TStart += deltaLeft;
|
|
250
|
// graphChildRange.m_TStart += deltaLeft;
|
|
266
|
graphChildRange.m_TEnd += deltaRight;
|
|
251
|
// graphChildRange.m_TEnd += deltaRight;
|
|
267
|
break;
|
|
252
|
// break;
|
|
268
|
}
|
|
253
|
// }
|
|
269
|
case TransformationType::PanLeft: {
|
|
254
|
// case TransformationType::PanLeft: {
|
|
270
|
auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
|
|
255
|
// auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
|
|
271
|
auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
|
|
256
|
// auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
|
|
272
|
graphChildRange.m_TStart -= deltaLeft;
|
|
257
|
// graphChildRange.m_TStart -= deltaLeft;
|
|
273
|
graphChildRange.m_TEnd -= deltaRight;
|
|
258
|
// graphChildRange.m_TEnd -= deltaRight;
|
|
274
|
break;
|
|
259
|
// break;
|
|
275
|
}
|
|
260
|
// }
|
|
276
|
case TransformationType::Unknown: {
|
|
261
|
// case TransformationType::Unknown: {
|
|
277
|
break;
|
|
262
|
// break;
|
|
278
|
}
|
|
263
|
// }
|
|
279
|
default:
|
|
264
|
// default:
|
|
280
|
qCCritical(LOG_VisualizationZoneWidget())
|
|
265
|
// qCCritical(LOG_VisualizationZoneWidget())
|
|
281
|
<< tr("Impossible to synchronize: zoom type not take into account");
|
|
266
|
// << tr("Impossible to synchronize: zoom type not take into account");
|
|
282
|
// No action
|
|
267
|
// // No action
|
|
283
|
break;
|
|
268
|
// break;
|
|
284
|
}
|
|
269
|
// }
|
|
285
|
graphChild->setFlags(GraphFlag::DisableAll);
|
|
270
|
// graphChild->setFlags(GraphFlag::DisableAll);
|
|
286
|
graphChild->setGraphRange(graphChildRange);
|
|
271
|
// graphChild->setGraphRange(graphChildRange, true);
|
|
287
|
graphChild->setFlags(GraphFlag::EnableAll);
|
|
272
|
// graphChild->setFlags(GraphFlag::EnableAll);
|
|
288
|
}
|
|
273
|
// }
|
|
289
|
}
|
|
274
|
// }
|
|
290
|
};
|
|
275
|
// };
|
|
291
|
|
|
276
|
|
|
292
|
// connection for synchronization
|
|
277
|
// connection for synchronization
|
|
293
|
connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget);
|
|
278
|
//connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget);
|
|
294
|
connect(graphWidget, &VisualizationGraphWidget::variableAdded, this,
|
|
279
|
connect(graphWidget, &VisualizationGraphWidget::variableAdded, this,
|
|
295
|
&VisualizationZoneWidget::onVariableAdded);
|
|
280
|
&VisualizationZoneWidget::onVariableAdded);
|
|
296
|
connect(graphWidget, &VisualizationGraphWidget::variableAboutToBeRemoved, this,
|
|
281
|
connect(graphWidget, &VisualizationGraphWidget::variableAboutToBeRemoved, this,
|