##// END OF EJS Templates
Merge pull request 265 from SCIQLOP develop...
leroux -
r722:5b0f9491c554 merge
parent child
Show More
@@ -1,7 +1,6
1
1
2 core_moc_headers = [
2 core_moc_headers = [
3 'include/Data/IDataProvider.h',
3 'include/Data/IDataProvider.h',
4 'include/Data/DataSeriesMergeHelper.h',
5 'include/DataSource/DataSourceController.h',
4 'include/DataSource/DataSourceController.h',
6 'include/DataSource/DataSourceItemAction.h',
5 'include/DataSource/DataSourceItemAction.h',
7 'include/Network/NetworkController.h',
6 'include/Network/NetworkController.h',
@@ -29,12 +29,10 std::vector<double> flatten(std::vector<double> xValues, std::vector<double> yVa
29
29
30 auto result = std::vector<double>();
30 auto result = std::vector<double>();
31 result.reserve(xValues.size() * 3);
31 result.reserve(xValues.size() * 3);
32
32 for (int i = 0; i < xValues.size(); i++) {
33 while (!xValues.empty()) {
33 result.push_back(xValues[i]);
34 result.insert(result.cend(), {xValues.front(), yValues.front(), zValues.front()});
34 result.push_back(yValues[i]);
35 xValues.erase(xValues.begin());
35 result.push_back(zValues[i]);
36 yValues.erase(yValues.begin());
37 zValues.erase(zValues.begin());
38 }
36 }
39
37
40 return result;
38 return result;
@@ -48,7 +48,7 gui_sources = [
48 'src/TimeWidget/TimeWidget.cpp',
48 'src/TimeWidget/TimeWidget.cpp',
49 'src/Variable/VariableInspectorWidget.cpp',
49 'src/Variable/VariableInspectorWidget.cpp',
50 'src/Variable/VariableMenuHeaderWidget.cpp',
50 'src/Variable/VariableMenuHeaderWidget.cpp',
51 'src/Variable/RenamevariableDialog.cpp',
51 'src/Variable/RenameVariableDialog.cpp',
52 'src/Visualization/VisualizationGraphHelper.cpp',
52 'src/Visualization/VisualizationGraphHelper.cpp',
53 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
53 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
54 'src/Visualization/VisualizationGraphWidget.cpp',
54 'src/Visualization/VisualizationGraphWidget.cpp',
General Comments 0
You need to be logged in to leave comments. Login now