Auto status change to "Under Review"
| @@ -12,7 +12,7 | |||||
| 12 |
|
12 | |||
| 13 | Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel) |
|
13 | Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel) | |
| 14 |
|
14 | |||
| 15 |
enum VariableRoles { |
|
15 | enum VariableRoles { ProgressRole = Qt::UserRole }; | |
| 16 |
|
16 | |||
| 17 |
|
17 | |||
| 18 | class IDataSeries; |
|
18 | class IDataSeries; | |
| @@ -50,7 +50,7 struct VariableModel::VariableModelPrivate { | |||||
| 50 | std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress; |
|
50 | std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress; | |
| 51 |
|
51 | |||
| 52 |
|
52 | |||
| 53 | /// Return te row index of the variable |
|
53 | /// Return the row index of the variable. -1 if it's not found | |
| 54 | int indexOfVariable(Variable *variable) const noexcept; |
|
54 | int indexOfVariable(Variable *variable) const noexcept; | |
| 55 | }; |
|
55 | }; | |
| 56 |
|
56 | |||
| @@ -169,7 +169,7 QVariant VariableModel::data(const QModelIndex &index, int role) const | |||||
| 169 | qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)"); |
|
169 | qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)"); | |
| 170 | } |
|
170 | } | |
| 171 | } |
|
171 | } | |
| 172 |
else if (role == VariableRoles:: |
|
172 | else if (role == VariableRoles::ProgressRole) { | |
| 173 | if (auto variable = impl->m_Variables.at(index.row())) { |
|
173 | if (auto variable = impl->m_Variables.at(index.row())) { | |
| 174 |
|
174 | |||
| 175 | auto it = impl->m_VariableToProgress.find(variable); |
|
175 | auto it = impl->m_VariableToProgress.find(variable); | |
| @@ -17,13 +17,13 Q_LOGGING_CATEGORY(LOG_VariableInspectorWidget, "VariableInspectorWidget") | |||||
| 17 | class QProgressBarItemDelegate : public QStyledItemDelegate { |
|
17 | class QProgressBarItemDelegate : public QStyledItemDelegate { | |
| 18 |
|
18 | |||
| 19 | public: |
|
19 | public: | |
| 20 |
QProgressBarItemDelegate(QObject *parent) : QStyledItemDelegate |
|
20 | QProgressBarItemDelegate(QObject *parent) : QStyledItemDelegate{parent} {} | |
| 21 |
|
21 | |||
| 22 | void paint(QPainter *painter, const QStyleOptionViewItem &option, |
|
22 | void paint(QPainter *painter, const QStyleOptionViewItem &option, | |
| 23 | const QModelIndex &index) const |
|
23 | const QModelIndex &index) const | |
| 24 | { |
|
24 | { | |
| 25 | auto data = index.data(Qt::DisplayRole); |
|
25 | auto data = index.data(Qt::DisplayRole); | |
| 26 |
auto progressData = index.data(VariableRoles:: |
|
26 | auto progressData = index.data(VariableRoles::ProgressRole); | |
| 27 | if (data.isValid() && progressData.isValid()) { |
|
27 | if (data.isValid() && progressData.isValid()) { | |
| 28 | auto name = data.value<QString>(); |
|
28 | auto name = data.value<QString>(); | |
| 29 | auto progress = progressData.value<double>(); |
|
29 | auto progress = progressData.value<double>(); | |
| @@ -51,7 +51,7 public: | |||||
| 51 | VariableInspectorWidget::VariableInspectorWidget(QWidget *parent) |
|
51 | VariableInspectorWidget::VariableInspectorWidget(QWidget *parent) | |
| 52 | : QWidget{parent}, |
|
52 | : QWidget{parent}, | |
| 53 | ui{new Ui::VariableInspectorWidget}, |
|
53 | ui{new Ui::VariableInspectorWidget}, | |
| 54 |
m_ProgressBarItemDelegate{new QProgressBarItemDelegate |
|
54 | m_ProgressBarItemDelegate{new QProgressBarItemDelegate{this}} | |
| 55 | { |
|
55 | { | |
| 56 | ui->setupUi(this); |
|
56 | ui->setupUi(this); | |
| 57 |
|
57 | |||
General Comments 2
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * M core/include/Network/NetworkController.h * M core/include/Variable/VariableController.h * M core/include/Variable/VariableModel.h * M core/src/Network/NetworkController.cpp * M core/src/Variable/VariableController.cpp * M core/src/Variable/VariableModel.cpp * M gui/include/Variable/VariableInspectorWidget.h * M gui/src/SqpApplication.cpp * M gui/src/Variable/VariableInspectorWidget.cpp * M plugins/amda/src/AmdaResultParser.cpp * M plugins/amda/tests/TestAmdaResultParser.cpp * R COPYING * R app/src/MainWindow.cpp * R app/ui/MainWindow.ui * R cmake/sciqlop_package_qt.cmake * R core/include/Common/MetaTypes.h * R core/include/Data/ArrayData.h * R core/include/Data/DataProviderParameters.h * R core/include/Data/DataSeries.h * R core/include/Data/IDataProvider.h * R core/include/Data/IDataSeries.h * R core/include/Data/ScalarSeries.h * R core/include/Data/SqpDateTime.h * R core/include/DataSource/DataSourceItemAction.h * R core/include/Plugin/PluginManager.h * R core/include/Time/TimeController.h * R core/include/Variable/Variable.h * R core/include/Variable/VariableCacheController.h * R core/include/Visualization/VisualizationController.h * R core/src/Data/ScalarSeries.cpp * R core/src/DataSource/DataSourceItemAction.cpp * R core/src/Plugin/PluginManager.cpp * R core/src/Time/TimeController.cpp * R core/src/Variable/Variable.cpp * R core/src/Variable/VariableCacheController.cpp * R core/src/Visualization/VisualizationController.cpp * R core/tests/Variable/TestVariableCacheController.cpp * R gui/include/DataSource/DataSourceTreeWidgetItem.h * R gui/include/DataSource/DataSourceWidget.h * R gui/include/SidePane/SqpSidePane.h * R gui/include/TimeWidget/TimeWidget.h * R gui/include/Variable/VariableMenuHeaderWidget.h * R gui/include/Visualization/IVariableContainer.h * R gui/include/Visualization/IVisualizationWidget.h * R gui/include/Visualization/IVisualizationWidgetVisitor.h * R gui/include/Visualization/VisualizationGraphHelper.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/operations/GenerateVariableMenuOperation.h * R gui/include/Visualization/operations/MenuBuilder.h * R gui/include/Visualization/operations/RemoveVariableOperation.h * R gui/include/Visualization/qcustomplot.h * R gui/resources/icones/dataSourceComponent.png * R gui/resources/icones/dataSourceNode.png * R gui/resources/icones/dataSourceProduct.png * R gui/resources/icones/dataSourceRoot.png * R gui/resources/icones/delete.png * R gui/resources/icones/next.png * R gui/resources/icones/openInspector.png * R gui/resources/icones/plot.png * R gui/resources/icones/previous.png * R gui/resources/icones/sciqlop2PNG_1024.png * R gui/resources/icones/unplot.png * R gui/resources/sqpguiresources.qrc * R gui/src/DataSource/DataSourceTreeWidgetItem.cpp * R gui/src/DataSource/DataSourceWidget.cpp * R gui/src/SidePane/SqpSidePane.cpp * R gui/src/TimeWidget/TimeWidget.cpp * R gui/src/Variable/VariableMenuHeaderWidget.cpp * R gui/src/Visualization/VisualizationGraphHelper.cpp * R gui/src/Visualization/VisualizationGraphWidget.cpp * R gui/src/Visualization/VisualizationTabWidget.cpp * R gui/src/Visualization/VisualizationWidget.cpp * R gui/src/Visualization/VisualizationZoneWidget.cpp * R gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp * R gui/src/Visualization/operations/MenuBuilder.cpp * R gui/src/Visualization/operations/RemoveVariableOperation.cpp * R gui/src/Visualization/qcustomplot.cpp * R gui/ui/DataSource/DataSourceWidget.ui * R gui/ui/SidePane/SqpSidePane.ui * R gui/ui/TimeWidget/TimeWidget.ui * R gui/ui/Variable/VariableInspectorWidget.ui * R gui/ui/Variable/VariableMenuHeaderWidget.ui * R gui/ui/Visualization/VisualizationGraphWidget.ui * R gui/ui/Visualization/VisualizationTabWidget.ui * R gui/ui/Visualization/VisualizationWidget.ui * R gui/ui/Visualization/VisualizationZoneWidget.ui * R gui/vera-exclusions/exclusions.txt * R plugin/CMakeLists.txt * R plugin/cmake/Findsciqlop-plugin.cmake * R plugin/include/Plugin/IPlugin.h * R plugins/amda/CMakeLists.txt * R plugins/amda/cmake/Findsciqlop-amda.cmake * R plugins/amda/include/AmdaGlobal.h * R plugins/amda/include/AmdaParser.h * R plugins/amda/include/AmdaPlugin.h * R plugins/amda/include/AmdaProvider.h * R plugins/amda/include/AmdaResultParser.h * R plugins/amda/resources/amda.json * R plugins/amda/resources/amdaresources.qrc * R plugins/amda/resources/samples/AmdaSample.json * R plugins/amda/src/AmdaParser.cpp * R plugins/amda/src/AmdaPlugin.cpp * R plugins/amda/src/AmdaProvider.cpp * R plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json * R plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json * R plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt * R plugins/amda/tests/TestAmdaParser.cpp * R plugins/mockplugin/CMakeLists.txt * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/CosinusProvider.h * R plugins/mockplugin/include/MockPlugin.h * R plugins/mockplugin/include/MockPluginGlobal.h * R plugins/mockplugin/resources/mockplugin.json * R plugins/mockplugin/src/CosinusProvider.cpp * R plugins/mockplugin/src/MockPlugin.cpp * R README.md * R app/CMakeLists.txt * R app/include/MainWindow.h * R app/src/Main.cpp * R app/vera-exclusions/exclusions.txt * R cmake/sciqlop.cmake * R cmake/sciqlop_applications.cmake * R cmake/sciqlop_package.cmake * R cmake/sciqlop_params.cmake * R core/CMakeLists.txt * R core/include/Common/spimpl.h * R core/include/DataSource/DataSourceController.h * R core/include/DataSource/DataSourceItem.h * R core/src/DataSource/DataSourceController.cpp * R core/src/DataSource/DataSourceItem.cpp * R core/tests/DataSource/TestDataSourceController.cpp * R core/vera-exclusions/exclusions.txt * R formatting/cmake/use_clangformat.cmake * R formatting/vera-exclusions/exclusions.txt * R gui/CMakeLists.txt * R gui/include/SqpApplication.h * R LICENSE * R app/src/mainwindow.cpp * R app/src/mainwindow.ui
You need to be logged in to leave comments.
Login now