##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Correction for Linux compilation again
perrinel -
r77:6a575e1ae0ea
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 #include "visualization\VisualizationGraphWidget.h"
1 #include "visualization/VisualizationGraphWidget.h"
2 #include "ui_VisualizationGraphWidget.h"
2 #include "ui_VisualizationGraphWidget.h"
3
3
4 VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)
4 VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 #include "visualization\VisualizationTabWidget.h"
1 #include "visualization/VisualizationTabWidget.h"
2 #include "ui_VisualizationTabWidget.h"
2 #include "ui_VisualizationTabWidget.h"
3
3
4 VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
4 VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 #include "visualization\VisualizationWidget.h"
1 #include "visualization/VisualizationWidget.h"
2 #include "ui_VisualizationWidget.h"
2 #include "ui_VisualizationWidget.h"
3
3
4 VisualizationWidget::VisualizationWidget(QWidget *parent)
4 VisualizationWidget::VisualizationWidget(QWidget *parent)
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 #include "visualization\VisualizationZoneWidget.h"
1 #include "visualization/VisualizationZoneWidget.h"
2 #include "ui_VisualizationZoneWidget.h"
2 #include "ui_VisualizationZoneWidget.h"
3
3
4 VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
4 VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
Show file before | Show file after | Hide comments
@@ -1574,7 +1574,10 void QCPLayerable::applyAntialiasingHint(QCPPainter *painter, bool localAntialia
1574
1574
1575 \see initializeParentPlot
1575 \see initializeParentPlot
1576 */
1576 */
1577 void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot){Q_UNUSED(parentPlot)}
1577 void QCPLayerable::parentPlotInitialized(QCustomPlot *parentPlot)
1578 {
1579 Q_UNUSED(parentPlot)
1580 }
1578
1581
1579 /*! \internal
1582 /*! \internal
1580
1583
@@ -9254,14 +9257,12 void QCPAxisPainterPrivate::draw(QCPPainter *painter)
9254 painter->setBrush(QBrush(basePen.color()));
9257 painter->setBrush(QBrush(basePen.color()));
9255 QCPVector2D baseLineVector(baseLine.dx(), baseLine.dy());
9258 QCPVector2D baseLineVector(baseLine.dx(), baseLine.dy());
9256 if (lowerEnding.style() != QCPLineEnding::esNone)
9259 if (lowerEnding.style() != QCPLineEnding::esNone)
9257 lowerEnding.draw(painter,
9260 lowerEnding.draw(painter, QCPVector2D(baseLine.p1())
9258 QCPVector2D(baseLine.p1())
9259 - baseLineVector.normalized() * lowerEnding.realLength()
9261 - baseLineVector.normalized() * lowerEnding.realLength()
9260 * (lowerEnding.inverted() ? -1 : 1),
9262 * (lowerEnding.inverted() ? -1 : 1),
9261 -baseLineVector);
9263 -baseLineVector);
9262 if (upperEnding.style() != QCPLineEnding::esNone)
9264 if (upperEnding.style() != QCPLineEnding::esNone)
9263 upperEnding.draw(painter,
9265 upperEnding.draw(painter, QCPVector2D(baseLine.p2())
9264 QCPVector2D(baseLine.p2())
9265 + baseLineVector.normalized() * upperEnding.realLength()
9266 + baseLineVector.normalized() * upperEnding.realLength()
9266 * (upperEnding.inverted() ? -1 : 1),
9267 * (upperEnding.inverted() ? -1 : 1),
9267 baseLineVector);
9268 baseLineVector);
@@ -16468,8 +16469,7 void QCPColorGradient::updateColorBuffer()
16468 hue -= 1.0;
16469 hue -= 1.0;
16469 if (useAlpha) {
16470 if (useAlpha) {
16470 const QRgb rgb
16471 const QRgb rgb
16471 = QColor::fromHsvF(hue,
16472 = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF()
16472 (1 - t) * lowHsv.saturationF()
16473 + t * highHsv.saturationF(),
16473 + t * highHsv.saturationF(),
16474 (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
16474 (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
16475 .rgb();
16475 .rgb();
@@ -16479,8 +16479,7 void QCPColorGradient::updateColorBuffer()
16479 }
16479 }
16480 else {
16480 else {
16481 mColorBuffer[i]
16481 mColorBuffer[i]
16482 = QColor::fromHsvF(hue,
16482 = QColor::fromHsvF(hue, (1 - t) * lowHsv.saturationF()
16483 (1 - t) * lowHsv.saturationF()
16484 + t * highHsv.saturationF(),
16483 + t * highHsv.saturationF(),
16485 (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
16484 (1 - t) * lowHsv.valueF() + t * highHsv.valueF())
16486 .rgb();
16485 .rgb();
@@ -19839,12 +19838,10 void QCPColorScale::update(UpdatePhase phase)
19839 switch (phase) {
19838 switch (phase) {
19840 case upMargins: {
19839 case upMargins: {
19841 if (mType == QCPAxis::atBottom || mType == QCPAxis::atTop) {
19840 if (mType == QCPAxis::atBottom || mType == QCPAxis::atTop) {
19842 setMaximumSize(QWIDGETSIZE_MAX,
19841 setMaximumSize(QWIDGETSIZE_MAX, mBarWidth + mAxisRect.data()->margins().top()
19843 mBarWidth + mAxisRect.data()->margins().top()
19842 + mAxisRect.data()->margins().bottom()
19844 + mAxisRect.data()->margins().bottom() + margins().top()
19843 + margins().top() + margins().bottom());
19845 + margins().bottom());
19844 setMinimumSize(0, mBarWidth + mAxisRect.data()->margins().top()
19846 setMinimumSize(0,
19847 mBarWidth + mAxisRect.data()->margins().top()
19848 + mAxisRect.data()->margins().bottom() + margins().top()
19845 + mAxisRect.data()->margins().bottom() + margins().top()
19849 + margins().bottom());
19846 + margins().bottom());
19850 }
19847 }
General Comments 5
Under Review
perrinel
author
Comment #1405
Edit
Delete
|

Auto status change to "Under Review"

Under Review
perrinel
author
Comment #1412
Edit
Delete
|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 6 added
  * 3 removed

Changed files:
  * A gui/src/Visualization/VisualizationWidget.cpp
  * A gui/include/SidePane/SqpSidePane.h
  * A gui/include/Visualization/VisualizationGraphWidget.h
  * A gui/include/Visualization/VisualizationTabWidget.h
  * A gui/include/Visualization/VisualizationWidget.h
  * A gui/include/Visualization/VisualizationZoneWidget.h
  * A gui/include/Visualization/qcustomplot.h
  * A gui/src/SidePane/SqpSidePane.cpp
  * A gui/src/Visualization/VisualizationGraphWidget.cpp
  * A gui/src/Visualization/VisualizationTabWidget.cpp
  * A gui/src/Visualization/VisualizationZoneWidget.cpp
  * A gui/src/Visualization/qcustomplot.cpp
  * M gui/include/DataSource/DataSourceWidget.h
  * M gui/src/DataSource/DataSourceTreeWidgetItem.cpp
  * M gui/src/DataSource/DataSourceWidget.cpp
  * M app/src/Main.cpp
  * M app/src/MainWindow.cpp
  * M app/ui/MainWindow.ui
  * M core/include/DataSource/DataSourceController.h
  * M core/src/DataSource/DataSourceController.cpp
  * M core/tests/DataSource/TestDataSourceController.cpp
  * M gui/ui/visualization/VisualizationWidget.ui
  * M gui/vera-exclusions/exclusions.txt
  * M gui/src/visualization/VisualizationWidget.cpp
  * R cmake/sciqlop_package_qt.cmake
  * R core/include/Plugin/PluginManager.h
  * R core/include/Visualization/VisualizationController.h
  * R core/src/Plugin/PluginManager.cpp
  * R core/src/Visualization/VisualizationController.cpp
  * R gui/include/sidepane/SqpSidePane.h
  * R gui/include/visualization/VisualizationGraphWidget.h
  * R gui/include/visualization/VisualizationTabWidget.h
  * R gui/include/visualization/VisualizationWidget.h
  * R gui/include/visualization/VisualizationZoneWidget.h
  * R gui/include/visualization/qcustomplot.h
  * R gui/src/sidepane/SqpSidePane.cpp
  * R gui/src/visualization/VisualizationGraphWidget.cpp
  * R gui/src/visualization/VisualizationTabWidget.cpp
  * R gui/src/visualization/VisualizationZoneWidget.cpp
  * R gui/src/visualization/qcustomplot.cpp
  * R gui/ui/sidepane/SqpSidePane.ui
  * R gui/ui/visualization/VisualizationGraphWidget.ui
  * R gui/ui/visualization/VisualizationTabWidget.ui
  * R gui/ui/visualization/VisualizationZoneWidget.ui
  * R plugin/CMakeLists.txt
  * R plugin/cmake/Findsciqlop-plugin.cmake
  * R plugin/include/Plugin/IPlugin.h
  * R app/CMakeLists.txt
  * R app/include/MainWindow.h
  * R app/vera-exclusions/exclusions.txt
  * R cmake/sciqlop_applications.cmake
  * R core/CMakeLists.txt
  * R core/include/Common/spimpl.h
  * R gui/CMakeLists.txt
  * R gui/include/SqpApplication.h
  * R gui/src/SqpApplication.cpp
  * R app/src/mainwindow.ui
Approved
perrinel
author
Comment #1413
Edit
Delete
|

Status change > Approved

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