| @@ -1,1 +1,1 | |||||
| 1 | Subproject commit 7c86e13f8a6242eb5fe07f0da91a96a4cf68b5bf |
|
1 | Subproject commit bf13292f0caf950333841131d023ed7cd96a97a2 | |
| @@ -60,6 +60,7 gui_moc_headers = [ | |||||
| 60 | './include/Actions/SelectionZoneAction.h' |
|
60 | './include/Actions/SelectionZoneAction.h' | |
| 61 | ] |
|
61 | ] | |
| 62 |
|
62 | |||
|
|
63 | ||||
| 63 | gui_ui_files = [ |
|
64 | gui_ui_files = [ | |
| 64 | './ui/Settings/SqpSettingsGeneralWidget.ui', |
|
65 | './ui/Settings/SqpSettingsGeneralWidget.ui', | |
| 65 | './ui/Settings/SqpSettingsDialog.ui', |
|
66 | './ui/Settings/SqpSettingsDialog.ui', | |
| @@ -147,7 +148,7 gui_sources = [ | |||||
| 147 | './src/Visualization/SqpColorScale.cpp', |
|
148 | './src/Visualization/SqpColorScale.cpp', | |
| 148 | './src/Actions/FilteringAction.cpp', |
|
149 | './src/Actions/FilteringAction.cpp', | |
| 149 | './src/Actions/SelectionZoneAction.cpp', |
|
150 | './src/Actions/SelectionZoneAction.cpp', | |
| 150 |
'./src/Actions/ActionsGuiController.cpp' |
|
151 | './src/Actions/ActionsGuiController.cpp' | |
| 151 | ] |
|
152 | ] | |
| 152 |
|
153 | |||
| 153 | gui_inc = include_directories(['include', 'include/Visualization']) |
|
154 | gui_inc = include_directories(['include', 'include/Visualization']) | |
| @@ -275,7 +275,6 struct PlottablesUpdater<T, | |||||
| 275 | maxValue = std::max( maxValue, std::max_element(v.begin(), v.end())->v() ); |
|
275 | maxValue = std::max( maxValue, std::max_element(v.begin(), v.end())->v() ); | |
| 276 | }); |
|
276 | }); | |
| 277 | } |
|
277 | } | |
| 278 |
|
||||
| 279 | plot.yAxis->setRange(QCPRange { minValue, maxValue }); |
|
278 | plot.yAxis->setRange(QCPRange { minValue, maxValue }); | |
| 280 | } |
|
279 | } | |
| 281 |
|
280 | |||
| @@ -1,4 +1,3 | |||||
| 1 | #include <Data/DateTimeRange.h> |
|
|||
| 2 |
|
|
1 | #include <TimeSeries.h> | |
| 3 | #include <functional> |
|
2 | #include <functional> | |
| 4 | #include <iostream> |
|
3 | #include <iostream> | |
| @@ -22,16 +22,27 gen = generator(moc, | |||||
| 22 |
|
22 | |||
| 23 | python_providers_moc_files = gen.process(python_providers_moc_headers) |
|
23 | python_providers_moc_files = gen.process(python_providers_moc_headers) | |
| 24 |
|
24 | |||
| 25 |
cpp_args = ['-DPYTHON_PROVIDERS_LIB','-DQT_PLUGIN' |
|
25 | cpp_args = ['-DPYTHON_PROVIDERS_LIB','-DQT_PLUGIN'] | |
| 26 | if(get_option('default_library')=='static') |
|
26 | if(get_option('default_library')=='static') | |
| 27 | cpp_args += ['-DQT_STATICPLUGIN'] |
|
27 | cpp_args += ['-DQT_STATICPLUGIN'] | |
| 28 | endif |
|
28 | endif | |
| 29 |
|
29 | |||
|
|
30 | sciqlop_python_interpreter = library('python_interpreter', | |||
|
|
31 | ['src/python_interpreter.cpp'], | |||
|
|
32 | include_directories : [python_providers_inc], | |||
|
|
33 | dependencies : [pybind11_dep, sciqlop_core], | |||
|
|
34 | cpp_args : ['-DQT_NO_KEYWORDS'], | |||
|
|
35 | install : true, | |||
|
|
36 | install_dir : join_paths(get_option('libdir'), 'SciQLop') | |||
|
|
37 | ) | |||
|
|
38 | ||||
|
|
39 | ||||
| 30 | sciqlop_python_providers = library('pythonproviders', |
|
40 | sciqlop_python_providers = library('pythonproviders', | |
| 31 | python_providers_sources, |
|
41 | python_providers_sources, | |
| 32 | python_providers_moc_files, |
|
42 | python_providers_moc_files, | |
| 33 | cpp_args : cpp_args, |
|
43 | cpp_args : cpp_args, | |
| 34 | include_directories : [python_providers_inc], |
|
44 | include_directories : [python_providers_inc], | |
|
|
45 | link_with : [sciqlop_python_interpreter], | |||
| 35 | dependencies : [sciqlop_core, sciqlop_gui, pybind11_dep], |
|
46 | dependencies : [sciqlop_core, sciqlop_gui, pybind11_dep], | |
| 36 | install : true, |
|
47 | install : true, | |
| 37 | install_dir : join_paths(get_option('libdir'), 'SciQLop') |
|
48 | install_dir : join_paths(get_option('libdir'), 'SciQLop') | |
General Comments 0
You need to be logged in to leave comments.
Login now