Auto status change to "Under Review"
@@ -1,67 +1,65 | |||||
1 |
|
1 | |||
2 | core_moc_headers = [ |
|
2 | core_moc_headers = [ | |
3 | 'include/Data/IDataProvider.h', |
|
3 | 'include/Data/IDataProvider.h', | |
4 | 'include/DataSource/DataSourceController.h', |
|
4 | 'include/DataSource/DataSourceController.h', | |
5 | 'include/DataSource/DataSourceItemAction.h', |
|
5 | 'include/DataSource/DataSourceItemAction.h', | |
6 | 'include/DataSource/DataSourceWidget.h', |
|
|||
7 | 'include/Network/NetworkController.h', |
|
6 | 'include/Network/NetworkController.h', | |
8 | 'include/Time/TimeController.h', |
|
7 | 'include/Time/TimeController.h', | |
9 | 'include/Variable/Variable.h', |
|
8 | 'include/Variable/Variable.h', | |
10 | 'include/Variable/VariableCacheController.h', |
|
9 | 'include/Variable/VariableCacheController.h', | |
11 | 'include/Variable/VariableController.h', |
|
10 | 'include/Variable/VariableController.h', | |
12 | 'include/Variable/VariableAcquisitionWorker.h', |
|
11 | 'include/Variable/VariableAcquisitionWorker.h', | |
13 | 'include/Variable/VariableCacheStrategy.h', |
|
12 | 'include/Variable/VariableCacheStrategy.h', | |
14 | 'include/Variable/VariableSynchronizationGroup.h', |
|
13 | 'include/Variable/VariableSynchronizationGroup.h', | |
15 | 'include/Variable/VariableModel.h', |
|
14 | 'include/Variable/VariableModel.h', | |
16 | 'include/Visualization/VisualizationController.h' |
|
15 | 'include/Visualization/VisualizationController.h' | |
17 | ] |
|
16 | ] | |
18 |
|
17 | |||
19 |
|
18 | |||
20 | core_moc_files = qt5.preprocess(moc_headers : core_moc_headers) |
|
19 | core_moc_files = qt5.preprocess(moc_headers : core_moc_headers) | |
21 |
|
20 | |||
22 | core_sources = [ |
|
21 | core_sources = [ | |
23 | 'src/Common/DateUtils.cpp', |
|
22 | 'src/Common/DateUtils.cpp', | |
24 | 'src/Common/StringUtils.cpp', |
|
23 | 'src/Common/StringUtils.cpp', | |
25 | 'src/Common/MimeTypesDef.cpp', |
|
24 | 'src/Common/MimeTypesDef.cpp', | |
26 | 'src/Data/ScalarSeries.cpp', |
|
25 | 'src/Data/ScalarSeries.cpp', | |
27 | 'src/Data/SpectrogramSeries.cpp', |
|
26 | 'src/Data/SpectrogramSeries.cpp', | |
28 | 'src/Data/DataSeriesIterator.cpp', |
|
27 | 'src/Data/DataSeriesIterator.cpp', | |
29 | 'src/Data/ArrayDataIterator.cpp', |
|
28 | 'src/Data/ArrayDataIterator.cpp', | |
30 | 'src/Data/VectorSeries.cpp', |
|
29 | 'src/Data/VectorSeries.cpp', | |
31 | 'src/Data/OptionalAxis.cpp', |
|
30 | 'src/Data/OptionalAxis.cpp', | |
32 | 'src/DataSource/DataSourceController.cpp', |
|
31 | 'src/DataSource/DataSourceController.cpp', | |
33 | 'src/DataSource/DataSourceItem.cpp', |
|
32 | 'src/DataSource/DataSourceItem.cpp', | |
34 | 'src/DataSource/DataSourceItemAction.cpp', |
|
33 | 'src/DataSource/DataSourceItemAction.cpp', | |
35 | 'src/DataSource/DataSourceWidget.cpp', |
|
|||
36 | 'src/Network/NetworkController.cpp', |
|
34 | 'src/Network/NetworkController.cpp', | |
37 | 'src/Plugin/PluginManager.cpp', |
|
35 | 'src/Plugin/PluginManager.cpp', | |
38 | 'src/Settings/SqpSettingsDefs.cpp', |
|
36 | 'src/Settings/SqpSettingsDefs.cpp', | |
39 | 'src/Time/TimeController.cpp', |
|
37 | 'src/Time/TimeController.cpp', | |
40 | 'src/Variable/Variable.cpp', |
|
38 | 'src/Variable/Variable.cpp', | |
41 | 'src/Variable/VariableCacheController.cpp', |
|
39 | 'src/Variable/VariableCacheController.cpp', | |
42 | 'src/Variable/VariableController.cpp', |
|
40 | 'src/Variable/VariableController.cpp', | |
43 | 'src/Variable/VariableAcquisitionWorker.cpp', |
|
41 | 'src/Variable/VariableAcquisitionWorker.cpp', | |
44 | 'src/Variable/VariableSynchronizationGroup.cpp', |
|
42 | 'src/Variable/VariableSynchronizationGroup.cpp', | |
45 | 'src/Variable/VariableModel.cpp', |
|
43 | 'src/Variable/VariableModel.cpp', | |
46 | 'src/Visualization/VisualizationController.cpp' |
|
44 | 'src/Visualization/VisualizationController.cpp' | |
47 | ] |
|
45 | ] | |
48 |
|
46 | |||
49 | core_inc = include_directories(['include', '../plugin/include']) |
|
47 | core_inc = include_directories(['include', '../plugin/include']) | |
50 |
|
48 | |||
51 | sciqlop_core_lib = library('sciqlopcore', |
|
49 | sciqlop_core_lib = library('sciqlopcore', | |
52 | core_sources, |
|
50 | core_sources, | |
53 | core_moc_files, |
|
51 | core_moc_files, | |
54 | cpp_args : '-DCORE_LIB', |
|
52 | cpp_args : '-DCORE_LIB', | |
55 | include_directories : core_inc, |
|
53 | include_directories : core_inc, | |
56 | dependencies : [qt5core, qt5network], |
|
54 | dependencies : [qt5core, qt5network], | |
57 | install : true |
|
55 | install : true | |
58 | ) |
|
56 | ) | |
59 |
|
57 | |||
60 |
|
58 | |||
61 | sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, |
|
59 | sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, | |
62 | include_directories : core_inc, |
|
60 | include_directories : core_inc, | |
63 | dependencies : [qt5core, qt5network]) |
|
61 | dependencies : [qt5core, qt5network]) | |
64 |
|
62 | |||
65 |
|
63 | |||
66 | subdir('tests') |
|
64 | subdir('tests') | |
67 |
|
65 |
@@ -1,89 +1,91 | |||||
1 |
|
1 | |||
2 | gui_moc_headers = [ |
|
2 | gui_moc_headers = [ | |
3 | 'include/DataSource/DataSourceWidget.h', |
|
3 | 'include/DataSource/DataSourceWidget.h', | |
|
4 | 'include/DataSource/DataSourceTreeWidget.h', | |||
4 | 'include/Settings/SqpSettingsDialog.h', |
|
5 | 'include/Settings/SqpSettingsDialog.h', | |
5 | 'include/Settings/SqpSettingsGeneralWidget.h', |
|
6 | 'include/Settings/SqpSettingsGeneralWidget.h', | |
6 | 'include/SidePane/SqpSidePane.h', |
|
7 | 'include/SidePane/SqpSidePane.h', | |
7 | 'include/SqpApplication.h', |
|
8 | 'include/SqpApplication.h', | |
8 | 'include/DragDropHelper.h', |
|
9 | 'include/DragDropHelper.h', | |
9 | 'include/TimeWidget/TimeWidget.h', |
|
10 | 'include/TimeWidget/TimeWidget.h', | |
10 | 'include/Variable/VariableInspectorWidget.h', |
|
11 | 'include/Variable/VariableInspectorWidget.h', | |
11 | 'include/Variable/VariableInspectorTableView.h', |
|
12 | 'include/Variable/VariableInspectorTableView.h', | |
12 | 'include/Variable/RenameVariableDialog.h', |
|
13 | 'include/Variable/RenameVariableDialog.h', | |
13 | 'include/Visualization/qcustomplot.h', |
|
14 | 'include/Visualization/qcustomplot.h', | |
14 | 'include/Visualization/VisualizationGraphWidget.h', |
|
15 | 'include/Visualization/VisualizationGraphWidget.h', | |
15 | 'include/Visualization/VisualizationTabWidget.h', |
|
16 | 'include/Visualization/VisualizationTabWidget.h', | |
16 | 'include/Visualization/VisualizationWidget.h', |
|
17 | 'include/Visualization/VisualizationWidget.h', | |
17 | 'include/Visualization/VisualizationZoneWidget.h', |
|
18 | 'include/Visualization/VisualizationZoneWidget.h', | |
18 | 'include/Visualization/VisualizationDragDropContainer.h', |
|
19 | 'include/Visualization/VisualizationDragDropContainer.h', | |
19 | 'include/Visualization/VisualizationDragWidget.h' |
|
20 | 'include/Visualization/VisualizationDragWidget.h' | |
20 | ] |
|
21 | ] | |
21 |
|
22 | |||
22 | gui_ui_files = [ |
|
23 | gui_ui_files = [ | |
23 | 'ui/DataSource/DataSourceWidget.ui', |
|
24 | 'ui/DataSource/DataSourceWidget.ui', | |
24 | 'ui/Settings/SqpSettingsDialog.ui', |
|
25 | 'ui/Settings/SqpSettingsDialog.ui', | |
25 | 'ui/Settings/SqpSettingsGeneralWidget.ui', |
|
26 | 'ui/Settings/SqpSettingsGeneralWidget.ui', | |
26 | 'ui/SidePane/SqpSidePane.ui', |
|
27 | 'ui/SidePane/SqpSidePane.ui', | |
27 | 'ui/TimeWidget/TimeWidget.ui', |
|
28 | 'ui/TimeWidget/TimeWidget.ui', | |
28 | 'ui/Variable/VariableInspectorWidget.ui', |
|
29 | 'ui/Variable/VariableInspectorWidget.ui', | |
29 | 'ui/Variable/RenameVariableDialog.ui', |
|
30 | 'ui/Variable/RenameVariableDialog.ui', | |
30 | 'ui/Variable/VariableMenuHeaderWidget.ui', |
|
31 | 'ui/Variable/VariableMenuHeaderWidget.ui', | |
31 | 'ui/Visualization/VisualizationGraphWidget.ui', |
|
32 | 'ui/Visualization/VisualizationGraphWidget.ui', | |
32 | 'ui/Visualization/VisualizationTabWidget.ui', |
|
33 | 'ui/Visualization/VisualizationTabWidget.ui', | |
33 | 'ui/Visualization/VisualizationWidget.ui', |
|
34 | 'ui/Visualization/VisualizationWidget.ui', | |
34 | 'ui/Visualization/VisualizationZoneWidget.ui' |
|
35 | 'ui/Visualization/VisualizationZoneWidget.ui' | |
35 | ] |
|
36 | ] | |
36 |
|
37 | |||
37 | gui_qresources = ['resources/sqpguiresources.qrc'] |
|
38 | gui_qresources = ['resources/sqpguiresources.qrc'] | |
38 |
|
39 | |||
39 | gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers, |
|
40 | gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers, | |
40 | ui_files : gui_ui_files, |
|
41 | ui_files : gui_ui_files, | |
41 | qresources : gui_qresources) |
|
42 | qresources : gui_qresources) | |
42 |
|
43 | |||
43 | gui_sources = [ |
|
44 | gui_sources = [ | |
44 | 'src/SqpApplication.cpp', |
|
45 | 'src/SqpApplication.cpp', | |
45 | 'src/DragDropHelper.cpp', |
|
46 | 'src/DragDropHelper.cpp', | |
46 | 'src/Common/ColorUtils.cpp', |
|
47 | 'src/Common/ColorUtils.cpp', | |
47 | 'src/Common/VisualizationDef.cpp', |
|
48 | 'src/Common/VisualizationDef.cpp', | |
48 | 'src/DataSource/DataSourceTreeWidgetItem.cpp', |
|
49 | 'src/DataSource/DataSourceTreeWidgetItem.cpp', | |
49 | 'src/DataSource/DataSourceTreeWidgetHelper.cpp', |
|
50 | 'src/DataSource/DataSourceTreeWidgetHelper.cpp', | |
50 | 'src/DataSource/DataSourceWidget.cpp', |
|
51 | 'src/DataSource/DataSourceWidget.cpp', | |
|
52 | 'src/DataSource/DataSourceTreeWidget.cpp', | |||
51 | 'src/Settings/SqpSettingsDialog.cpp', |
|
53 | 'src/Settings/SqpSettingsDialog.cpp', | |
52 | 'src/Settings/SqpSettingsGeneralWidget.cpp', |
|
54 | 'src/Settings/SqpSettingsGeneralWidget.cpp', | |
53 | 'src/SidePane/SqpSidePane.cpp', |
|
55 | 'src/SidePane/SqpSidePane.cpp', | |
54 | 'src/TimeWidget/TimeWidget.cpp', |
|
56 | 'src/TimeWidget/TimeWidget.cpp', | |
55 | 'src/Variable/VariableInspectorWidget.cpp', |
|
57 | 'src/Variable/VariableInspectorWidget.cpp', | |
56 | 'src/Variable/VariableInspectorTableView.cpp', |
|
58 | 'src/Variable/VariableInspectorTableView.cpp', | |
57 | 'src/Variable/VariableMenuHeaderWidget.cpp', |
|
59 | 'src/Variable/VariableMenuHeaderWidget.cpp', | |
58 | 'src/Variable/RenameVariableDialog.cpp', |
|
60 | 'src/Variable/RenameVariableDialog.cpp', | |
59 | 'src/Visualization/VisualizationGraphHelper.cpp', |
|
61 | 'src/Visualization/VisualizationGraphHelper.cpp', | |
60 | 'src/Visualization/VisualizationGraphRenderingDelegate.cpp', |
|
62 | 'src/Visualization/VisualizationGraphRenderingDelegate.cpp', | |
61 | 'src/Visualization/VisualizationGraphWidget.cpp', |
|
63 | 'src/Visualization/VisualizationGraphWidget.cpp', | |
62 | 'src/Visualization/VisualizationTabWidget.cpp', |
|
64 | 'src/Visualization/VisualizationTabWidget.cpp', | |
63 | 'src/Visualization/VisualizationWidget.cpp', |
|
65 | 'src/Visualization/VisualizationWidget.cpp', | |
64 | 'src/Visualization/VisualizationZoneWidget.cpp', |
|
66 | 'src/Visualization/VisualizationZoneWidget.cpp', | |
65 | 'src/Visualization/qcustomplot.cpp', |
|
67 | 'src/Visualization/qcustomplot.cpp', | |
66 | 'src/Visualization/QCustomPlotSynchronizer.cpp', |
|
68 | 'src/Visualization/QCustomPlotSynchronizer.cpp', | |
67 | 'src/Visualization/operations/FindVariableOperation.cpp', |
|
69 | 'src/Visualization/operations/FindVariableOperation.cpp', | |
68 | 'src/Visualization/operations/GenerateVariableMenuOperation.cpp', |
|
70 | 'src/Visualization/operations/GenerateVariableMenuOperation.cpp', | |
69 | 'src/Visualization/operations/MenuBuilder.cpp', |
|
71 | 'src/Visualization/operations/MenuBuilder.cpp', | |
70 | 'src/Visualization/operations/RemoveVariableOperation.cpp', |
|
72 | 'src/Visualization/operations/RemoveVariableOperation.cpp', | |
71 | 'src/Visualization/operations/RescaleAxeOperation.cpp', |
|
73 | 'src/Visualization/operations/RescaleAxeOperation.cpp', | |
72 | 'src/Visualization/VisualizationDragDropContainer.cpp', |
|
74 | 'src/Visualization/VisualizationDragDropContainer.cpp', | |
73 | 'src/Visualization/VisualizationDragWidget.cpp' |
|
75 | 'src/Visualization/VisualizationDragWidget.cpp' | |
74 | ] |
|
76 | ] | |
75 |
|
77 | |||
76 | gui_inc = include_directories(['include']) |
|
78 | gui_inc = include_directories(['include']) | |
77 |
|
79 | |||
78 | sciqlop_gui_lib = library('sciqlopgui', |
|
80 | sciqlop_gui_lib = library('sciqlopgui', | |
79 | gui_sources, |
|
81 | gui_sources, | |
80 | gui_moc_files, |
|
82 | gui_moc_files, | |
81 | include_directories : [gui_inc], |
|
83 | include_directories : [gui_inc], | |
82 | dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core], |
|
84 | dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core], | |
83 | install : true |
|
85 | install : true | |
84 | ) |
|
86 | ) | |
85 |
|
87 | |||
86 | sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib, |
|
88 | sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib, | |
87 | include_directories : gui_inc, |
|
89 | include_directories : gui_inc, | |
88 | dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core]) |
|
90 | dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core]) | |
89 |
|
91 |
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * A core/tests/meson.build
You need to be logged in to leave comments.
Login now