##// END OF EJS Templates
Merge pull request 320 from SciQLop-fork develop...
trabillard -
r857:28a24a49f721 merge
parent child
Show More
@@ -21,6 +21,7 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
21 core_sources = [
21 core_sources = [
22 'src/Common/DateUtils.cpp',
22 'src/Common/DateUtils.cpp',
23 'src/Common/StringUtils.cpp',
23 'src/Common/StringUtils.cpp',
24 'src/Common/MimeTypesDef.cpp',
24 'src/Data/ScalarSeries.cpp',
25 'src/Data/ScalarSeries.cpp',
25 'src/Data/DataSeriesIterator.cpp',
26 'src/Data/DataSeriesIterator.cpp',
26 'src/Data/ArrayDataIterator.cpp',
27 'src/Data/ArrayDataIterator.cpp',
@@ -5,6 +5,7 gui_moc_headers = [
5 'include/Settings/SqpSettingsGeneralWidget.h',
5 'include/Settings/SqpSettingsGeneralWidget.h',
6 'include/SidePane/SqpSidePane.h',
6 'include/SidePane/SqpSidePane.h',
7 'include/SqpApplication.h',
7 'include/SqpApplication.h',
8 'include/DragDropHelper.h',
8 'include/TimeWidget/TimeWidget.h',
9 'include/TimeWidget/TimeWidget.h',
9 'include/Variable/VariableInspectorWidget.h',
10 'include/Variable/VariableInspectorWidget.h',
10 'include/Variable/RenameVariableDialog.h',
11 'include/Variable/RenameVariableDialog.h',
@@ -12,7 +13,9 gui_moc_headers = [
12 'include/Visualization/VisualizationGraphWidget.h',
13 'include/Visualization/VisualizationGraphWidget.h',
13 'include/Visualization/VisualizationTabWidget.h',
14 'include/Visualization/VisualizationTabWidget.h',
14 'include/Visualization/VisualizationWidget.h',
15 'include/Visualization/VisualizationWidget.h',
15 'include/Visualization/VisualizationZoneWidget.h'
16 'include/Visualization/VisualizationZoneWidget.h',
17 'include/Visualization/VisualizationDragDropContainer.h',
18 'include/Visualization/VisualizationDragWidget.h'
16 ]
19 ]
17
20
18 gui_ui_files = [
21 gui_ui_files = [
@@ -38,7 +41,9 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
38
41
39 gui_sources = [
42 gui_sources = [
40 'src/SqpApplication.cpp',
43 'src/SqpApplication.cpp',
44 'src/DragDropHelper.cpp',
41 'src/Common/ColorUtils.cpp',
45 'src/Common/ColorUtils.cpp',
46 'src/Common/VisualizationDef.cpp',
42 'src/DataSource/DataSourceTreeWidgetItem.cpp',
47 'src/DataSource/DataSourceTreeWidgetItem.cpp',
43 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
48 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
44 'src/DataSource/DataSourceWidget.cpp',
49 'src/DataSource/DataSourceWidget.cpp',
@@ -61,7 +66,9 gui_sources = [
61 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
66 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
62 'src/Visualization/operations/MenuBuilder.cpp',
67 'src/Visualization/operations/MenuBuilder.cpp',
63 'src/Visualization/operations/RemoveVariableOperation.cpp',
68 'src/Visualization/operations/RemoveVariableOperation.cpp',
64 'src/Visualization/operations/RescaleAxeOperation.cpp'
69 'src/Visualization/operations/RescaleAxeOperation.cpp',
70 'src/Visualization/VisualizationDragDropContainer.cpp',
71 'src/Visualization/VisualizationDragWidget.cpp'
65 ]
72 ]
66
73
67 gui_inc = include_directories(['include'])
74 gui_inc = include_directories(['include'])
@@ -16,6 +16,12
16 <layout class="QGridLayout" name="gridLayout">
16 <layout class="QGridLayout" name="gridLayout">
17 <item row="0" column="0">
17 <item row="0" column="0">
18 <widget class="QTableView" name="tableView">
18 <widget class="QTableView" name="tableView">
19 <property name="dragEnabled">
20 <bool>true</bool>
21 </property>
22 <property name="dragDropMode">
23 <enum>QAbstractItemView::DragDrop</enum>
24 </property>
19 <property name="sortingEnabled">
25 <property name="sortingEnabled">
20 <bool>true</bool>
26 <bool>true</bool>
21 </property>
27 </property>
General Comments 0
You need to be logged in to leave comments. Login now