##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

MR for linux compilation
perrinel -
r848:89fbdd3d4a7b
parent child
Show More
Show file before | Show file after | Hide comments
@@ -93,7 +93,6 bool DragDropScroller::eventFilter(QObject *obj, QEvent *event)
93 93 }
94 94 }
95 95 else if (event->type() == QEvent::DragLeave) {
96 auto w = static_cast<QWidget *>(obj);
97 96 if (impl->m_CurrentScrollArea) {
98 97 if (!QRect(QPoint(), impl->m_CurrentScrollArea->size())
99 98 .contains(impl->m_CurrentScrollArea->mapFromGlobal(QCursor::pos()))) {
@@ -104,7 +103,6 bool DragDropScroller::eventFilter(QObject *obj, QEvent *event)
104 103 }
105 104 }
106 105 else if (event->type() == QEvent::Drop) {
107 auto w = static_cast<QWidget *>(obj);
108 106 if (impl->m_CurrentScrollArea) {
109 107 impl->m_CurrentScrollArea = nullptr;
110 108 impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown;
@@ -167,7 +165,9 struct DragDropHelper::DragDropHelperPrivate {
167 165 };
168 166
169 167
170 DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} {}
168 DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()}
169 {
170 }
171 171
172 172 DragDropHelper::~DragDropHelper()
173 173 {
Show file before | Show file after | Hide comments
@@ -120,9 +120,13 SqpApplication::SqpApplication(int &argc, char **argv)
120 120 impl->m_VisualizationControllerThread.start();
121 121 }
122 122
123 SqpApplication::~SqpApplication() {}
123 SqpApplication::~SqpApplication()
124 {
125 }
124 126
125 void SqpApplication::initialize() {}
127 void SqpApplication::initialize()
128 {
129 }
126 130
127 131 DataSourceController &SqpApplication::dataSourceController() noexcept
128 132 {
Show file before | Show file after | Hide comments
@@ -7,6 +7,7
7 7 #include <QDragEnterEvent>
8 8 #include <QVBoxLayout>
9 9
10 #include <cmath>
10 11 #include <memory>
11 12
12 13 struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
Show file before | Show file after | Hide comments
@@ -72,9 +72,8 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget
72 72 &VisualizationGraphWidget::onMouseRelease);
73 73 connect(ui->widget, &QCustomPlot::mouseMove, this, &VisualizationGraphWidget::onMouseMove);
74 74 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
75 connect(
76 ui->widget->xAxis,
77 static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(&QCPAxis::rangeChanged),
75 connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
76 &QCPAxis::rangeChanged),
78 77 this, &VisualizationGraphWidget::onRangeChanged, Qt::DirectConnection);
79 78
80 79 // Activates menu when right clicking on the graph
@@ -290,9 +289,9 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept
290 289
291 290 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
292 291 {
293 qCDebug(LOG_VisualizationGraphWidget())
294 << tr("TORM: VisualizationGraphWidget::onRangeChanged")
295 << QThread::currentThread()->objectName() << "DoAcqui" << impl->m_DoAcquisition;
292 qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: VisualizationGraphWidget::onRangeChanged")
293 << QThread::currentThread()->objectName() << "DoAcqui"
294 << impl->m_DoAcquisition;
296 295
297 296 auto graphRange = SqpRange{t1.lower, t1.upper};
298 297 auto oldGraphRange = SqpRange{t2.lower, t2.upper};
Show file before | Show file after | Hide comments
@@ -148,10 +148,10 VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
148 148 graphChildRange.m_TStart += deltaLeft;
149 149 graphChildRange.m_TEnd -= deltaRight;
150 150 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn");
151 qCDebug(LOG_VisualizationZoneWidget())
152 << tr("TORM: deltaLeft") << deltaLeft;
153 qCDebug(LOG_VisualizationZoneWidget())
154 << tr("TORM: deltaRight") << deltaRight;
151 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
152 << deltaLeft;
153 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
154 << deltaRight;
155 155 qCDebug(LOG_VisualizationZoneWidget())
156 156 << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
157 157
@@ -162,10 +162,10 VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
162 162 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut");
163 163 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
164 164 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
165 qCDebug(LOG_VisualizationZoneWidget())
166 << tr("TORM: deltaLeft") << deltaLeft;
167 qCDebug(LOG_VisualizationZoneWidget())
168 << tr("TORM: deltaRight") << deltaRight;
165 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
166 << deltaLeft;
167 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
168 << deltaRight;
169 169 qCDebug(LOG_VisualizationZoneWidget())
170 170 << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart;
171 171 graphChildRange.m_TStart -= deltaLeft;
@@ -202,10 +202,10 VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
202 202 break;
203 203 }
204 204 graphChild->enableAcquisition(false);
205 qCDebug(LOG_VisualizationZoneWidget())
206 << tr("TORM: Range before: ") << graphChild->graphRange();
207 qCDebug(LOG_VisualizationZoneWidget())
208 << tr("TORM: Range after : ") << graphChildRange;
205 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
206 << graphChild->graphRange();
207 qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
208 << graphChildRange;
209 209 qCDebug(LOG_VisualizationZoneWidget())
210 210 << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart;
211 211 graphChild->setGraphRange(graphChildRange);
General Comments 6
Approved
perrinel
Comment #2346
Edit
Delete
|

Status change > Approved

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