Auto status change to "Under Review"
@@ -1,143 +1,143 | |||
|
1 | 1 | qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep']) |
|
2 | 2 | catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep']) |
|
3 | 3 | |
|
4 | 4 | gui_moc_headers = [ |
|
5 | 5 | 'include/DataSource/DataSourceWidget.h', |
|
6 | 6 | 'include/Settings/SqpSettingsDialog.h', |
|
7 | 7 | 'include/Settings/SqpSettingsGeneralWidget.h', |
|
8 | 8 | 'include/SidePane/SqpSidePane.h', |
|
9 | 9 | 'include/SqpApplication.h', |
|
10 | 10 | 'include/DragAndDrop/DragDropScroller.h', |
|
11 | 11 | 'include/DragAndDrop/DragDropTabSwitcher.h', |
|
12 | 12 | 'include/TimeWidget/TimeWidget.h', |
|
13 | 13 | 'include/Variable/VariableInspectorWidget.h', |
|
14 | 14 | 'include/Variable/RenameVariableDialog.h', |
|
15 | 15 | 'include/Visualization/qcustomplot.h', |
|
16 | 16 | 'include/Visualization/VisualizationGraphWidget.h', |
|
17 | 17 | 'include/Visualization/VisualizationTabWidget.h', |
|
18 | 18 | 'include/Visualization/VisualizationWidget.h', |
|
19 | 19 | 'include/Visualization/VisualizationZoneWidget.h', |
|
20 | 20 | 'include/Visualization/VisualizationDragDropContainer.h', |
|
21 | 21 | 'include/Visualization/VisualizationDragWidget.h', |
|
22 | 22 | 'include/Visualization/ColorScaleEditor.h', |
|
23 | 23 | 'include/Actions/SelectionZoneAction.h', |
|
24 | 24 | 'include/Visualization/VisualizationMultiZoneSelectionDialog.h', |
|
25 | 25 | 'include/Catalogue/CatalogueExplorer.h', |
|
26 | 26 | 'include/Catalogue/CatalogueEventsWidget.h', |
|
27 | 27 | 'include/Catalogue/CatalogueSideBarWidget.h', |
|
28 | 28 | 'include/Catalogue/CatalogueInspectorWidget.h', |
|
29 | 29 | 'include/Catalogue/CatalogueEventsModel.h', |
|
30 |
'include/Catalogue/CreateEventDialog. |
|
|
30 | 'include/Catalogue/CreateEventDialog.h' | |
|
31 | 31 | ] |
|
32 | 32 | |
|
33 | 33 | gui_ui_files = [ |
|
34 | 34 | 'ui/DataSource/DataSourceWidget.ui', |
|
35 | 35 | 'ui/Settings/SqpSettingsDialog.ui', |
|
36 | 36 | 'ui/Settings/SqpSettingsGeneralWidget.ui', |
|
37 | 37 | 'ui/SidePane/SqpSidePane.ui', |
|
38 | 38 | 'ui/TimeWidget/TimeWidget.ui', |
|
39 | 39 | 'ui/Variable/VariableInspectorWidget.ui', |
|
40 | 40 | 'ui/Variable/RenameVariableDialog.ui', |
|
41 | 41 | 'ui/Variable/VariableMenuHeaderWidget.ui', |
|
42 | 42 | 'ui/Visualization/VisualizationGraphWidget.ui', |
|
43 | 43 | 'ui/Visualization/VisualizationTabWidget.ui', |
|
44 | 44 | 'ui/Visualization/VisualizationWidget.ui', |
|
45 | 45 | 'ui/Visualization/VisualizationZoneWidget.ui', |
|
46 | 46 | 'ui/Visualization/ColorScaleEditor.ui', |
|
47 | 47 | 'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui', |
|
48 | 48 | 'ui/Catalogue/CatalogueExplorer.ui', |
|
49 | 49 | 'ui/Catalogue/CatalogueEventsWidget.ui', |
|
50 | 50 | 'ui/Catalogue/CatalogueSideBarWidget.ui', |
|
51 | 51 | 'ui/Catalogue/CatalogueInspectorWidget.ui', |
|
52 | 52 | 'ui/Catalogue/CreateEventDialog.ui' |
|
53 | 53 | ] |
|
54 | 54 | |
|
55 | 55 | gui_qresources = ['resources/sqpguiresources.qrc'] |
|
56 | 56 | |
|
57 | 57 | rcc_gen = generator(rcc, |
|
58 | 58 | output : 'qrc_@BASENAME@.cpp', |
|
59 | 59 | arguments : [ |
|
60 | 60 | '--output', |
|
61 | 61 | '@OUTPUT@', |
|
62 | 62 | '@INPUT@', |
|
63 | 63 | '@EXTRA_ARGS@']) |
|
64 | 64 | |
|
65 | 65 | rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources']) |
|
66 | 66 | |
|
67 | 67 | gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers, |
|
68 | 68 | ui_files : gui_ui_files) |
|
69 | 69 | |
|
70 | 70 | gui_sources = [ |
|
71 | 71 | 'src/SqpApplication.cpp', |
|
72 | 72 | 'src/DragAndDrop/DragDropGuiController.cpp', |
|
73 | 73 | 'src/DragAndDrop/DragDropScroller.cpp', |
|
74 | 74 | 'src/DragAndDrop/DragDropTabSwitcher.cpp', |
|
75 | 75 | 'src/Common/ColorUtils.cpp', |
|
76 | 76 | 'src/Common/VisualizationDef.cpp', |
|
77 | 77 | 'src/DataSource/DataSourceTreeWidgetItem.cpp', |
|
78 | 78 | 'src/DataSource/DataSourceTreeWidgetHelper.cpp', |
|
79 | 79 | 'src/DataSource/DataSourceWidget.cpp', |
|
80 | 80 | 'src/DataSource/DataSourceTreeWidget.cpp', |
|
81 | 81 | 'src/Settings/SqpSettingsDialog.cpp', |
|
82 | 82 | 'src/Settings/SqpSettingsGeneralWidget.cpp', |
|
83 | 83 | 'src/SidePane/SqpSidePane.cpp', |
|
84 | 84 | 'src/TimeWidget/TimeWidget.cpp', |
|
85 | 85 | 'src/Variable/VariableInspectorWidget.cpp', |
|
86 | 86 | 'src/Variable/VariableInspectorTableView.cpp', |
|
87 | 87 | 'src/Variable/VariableMenuHeaderWidget.cpp', |
|
88 | 88 | 'src/Variable/RenameVariableDialog.cpp', |
|
89 | 89 | 'src/Visualization/VisualizationGraphHelper.cpp', |
|
90 | 90 | 'src/Visualization/VisualizationGraphRenderingDelegate.cpp', |
|
91 | 91 | 'src/Visualization/VisualizationGraphWidget.cpp', |
|
92 | 92 | 'src/Visualization/VisualizationTabWidget.cpp', |
|
93 | 93 | 'src/Visualization/VisualizationWidget.cpp', |
|
94 | 94 | 'src/Visualization/VisualizationZoneWidget.cpp', |
|
95 | 95 | 'src/Visualization/qcustomplot.cpp', |
|
96 | 96 | 'src/Visualization/QCustomPlotSynchronizer.cpp', |
|
97 | 97 | 'src/Visualization/operations/FindVariableOperation.cpp', |
|
98 | 98 | 'src/Visualization/operations/GenerateVariableMenuOperation.cpp', |
|
99 | 99 | 'src/Visualization/operations/MenuBuilder.cpp', |
|
100 | 100 | 'src/Visualization/operations/RemoveVariableOperation.cpp', |
|
101 | 101 | 'src/Visualization/operations/RescaleAxeOperation.cpp', |
|
102 | 102 | 'src/Visualization/VisualizationDragDropContainer.cpp', |
|
103 | 103 | 'src/Visualization/VisualizationDragWidget.cpp', |
|
104 | 104 | 'src/Visualization/AxisRenderingUtils.cpp', |
|
105 | 105 | 'src/Visualization/PlottablesRenderingUtils.cpp', |
|
106 | 106 | 'src/Visualization/MacScrollBarStyle.cpp', |
|
107 | 107 | 'src/Visualization/VisualizationCursorItem.cpp', |
|
108 | 108 | 'src/Visualization/ColorScaleEditor.cpp', |
|
109 | 109 | 'src/Visualization/SqpColorScale.cpp', |
|
110 | 110 | 'src/Visualization/QCPColorMapIterator.cpp', |
|
111 | 111 | 'src/Visualization/VisualizationSelectionZoneItem.cpp', |
|
112 | 112 | 'src/Visualization/VisualizationSelectionZoneManager.cpp', |
|
113 | 113 | 'src/Actions/SelectionZoneAction.cpp', |
|
114 | 114 | 'src/Actions/ActionsGuiController.cpp', |
|
115 | 115 | 'src/Visualization/VisualizationActionManager.cpp', |
|
116 | 116 | 'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp', |
|
117 | 117 | 'src/Catalogue/CatalogueExplorer.cpp', |
|
118 | 118 | 'src/Catalogue/CatalogueEventsWidget.cpp', |
|
119 | 119 | 'src/Catalogue/CatalogueSideBarWidget.cpp', |
|
120 | 120 | 'src/Catalogue/CatalogueInspectorWidget.cpp', |
|
121 | 121 | 'src/Catalogue/CatalogueTreeWidgetItem.cpp', |
|
122 | 122 | 'src/Catalogue/CatalogueEventsModel.cpp', |
|
123 | 123 | 'src/Catalogue/CatalogueExplorerHelper.cpp', |
|
124 | 124 | 'src/Catalogue/CatalogueActionManager.cpp', |
|
125 | 125 | 'src/Catalogue/CreateEventDialog.cpp' |
|
126 | 126 | ] |
|
127 | 127 | |
|
128 | 128 | gui_inc = include_directories(['include']) |
|
129 | 129 | |
|
130 | 130 | sciqlop_gui_lib = library('sciqlopgui', |
|
131 | 131 | gui_sources, |
|
132 | 132 | gui_moc_files, |
|
133 | 133 | rcc_files, |
|
134 | 134 | include_directories : [gui_inc], |
|
135 | 135 | dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep], |
|
136 | 136 | install : true |
|
137 | 137 | ) |
|
138 | 138 | |
|
139 | 139 | sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib, |
|
140 | 140 | include_directories : gui_inc, |
|
141 | 141 | dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep]) |
|
142 | 142 | |
|
143 | 143 |
General Comments 4
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * M app/src/Main.cpp * M core/include/Catalogue/CatalogueController.h * M core/src/Catalogue/CatalogueController.cpp * M core/src/Plugin/PluginManager.cpp * M core/tests/Data/TestDataSeriesUtils.cpp * M gui/include/Catalogue/CatalogueEventsModel.h * M gui/include/Catalogue/CatalogueEventsWidget.h * M gui/include/Catalogue/CatalogueTreeWidgetItem.h * M gui/meson.build * M gui/src/Catalogue/CatalogueEventsModel.cpp * M gui/src/Catalogue/CatalogueEventsWidget.cpp * M gui/src/Catalogue/CatalogueExplorer.cpp * M gui/src/Catalogue/CatalogueSideBarWidget.cpp * M gui/src/Catalogue/CatalogueTreeWidgetItem.cpp * M gui/src/Visualization/VisualizationActionManager.cpp * M gui/src/Visualization/VisualizationGraphWidget.cpp * M gui/src/Visualization/VisualizationSelectionZoneItem.cpp * M plugins/amda/tests/TestAmdaResultParser.cpp * R cmake/FindCatalogueAPI.cmake * R core/include/Common/MimeTypesDef.h * R core/include/Data/DataSeriesUtils.h * R core/include/Data/OptionalAxis.h * R core/include/Data/SpectrogramSeries.h * R core/include/Data/Unit.h * R core/include/DataSource/DataSourceItemMergeHelper.h * R core/include/Variable/VariableCacheStrategyFactory.h * R core/include/Variable/VariableSingleThresholdCacheStrategy.h * R core/src/Common/MimeTypesDef.cpp * R core/src/Data/DataSeriesUtils.cpp * R core/src/Data/OptionalAxis.cpp * R core/src/Data/SpectrogramSeries.cpp * R core/src/DataSource/DataSourceItemMergeHelper.cpp * R core/tests-resources/TestDataSeriesUtils/TestThresholds.txt * R core/tests/Data/DataSeriesBuilders.cpp * R core/tests/Data/DataSeriesBuilders.h * R core/tests/Data/DataSeriesTestsUtils.cpp * R core/tests/Data/DataSeriesTestsUtils.h * R core/tests/Data/TestOptionalAxis.cpp * R core/tests/Data/TestScalarSeries.cpp * R core/tests/Data/TestSpectrogramSeries.cpp * R core/tests/Data/TestVectorSeries.cpp * R core/tests/DataSource/DataSourceItemBuilder.cpp * R core/tests/DataSource/DataSourceItemBuilder.h * R core/tests/DataSource/TestDataSourceItem.cpp * R core/tests/Variable/TestVariableSync.cpp * R extern/CatalogueAPI.cmake * R gui/include/Actions/ActionsGuiController.h * R gui/include/Actions/SelectionZoneAction.h * R gui/include/Catalogue/CatalogueExplorer.h * R gui/include/Catalogue/CatalogueInspectorWidget.h * R gui/include/Catalogue/CatalogueSideBarWidget.h * R gui/include/Common/VisualizationDef.h * R gui/include/DataSource/DataSourceTreeWidget.h * R gui/include/DragAndDrop/DragDropGuiController.h * R gui/include/DragAndDrop/DragDropScroller.h * R gui/include/DragAndDrop/DragDropTabSwitcher.h * R gui/include/Variable/VariableInspectorTableView.h * R gui/include/Visualization/AxisRenderingUtils.h * R gui/include/Visualization/ColorScaleEditor.h * R gui/include/Visualization/MacScrollBarStyle.h * R gui/include/Visualization/PlottablesRenderingUtils.h * R gui/include/Visualization/QCPColorMapIterator.h * R gui/include/Visualization/SqpColorScale.h * R gui/include/Visualization/VisualizationActionManager.h * R gui/include/Visualization/VisualizationCursorItem.h * R gui/include/Visualization/VisualizationDragDropContainer.h * R gui/include/Visualization/VisualizationDragWidget.h * R gui/include/Visualization/VisualizationMultiZoneSelectionDialog.h * R gui/include/Visualization/VisualizationSelectionZoneItem.h * R gui/include/Visualization/VisualizationSelectionZoneManager.h * R gui/resources/icones/add.png * R gui/resources/icones/allEvents.png * R gui/resources/icones/catalogue.png * R gui/resources/icones/chart.png * R gui/resources/icones/cursor.png * R gui/resources/icones/database.png * R gui/resources/icones/discard.png * R gui/resources/icones/drag.png * R gui/resources/icones/pointer.png * R gui/resources/icones/rectangle.png * R gui/resources/icones/remove.png * R gui/resources/icones/save.png * R gui/resources/icones/time.png * R gui/resources/icones/trash.png * R gui/resources/icones/zoom.png * R gui/src/Actions/ActionsGuiController.cpp * R gui/src/Actions/SelectionZoneAction.cpp * R gui/src/Catalogue/CatalogueInspectorWidget.cpp * R gui/src/Common/VisualizationDef.cpp * R gui/src/DataSource/DataSourceTreeWidget.cpp * R gui/src/DragAndDrop/DragDropGuiController.cpp * R gui/src/DragAndDrop/DragDropScroller.cpp * R gui/src/DragAndDrop/DragDropTabSwitcher.cpp * R gui/src/Variable/VariableInspectorTableView.cpp * R gui/src/Visualization/AxisRenderingUtils.cpp * R gui/src/Visualization/ColorScaleEditor.cpp * R gui/src/Visualization/MacScrollBarStyle.cpp * R gui/src/Visualization/PlottablesRenderingUtils.cpp * R gui/src/Visualization/QCPColorMapIterator.cpp * R gui/src/Visualization/SqpColorScale.cpp * R gui/src/Visualization/VisualizationCursorItem.cpp * R gui/src/Visualization/VisualizationDragDropContainer.cpp * R gui/src/Visualization/VisualizationDragWidget.cpp * R gui/src/Visualization/VisualizationMultiZoneSelectionDialog.cpp * R gui/src/Visualization/VisualizationSelectionZoneManager.cpp * R gui/ui/Catalogue/CatalogueEventsWidget.ui * R gui/ui/Catalogue/CatalogueExplorer.ui * R gui/ui/Catalogue/CatalogueInspectorWidget.ui * R gui/ui/Catalogue/CatalogueSideBarWidget.ui * R gui/ui/Visualization/ColorScaleEditor.ui * R gui/ui/Visualization/VisualizationMultiZoneSelectionDialog.ui * R plugins/amda/include/AmdaResultParserDefs.h * R plugins/amda/include/AmdaResultParserHelper.h * R plugins/amda/include/AmdaServer.h * R plugins/amda/resources/samples/AmdaSampleV3.json * R plugins/amda/src/AmdaResultParserDefs.cpp * R plugins/amda/src/AmdaResultParserHelper.cpp * R plugins/amda/src/AmdaServer.cpp * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/FileNotFound.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNX.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NoUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/TooManyValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidScalar1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidVector1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongDate.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/InvalidSpectrogramWrongBands.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogram1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogram2.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogram3.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramDataHoles.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramDataHoles2.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramFillValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/spectro/ValidSpectrogramNaNValues.txt * R plugins/amda/vera-exclusions/exclusions.txt * R plugins/mockplugin/include/MockDefs.h * R plugins/mockplugin/src/MockDefs.cpp * R subprojects/CatalogueAPI.wrap * R subprojects/QxOrm.wrap * R .gitignore * R CMakeLists.txt * R app/src/MainWindow.cpp * R app/ui/MainWindow.ui * R cmake/sciqlop_applications.cmake * R cmake/sciqlop_package_qt.cmake * R core/CMakeLists.txt * R core/cmake/Findsciqlop-core.cmake * R core/include/Common/SortUtils.h * R core/include/Data/ArrayData.h * R core/include/Data/DataSeries.h * R core/include/Data/DataSeriesIterator.h * R core/include/Data/IDataSeries.h * R core/include/Data/VariableRequest.h * R core/include/DataSource/DataSourceController.h * R core/include/DataSource/DataSourceItem.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/VariableCacheStrategy.h * R core/include/Variable/VariableController.h * R core/include/Variable/VariableModel.h * R core/meson.build * R core/src/Data/DataSeriesIterator.cpp * R core/src/Data/VectorSeries.cpp * R core/src/DataSource/DataSourceController.cpp * R core/src/DataSource/DataSourceItem.cpp * R core/src/DataSource/DataSourceItemAction.cpp * R core/src/Time/TimeController.cpp * R core/src/Variable/Variable.cpp * R core/src/Variable/VariableAcquisitionWorker.cpp * R core/src/Variable/VariableController.cpp * R core/src/Variable/VariableModel.cpp * R core/tests/Data/TestTwoDimArrayData.cpp * R core/tests/Variable/TestVariable.cpp * R core/tests/meson.build * R gui/CMakeLists.txt * R gui/cmake/Findsciqlop-gui.cmake * R gui/include/DataSource/DataSourceWidget.h * R gui/include/SqpApplication.h * R gui/include/TimeWidget/TimeWidget.h * R gui/include/Visualization/VisualizationGraphHelper.h * R gui/include/Visualization/VisualizationGraphRenderingDelegate.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/resources/sqpguiresources.qrc * R gui/src/DataSource/DataSourceTreeWidgetItem.cpp * R gui/src/DataSource/DataSourceWidget.cpp * R gui/src/SqpApplication.cpp * R gui/src/TimeWidget/TimeWidget.cpp * R gui/src/Variable/VariableInspectorWidget.cpp * R gui/src/Visualization/VisualizationGraphHelper.cpp * R gui/src/Visualization/VisualizationGraphRenderingDelegate.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/RescaleAxeOperation.cpp * R gui/ui/DataSource/DataSourceWidget.ui * R gui/ui/TimeWidget/TimeWidget.ui * R gui/ui/Variable/VariableInspectorWidget.ui * R gui/ui/Visualization/VisualizationTabWidget.ui * R gui/ui/Visualization/VisualizationZoneWidget.ui * R gui/vera-exclusions/exclusions.txt * R meson.build * R plugins/amda/CMakeLists.txt * R plugins/amda/cmake/Findsciqlop-amda.cmake * R plugins/amda/include/AmdaDefs.h * R plugins/amda/include/AmdaPlugin.h * R plugins/amda/include/AmdaProvider.h * R plugins/amda/include/AmdaResultParser.h * R plugins/amda/meson.build * R plugins/amda/resources/amdaresources.qrc * R plugins/amda/src/AmdaDefs.cpp * R plugins/amda/src/AmdaPlugin.cpp * R plugins/amda/src/AmdaProvider.cpp * R plugins/amda/src/AmdaResultParser.cpp * R plugins/amda/tests/TestAmdaAcquisition.cpp * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/CosinusProvider.h * R plugins/mockplugin/meson.build * R plugins/mockplugin/src/CosinusProvider.cpp * R plugins/mockplugin/src/MockPlugin.cpp * R plugins/mockplugin/tests/TestCosinusAcquisition.cpp * R core/src/Variable/VariableCacheStrategy.cpp * R core/tests/Data/TestDataSeries.cpp
Status change > Approved
You need to be logged in to leave comments.
Login now