##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge pull request 295 from SCIQLOP-Initialisation-fork nico...
perrinel -
r731:69c31b995f88 merge develop
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,11 +1,12
1 1 #!/bin/bash
2 2
3 3 mkdir -p ${MESON_INSTALL_PREFIX}/Contents/Frameworks
4 4 mv ${MESON_INSTALL_PREFIX}/lib/*plugin* ${MESON_INSTALL_PREFIX}/Contents/MacOS
5 5 macdeployqt ${MESON_INSTALL_PREFIX} -verbose=3
6 6 install_name_tool -change @rpath/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore /tmp/SciQLOP.app/Contents/MacOS/sciqlop
7 7 install_name_tool -change @rpath/QtPrintSupport.framework/Versions/5/QtPrintSupport @executable_path/../Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport /tmp/SciQLOP.app/Contents/MacOS/sciqlop
8 8 install_name_tool -change @rpath/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui /tmp/SciQLOP.app/Contents/MacOS/sciqlop
9 9 install_name_tool -change @rpath/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets /tmp/SciQLOP.app/Contents/MacOS/sciqlop
10 10 install_name_tool -change @rpath/QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork /tmp/SciQLOP.app/Contents/MacOS/sciqlop
11 install_name_tool -change @rpath/QtSvg.framework/Versions/5/QtSvg @executable_path/../Frameworks/QtSvg.framework/Versions/5/QtSvg /tmp/SciQLOP.app/Contents/MacOS/sciqlop
11 12
Show file before | Show file after | Hide comments
@@ -1,31 +1,32
1 1 #ifndef SCIQLOP_RENAMEVARIABLEDIALOG_H
2 2 #define SCIQLOP_RENAMEVARIABLEDIALOG_H
3 3
4 4 #include <QDialog>
5 5
6 6 namespace Ui {
7 7 class RenameVariableDialog;
8 8 } // Ui
9 9
10 10 /**
11 11 * @brief The RenameVariableDialog class represents the dialog to rename a variable
12 12 */
13 13 class RenameVariableDialog : public QDialog {
14 Q_OBJECT
14 15 public:
15 16 explicit RenameVariableDialog(const QString &defaultName,
16 17 const QVector<QString> &forbiddenNames,
17 18 QWidget *parent = nullptr);
18 19 virtual ~RenameVariableDialog() noexcept;
19 20
20 21 QString name() const noexcept;
21 22
22 23 public slots:
23 24 void accept() override;
24 25
25 26 private:
26 27 Ui::RenameVariableDialog *ui;
27 28 QString m_DefaultName;
28 29 QVector<QString> m_ForbiddenNames;
29 30 };
30 31
31 32 #endif // SCIQLOP_RENAMEVARIABLEDIALOG_H
Show file before | Show file after | Hide comments
@@ -1,77 +1,80
1 1
2 2 gui_moc_headers = [
3 3 'include/DataSource/DataSourceWidget.h',
4 4 'include/Settings/SqpSettingsDialog.h',
5 5 'include/Settings/SqpSettingsGeneralWidget.h',
6 6 'include/SidePane/SqpSidePane.h',
7 7 'include/SqpApplication.h',
8 8 'include/TimeWidget/TimeWidget.h',
9 9 'include/Variable/VariableInspectorWidget.h',
10 'include/Variable/RenameVariableDialog.h',
10 11 'include/Visualization/qcustomplot.h',
11 12 'include/Visualization/VisualizationGraphWidget.h',
12 13 'include/Visualization/VisualizationTabWidget.h',
13 14 'include/Visualization/VisualizationWidget.h',
14 15 'include/Visualization/VisualizationZoneWidget.h'
15 16 ]
16 17
17 18 gui_ui_files = [
18 19 'ui/DataSource/DataSourceWidget.ui',
19 20 'ui/Settings/SqpSettingsDialog.ui',
20 21 'ui/Settings/SqpSettingsGeneralWidget.ui',
21 22 'ui/SidePane/SqpSidePane.ui',
22 23 'ui/TimeWidget/TimeWidget.ui',
23 24 'ui/Variable/VariableInspectorWidget.ui',
25 'ui/Variable/RenameVariableDialog.ui',
24 26 'ui/Variable/VariableMenuHeaderWidget.ui',
25 27 'ui/Visualization/VisualizationGraphWidget.ui',
26 28 'ui/Visualization/VisualizationTabWidget.ui',
27 29 'ui/Visualization/VisualizationWidget.ui',
28 30 'ui/Visualization/VisualizationZoneWidget.ui'
29 31 ]
30 32
31 33 gui_qresources = ['resources/sqpguiresources.qrc']
32 34
33 35 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
34 36 ui_files : gui_ui_files,
35 37 qresources : gui_qresources)
36 38
37 39 gui_sources = [
38 40 'src/SqpApplication.cpp',
39 41 'src/Common/ColorUtils.cpp',
40 42 'src/DataSource/DataSourceTreeWidgetItem.cpp',
41 43 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
42 44 'src/DataSource/DataSourceWidget.cpp',
43 45 'src/Settings/SqpSettingsDialog.cpp',
44 46 'src/Settings/SqpSettingsGeneralWidget.cpp',
45 47 'src/SidePane/SqpSidePane.cpp',
46 48 'src/TimeWidget/TimeWidget.cpp',
47 49 'src/Variable/VariableInspectorWidget.cpp',
48 50 'src/Variable/VariableMenuHeaderWidget.cpp',
51 'src/Variable/RenameVariableDialog.cpp',
49 52 'src/Visualization/VisualizationGraphHelper.cpp',
50 53 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
51 54 'src/Visualization/VisualizationGraphWidget.cpp',
52 55 'src/Visualization/VisualizationTabWidget.cpp',
53 56 'src/Visualization/VisualizationWidget.cpp',
54 57 'src/Visualization/VisualizationZoneWidget.cpp',
55 58 'src/Visualization/qcustomplot.cpp',
56 59 'src/Visualization/QCustomPlotSynchronizer.cpp',
57 60 'src/Visualization/operations/FindVariableOperation.cpp',
58 61 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
59 62 'src/Visualization/operations/MenuBuilder.cpp',
60 63 'src/Visualization/operations/RemoveVariableOperation.cpp',
61 64 'src/Visualization/operations/RescaleAxeOperation.cpp'
62 65 ]
63 66
64 67 gui_inc = include_directories(['include'])
65 68
66 69 sciqlop_gui_lib = library('sciqlopgui',
67 70 gui_sources,
68 71 gui_moc_files,
69 72 include_directories : [gui_inc],
70 73 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
71 74 install : true
72 75 )
73 76
74 77 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
75 78 include_directories : gui_inc,
76 79 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])
77 80
General Comments 0
You need to be logged in to leave comments. Login now