Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
64fcd3d7
Commit
64fcd3d7
authored
Jan 10, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Pass target lib includes through cmakes property system
- Rename all ui_*.hh includes to ui_*.h
parent
d8b0aa12
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
64 additions
and
128 deletions
+64
-128
cmake/type.cmake
cmake/type.cmake
+6
-0
libs_required/ACG/CMakeLists.txt
libs_required/ACG/CMakeLists.txt
+4
-0
libs_required/ACG/QtWidgets/QtClippingDialog.hh
libs_required/ACG/QtWidgets/QtClippingDialog.hh
+1
-1
libs_required/ACG/QtWidgets/QtCoordFrameDialog.hh
libs_required/ACG/QtWidgets/QtCoordFrameDialog.hh
+1
-1
libs_required/ACG/QtWidgets/QtMaterialDialog.cc
libs_required/ACG/QtWidgets/QtMaterialDialog.cc
+3
-9
libs_required/ACG/QtWidgets/QtMaterialDialog.hh
libs_required/ACG/QtWidgets/QtMaterialDialog.hh
+2
-15
libs_required/ACG/QtWidgets/QtPrincipalAxisDialog.hh
libs_required/ACG/QtWidgets/QtPrincipalAxisDialog.hh
+1
-1
libs_required/ACG/QtWidgets/QtSceneGraphWidget.cc
libs_required/ACG/QtWidgets/QtSceneGraphWidget.cc
+2
-10
libs_required/ACG/QtWidgets/QtShaderDialog.hh
libs_required/ACG/QtWidgets/QtShaderDialog.hh
+1
-1
libs_required/ACG/QtWidgets/QtTextureDialog.hh
libs_required/ACG/QtWidgets/QtTextureDialog.hh
+1
-1
widgets/PluginDialog/PluginDialog.cc
widgets/PluginDialog/PluginDialog.cc
+3
-0
widgets/PluginDialog/PluginDialog.hh
widgets/PluginDialog/PluginDialog.hh
+1
-3
widgets/aboutWidget/aboutWidget.cc
widgets/aboutWidget/aboutWidget.cc
+2
-0
widgets/aboutWidget/aboutWidget.hh
widgets/aboutWidget/aboutWidget.hh
+1
-4
widgets/addEmptyWidget/addEmptyWidget.hh
widgets/addEmptyWidget/addEmptyWidget.hh
+2
-11
widgets/helpWidget/helpWidget.hh
widgets/helpWidget/helpWidget.hh
+1
-11
widgets/optionsWidget/downloader.cc
widgets/optionsWidget/downloader.cc
+1
-0
widgets/optionsWidget/keyBindings.cc
widgets/optionsWidget/keyBindings.cc
+1
-0
widgets/optionsWidget/optionsWidget.cc
widgets/optionsWidget/optionsWidget.cc
+3
-0
widgets/optionsWidget/optionsWidget.hh
widgets/optionsWidget/optionsWidget.hh
+1
-3
widgets/postProcessorWidget/postProcessorWidget.hh
widgets/postProcessorWidget/postProcessorWidget.hh
+2
-4
widgets/processManagerWidget/BlockingWidget.hh
widgets/processManagerWidget/BlockingWidget.hh
+2
-0
widgets/processManagerWidget/processManagerWidget.hh
widgets/processManagerWidget/processManagerWidget.hh
+3
-9
widgets/rendererWidget/rendererObjectWidget.hh
widgets/rendererWidget/rendererObjectWidget.hh
+3
-2
widgets/rendererWidget/rendererWidget.hh
widgets/rendererWidget/rendererWidget.hh
+4
-4
widgets/snapshotDialog/SnapshotDialog.cc
widgets/snapshotDialog/SnapshotDialog.cc
+3
-0
widgets/snapshotDialog/SnapshotDialog.hh
widgets/snapshotDialog/SnapshotDialog.hh
+1
-3
widgets/stereoSettingsWidget/stereoSettingsWidget.hh
widgets/stereoSettingsWidget/stereoSettingsWidget.hh
+1
-10
widgets/videoCaptureDialog/VideoCaptureDialog.cc
widgets/videoCaptureDialog/VideoCaptureDialog.cc
+2
-0
widgets/videoCaptureDialog/VideoCaptureDialog.hh
widgets/videoCaptureDialog/VideoCaptureDialog.hh
+1
-4
widgets/viewModeWidget/viewModeChangeWidget.hh
widgets/viewModeWidget/viewModeChangeWidget.hh
+2
-10
widgets/viewModeWidget/viewModeWidget.hh
widgets/viewModeWidget/viewModeWidget.hh
+2
-11
No files found.
cmake/type.cmake
View file @
64fcd3d7
...
...
@@ -64,6 +64,12 @@ acg_drop_templates (sources)
acg_add_library
(
${
TYPENAME
}
SHARED
${
ui
}
${
sources
}
${
headers
}
)
set_target_properties
(
${
TYPENAME
}
PROPERTIES MACOSX_RPATH 0
)
# Allow targets depending on ACG find the autogenerated header files
target_include_directories
(
${
TYPENAME
}
PUBLIC
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TYPENAME
}
_autogen/include
)
add_dependencies
(
${
TYPENAME
}
OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib
)
...
...
libs_required/ACG/CMakeLists.txt
View file @
64fcd3d7
...
...
@@ -137,6 +137,10 @@ acg_print_configure_header (ACG "ACG")
RECURSE_GROUPS
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
# Allow targets depending on ACG find the autogenerated header files
target_include_directories
(
ACG PUBLIC
${
CMAKE_CURRENT_BINARY_DIR
}
/ACG_autogen/include
)
target_link_libraries
(
ACG
${
OPENMESH_LIBRARIES
}
${
QT_LIBRARIES
}
${
OPENGL_LIBRARIES
}
...
...
libs_required/ACG/QtWidgets/QtClippingDialog.hh
View file @
64fcd3d7
...
...
@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtClippingDialogUi.h
h
"
#include "ui_QtClippingDialogUi.h"
#include "../Config/ACGDefines.hh"
#include <QDialog>
...
...
libs_required/ACG/QtWidgets/QtCoordFrameDialog.hh
View file @
64fcd3d7
...
...
@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtCoordFrameDialogUi.h
h
"
#include "ui_QtCoordFrameDialogUi.h"
#include "../Math/VectorT.hh"
#include <vector>
...
...
libs_required/ACG/QtWidgets/QtMaterialDialog.cc
View file @
64fcd3d7
...
...
@@ -39,15 +39,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
...
...
@@ -58,10 +49,13 @@
//== INCLUDES =================================================================
#include "QtMaterialDialog.hh"
#include "../Scenegraph/MaterialNode.hh"
//== NAMESPACES ==============================================================
...
...
libs_required/ACG/QtWidgets/QtMaterialDialog.hh
View file @
64fcd3d7
...
...
@@ -39,16 +39,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS QtMaterialDialog
...
...
@@ -56,14 +46,13 @@
//=============================================================================
#ifndef ACG_QTMATERIALDIALOG_HH
#define ACG_QTMATERIALDIALOG_HH
#pragma once
//== INCLUDES =================================================================
#include "ui_QtMaterialDialogUi.h
h
"
#include "ui_QtMaterialDialogUi.h"
#include "../Math/VectorT.hh"
#include "../GL/gl.hh"
...
...
@@ -199,6 +188,4 @@ private:
}
// namespace QtWidgets
}
// namespace ACG
//=============================================================================
#endif // ACG_QTMATERIALDIALOG_HH defined
//=============================================================================
libs_required/ACG/QtWidgets/QtPrincipalAxisDialog.hh
View file @
64fcd3d7
...
...
@@ -54,7 +54,7 @@
// qmake users have to include
#include "ui_QtPrincipalAxisDialogBaseUi.h
h
"
#include "ui_QtPrincipalAxisDialogBaseUi.h"
// ACGMake users have to include
// #include "QtPrincipalAxisDialogBaseUi.hh"
...
...
libs_required/ACG/QtWidgets/QtSceneGraphWidget.cc
View file @
64fcd3d7
...
...
@@ -39,16 +39,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS QtSceneGraphWidget - IMPLEMENTATION
...
...
@@ -71,6 +61,8 @@
#include "../Scenegraph/ShaderNode.hh"
#include "../Scenegraph/CoordFrameNode.hh"
#include "ui_QtMaterialDialogUi.h"
#include <stdint.h>
...
...
libs_required/ACG/QtWidgets/QtShaderDialog.hh
View file @
64fcd3d7
...
...
@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtShaderDialogUi.h
h
"
#include "ui_QtShaderDialogUi.h"
#include "../Config/ACGDefines.hh"
#include <QColor>
...
...
libs_required/ACG/QtWidgets/QtTextureDialog.hh
View file @
64fcd3d7
...
...
@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtTextureDialogUi.h
h
"
#include "ui_QtTextureDialogUi.h"
#include "../Math/VectorT.hh"
#include "../GL/gl.hh"
...
...
widgets/PluginDialog/PluginDialog.cc
View file @
64fcd3d7
...
...
@@ -45,6 +45,9 @@
#include "PluginDialog.hh"
#include <QMessageBox>
#include <QMenu>
const
QColor
PluginDialog
::
blockColor_
=
QColor
(
228
,
155
,
18
);
const
QColor
PluginDialog
::
unloadColor_
=
QColor
(
172
,
172
,
172
);
const
QColor
PluginDialog
::
loadedBuiltInColor_
=
QColor
(
208
,
240
,
192
);
...
...
widgets/PluginDialog/PluginDialog.hh
View file @
64fcd3d7
...
...
@@ -41,10 +41,8 @@
#include "ui_pluginDialog.h
h
"
#include "ui_pluginDialog.h"
#include <QtWidgets>
#include <OpenFlipper/Core/PluginInfo.hh>
class
PluginDialog
:
public
QDialog
,
public
Ui
::
PluginDialog
...
...
widgets/aboutWidget/aboutWidget.cc
View file @
64fcd3d7
...
...
@@ -47,6 +47,8 @@
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QKeyEvent>
AboutWidget
::
AboutWidget
(
QWidget
*
parent
)
:
QMainWindow
(
parent
)
{
...
...
widgets/aboutWidget/aboutWidget.hh
View file @
64fcd3d7
...
...
@@ -43,10 +43,7 @@
#pragma once
#include "ui_aboutWidget.hh"
#include <QtWidgets>
#include "ui_aboutWidget.h"
class
AboutWidget
:
public
QMainWindow
,
public
Ui
::
AboutWidget
...
...
widgets/addEmptyWidget/addEmptyWidget.hh
View file @
64fcd3d7
...
...
@@ -39,19 +39,11 @@
* *
\*===========================================================================*/
#ifndef ADDEMPTYWIDGET_HH
#define ADDEMPTYWIDGET_HH
#pragma once
#include <OpenFlipper/common/Types.hh>
#include "ui_addEmpty.hh"
#include <QtWidgets>
#include "ui_addEmpty.h"
class
addEmptyWidget
:
public
QDialog
,
public
Ui
::
addEmpty
{
...
...
@@ -69,4 +61,3 @@ class addEmptyWidget : public QDialog, public Ui::addEmpty
void
slotAddEmpty
();
};
#endif
widgets/helpWidget/helpWidget.hh
View file @
64fcd3d7
...
...
@@ -41,20 +41,10 @@
/*
* helpWidget.hh
*
* Created on: Apr 7, 2009
* Author: kremer
*/
#ifndef HELPWIDGET_HH_
#define HELPWIDGET_HH_
#include "ui_helpWidget.hh"
#include <QtWidgets>
#include "ui_helpWidget.h"
#include <QtHelp>
#include <QTextDocument>
...
...
widgets/optionsWidget/downloader.cc
View file @
64fcd3d7
...
...
@@ -47,6 +47,7 @@
#include "optionsWidget.hh"
#include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMessageBox>
void
OptionsWidget
::
startDownload
(
QString
_url
)
{
QUrl
url
(
_url
);
...
...
widgets/optionsWidget/keyBindings.cc
View file @
64fcd3d7
...
...
@@ -44,6 +44,7 @@
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "optionsWidget.hh"
#include <QMessageBox>
/// get the pluginInfo object corresponding to the given pluginName
int
OptionsWidget
::
getPluginInfo
(
QString
pluginName
){
...
...
widgets/optionsWidget/optionsWidget.cc
View file @
64fcd3d7
...
...
@@ -50,6 +50,9 @@
#include <ACG/GL/ShaderCache.hh>
#include "optionsWidget.hh"
#include <QColorDialog>
#include <QOpenGLContext>
#include <QMessageBox>
OptionsWidget
::
OptionsWidget
(
std
::
vector
<
PluginInfo
>&
_plugins
,
std
::
vector
<
KeyBinding
>&
_core
,
InverseKeyMap
&
_invKeys
,
QWidget
*
parent
)
:
QWidget
(
parent
),
...
...
widgets/optionsWidget/optionsWidget.hh
View file @
64fcd3d7
...
...
@@ -50,9 +50,7 @@
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include "ui_optionsWidget.hh"
#include <QtWidgets>
#include "ui_optionsWidget.h"
#include <QStringList>
#include <QProgressDialog>
...
...
widgets/postProcessorWidget/postProcessorWidget.hh
View file @
64fcd3d7
...
...
@@ -41,13 +41,11 @@
#pragma once
#include "ui_postProcessorWidget.h
h
"
#include "ui_postProcessorWidget.h"
#include <vector>
#include <QDialog>
#include <QPoint>
#include <QStringList>
class
QWidget
;
class
QFrame
;
class
PostProcessorInfo
;
...
...
widgets/processManagerWidget/BlockingWidget.hh
View file @
64fcd3d7
...
...
@@ -45,6 +45,8 @@
#include "processManagerWidget.hh"
#include <QLabel>
class
BlockingWidget
:
public
QWidget
{
Q_OBJECT
...
...
widgets/processManagerWidget/processManagerWidget.hh
View file @
64fcd3d7
...
...
@@ -43,16 +43,10 @@
#pragma once
/*
* processManagerWidget.hh
*
* Created on: Apr 7, 2009
* Author: kremer
*/
#include "ui_processManagerWidget.h
h
"
#include <Q
tWidgets
>
#include "ui_processManagerWidget.h"
#include <QPushButton>
#include <Q
ProgressBar
>
// A button class that additionally stores
// an attached job's id.
...
...
widgets/rendererWidget/rendererObjectWidget.hh
View file @
64fcd3d7
...
...
@@ -42,13 +42,14 @@
#pragma once
#include "ui_rendererObjectWidget.hh"
#include <QDialog>
#include "ui_rendererObjectWidget.h"
#include <OpenFlipper/common/RendererInfo.hh>
#include "renderObjectHighLighter.hh"
#include "TextBrowserWidget.hh"
#include <QDialog>
class
RendererObjectWidget
:
public
QDialog
,
public
Ui
::
RendererObjectWidget
{
Q_OBJECT
...
...
widgets/rendererWidget/rendererWidget.hh
View file @
64fcd3d7
...
...
@@ -41,11 +41,11 @@
#pragma once
#include "ui_rendererWidget.h
h
"
#include <QDialog>
#include "ui_rendererWidget.h"
#include <QVector>
#include <Q
Label
>
#include <QFrame>
#include <Q
Dialog
>
#include <OpenFlipper/common/RendererInfo.hh>
...
...
widgets/snapshotDialog/SnapshotDialog.cc
View file @
64fcd3d7
...
...
@@ -44,6 +44,9 @@
#include "SnapshotDialog.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMessageBox>
#include <QFileDialog>
SnapshotDialog
::
SnapshotDialog
(
QString
_suggest
,
bool
_captureViewers
,
int
_w
,
int
_h
,
QWidget
*
parent
)
:
QDialog
(
parent
),
captureViewers_
(
_captureViewers
),
...
...
widgets/snapshotDialog/SnapshotDialog.hh
View file @
64fcd3d7
...
...
@@ -41,9 +41,7 @@
#include "ui_SnapshotDialog.hh"
#include <QtWidgets>
#include "ui_SnapshotDialog.h"
class
SnapshotDialog
:
public
QDialog
,
public
Ui
::
SnapshotDialog
{
...
...
widgets/stereoSettingsWidget/stereoSettingsWidget.hh
View file @
64fcd3d7
...
...
@@ -43,17 +43,8 @@
#pragma once
/*
* stereoSettingsWidget.hh
*
* Created on: Nov 9, 2009
* Author: kremer
*/
#include "ui_stereoSettingsWidget.hh"
#include <QtWidgets>
#include "ui_stereoSettingsWidget.h"
class
StereoSettingsWidget
:
public
QWidget
,
public
Ui
::
StereoSettingsWidget
...
...
widgets/videoCaptureDialog/VideoCaptureDialog.cc
View file @
64fcd3d7
...
...
@@ -43,6 +43,8 @@
#include "VideoCaptureDialog.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMessageBox>
#include <QFileDialog>
VideoCaptureDialog
::
VideoCaptureDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
widgets/videoCaptureDialog/VideoCaptureDialog.hh
View file @
64fcd3d7
...
...
@@ -41,10 +41,7 @@
#include "ui_VideoCaptureDialog.hh"
#include <QtWidgets>
#include "ui_VideoCaptureDialog.h"
class
VideoCaptureDialog
:
public
QDialog
,
public
Ui
::
VideoCaptureDialog
{
...
...
widgets/viewModeWidget/viewModeChangeWidget.hh
View file @
64fcd3d7
...
...
@@ -39,19 +39,12 @@
* *
\*===========================================================================*/
#pragma once
#include "ui_viewModeChange.h"
#ifndef VIEWMODECHANGEWIDGET_HH
#define VIEWMODECHANGEWIDGET_HH
#include "ui_viewModeChange.hh"
#include <QStringList>
#include <QVector>
#include <QWidgetAction>
struct
ViewMode
;
class
viewModeChangeWidget
:
public
QWidget
,
public
Ui
::
ViewModeChangeDialog
...
...
@@ -85,4 +78,3 @@ class viewModeChangeWidget : public QWidget, public Ui::ViewModeChangeDialog
};
#endif //VIEWMODECHANGEWIDGET_HH
widgets/viewModeWidget/viewModeWidget.hh
View file @
64fcd3d7
...
...
@@ -39,17 +39,9 @@
* *
\*===========================================================================*/
#pragma once
#ifndef VIEWMODEWIDGET_HH
#define VIEWMODEWIDGET_HH
#include "ui_viewMode.hh"
#include <QStringList>
#include <QVector>
#include "ui_viewMode.h"
struct
ViewMode
;
...
...
@@ -260,4 +252,3 @@ class viewModeWidget : public QDialog, public Ui::viewMode
};
#endif //VIEWMODEWIDGET_HH
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment