i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring RTABMapConfig.cmake with targets (#904)

Browse Source 
* Config: Using cmake targets

* fixed RTABMAP_DEPRECATED build error

* fixed melodic build

* cleanup

* Fixed qhull exported library error

* Update svg depend private

* removed g2o from public interface

* Fixed Windows with external project

* removed some required dep

* Fixed nsis error (also fixed unspecified components)

* updated workflow rules
This commit is contained in:
matlabbe
2023-02-12 16:18:01 -08:00
committed by GitHub
parent 437ed09335
commit 89e3e10d89
191 changed files with 1150 additions and 2199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guilib/include/rtabmap/gui/AboutDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_ABOUTDIALOG_H_
#define RTABMAP_ABOUTDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QtCore/QUrl>
@@ -37,7 +37,7 @@ class Ui_aboutDialog;
namespace rtabmap {
class RTABMAPGUI_EXP AboutDialog : public QDialog
class RTABMAP_GUI_EXPORT AboutDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/CalibrationDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_CALIBRATIONDIALOG_H_
#define RTABMAP_CALIBRATIONDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QSettings>
@@ -43,7 +43,7 @@ class Ui_calibrationDialog;
namespace rtabmap {
class RTABMAPGUI_EXP CalibrationDialog : public QDialog, public UEventsHandler
class RTABMAP_GUI_EXPORT CalibrationDialog : public QDialog, public UEventsHandler
{
Q_OBJECT;

4
guilib/include/rtabmap/gui/CameraViewer.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_CAMERAVIEWER_H_
#define RTABMAP_CAMERAVIEWER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/utilite/UEventsHandler.h>
#include <QDialog>
@@ -45,7 +45,7 @@ namespace rtabmap {
class ImageView;
class CloudViewer;
class RTABMAPGUI_EXP CameraViewer : public QDialog, public UEventsHandler
class RTABMAP_GUI_EXPORT CameraViewer : public QDialog, public UEventsHandler
{
Q_OBJECT
public:

4
guilib/include/rtabmap/gui/CloudViewer.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_CLOUDVIEWER_H_
#define RTABMAP_CLOUDVIEWER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include "rtabmap/core/Transform.h"
#include "rtabmap/core/StereoCameraModel.h"
@@ -75,7 +75,7 @@ namespace rtabmap {
class OctoMap;
class RTABMAPGUI_EXP CloudViewer : public PCLQVTKWidget
class RTABMAP_GUI_EXPORT CloudViewer : public PCLQVTKWidget
{
Q_OBJECT

4
guilib/include/rtabmap/gui/CloudViewerCellPicker.h
View File

@@ -8,13 +8,13 @@
#ifndef GUILIB_SRC_CLOUDVIEWERCELLPICKER_H_
#define GUILIB_SRC_CLOUDVIEWERCELLPICKER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <vtkCellPicker.h>
namespace rtabmap {
class RTABMAPGUI_EXP CloudViewerCellPicker : public vtkCellPicker {
class RTABMAP_GUI_EXPORT CloudViewerCellPicker : public vtkCellPicker {
public:
public:
static CloudViewerCellPicker *New ();

4
guilib/include/rtabmap/gui/CloudViewerInteractorStyle.h
View File

@@ -8,7 +8,7 @@
#ifndef GUILIB_SRC_CLOUDVIEWERINTERACTORSTYLE_H_
#define GUILIB_SRC_CLOUDVIEWERINTERACTORSTYLE_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <pcl/visualization/mouse_event.h>
#include <pcl/visualization/point_picking_event.h>
@@ -19,7 +19,7 @@ namespace rtabmap {
class CloudViewer;
class RTABMAPGUI_EXP CloudViewerInteractorStyle: public pcl::visualization::PCLVisualizerInteractorStyle
class RTABMAP_GUI_EXPORT CloudViewerInteractorStyle: public pcl::visualization::PCLVisualizerInteractorStyle
{
public:
static CloudViewerInteractorStyle *New ();

4
guilib/include/rtabmap/gui/ConsoleWidget.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_CONSOLEWIDGET_H_
#define RTABMAP_CONSOLEWIDGET_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/utilite/UEventsHandler.h>
#include <QWidget>
@@ -42,7 +42,7 @@ class QTextCursor;
namespace rtabmap {
class RTABMAPGUI_EXP ConsoleWidget : public QWidget, public UEventsHandler
class RTABMAP_GUI_EXPORT ConsoleWidget : public QWidget, public UEventsHandler
{
Q_OBJECT;

4
guilib/include/rtabmap/gui/CreateSimpleCalibrationDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_CREATESIMPLECALIBRATIONDIALOG_H_
#define RTABMAP_CREATESIMPLECALIBRATIONDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QSettings>
@@ -37,7 +37,7 @@ class Ui_createSimpleCalibrationDialog;
namespace rtabmap {
class RTABMAPGUI_EXP CreateSimpleCalibrationDialog : public QDialog
class RTABMAP_GUI_EXPORT CreateSimpleCalibrationDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/DataRecorder.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_DATARECORDER_H_
#define RTABMAP_DATARECORDER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/utilite/UEventsHandler.h>
#include <QWidget>
@@ -43,7 +43,7 @@ namespace rtabmap {
class Memory;
class ImageView;
class RTABMAPGUI_EXP DataRecorder : public QWidget, public UEventsHandler
class RTABMAP_GUI_EXPORT DataRecorder : public QWidget, public UEventsHandler
{
Q_OBJECT
public:

4
guilib/include/rtabmap/gui/DatabaseViewer.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_DATABASEVIEWER_H_
#define RTABMAP_DATABASEVIEWER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QMainWindow>
#include <QtCore/QByteArray>
@@ -62,7 +62,7 @@ class ExportCloudsDialog;
class EditDepthArea;
class EditMapArea;
class RTABMAPGUI_EXP DatabaseViewer : public QMainWindow
class RTABMAP_GUI_EXPORT DatabaseViewer : public QMainWindow
{
Q_OBJECT

4
guilib/include/rtabmap/gui/DepthCalibrationDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_DEPTHCALIBRATIONDIALOG_H_
#define RTABMAP_DEPTHCALIBRATIONDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QMap>
@@ -46,7 +46,7 @@ namespace rtabmap {
class ProgressDialog;
class RTABMAPGUI_EXP DepthCalibrationDialog : public QDialog
class RTABMAP_GUI_EXPORT DepthCalibrationDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/EditConstraintDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_EDITCONSTRAINTDIALOG_H_
#define RTABMAP_EDITCONSTRAINTDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <rtabmap/core/Transform.h>
@@ -37,7 +37,7 @@ class Ui_EditConstraintDialog;
namespace rtabmap {
class RTABMAPGUI_EXP EditConstraintDialog : public QDialog
class RTABMAP_GUI_EXPORT EditConstraintDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/EditDepthArea.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_EDITDEPTHAREA_H
#define RTABMAP_EDITDEPTHAREA_H
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QColor>
#include <QImage>
@@ -42,7 +42,7 @@ class QAction;
namespace rtabmap {
class RTABMAPGUI_EXP EditDepthArea : public QWidget
class RTABMAP_GUI_EXPORT EditDepthArea : public QWidget
{
Q_OBJECT

4
guilib/include/rtabmap/gui/EditMapArea.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_EDITMAPAREA_H
#define RTABMAP_EDITMAPAREA_H
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QColor>
#include <QImage>
@@ -42,7 +42,7 @@ class QAction;
namespace rtabmap {
class RTABMAPGUI_EXP EditMapArea : public QWidget
class RTABMAP_GUI_EXPORT EditMapArea : public QWidget
{
Q_OBJECT

8
guilib/include/rtabmap/gui/ExportBundlerDialog.h
View File

@@ -25,10 +25,10 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef RTABMAP_EXPORTBUNDLERDIALOG_H_
#define RTABMAP_EXPORTBUNDLERDIALOG_H_
#ifndef RTABMAP_CORE_EXPORTBUNDLERDIALOG_H_
#define RTABMAP_CORE_EXPORTBUNDLERDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/core/Signature.h>
#include <rtabmap/core/Parameters.h>
@@ -39,7 +39,7 @@ class Ui_ExportBundlerDialog;
namespace rtabmap {
class RTABMAPGUI_EXP ExportBundlerDialog : public QDialog
class RTABMAP_GUI_EXPORT ExportBundlerDialog : public QDialog
{
Q_OBJECT

8
guilib/include/rtabmap/gui/ExportCloudsDialog.h
View File

@@ -25,10 +25,10 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef RTABMAP_EXPORTCLOUDSDIALOG_H_
#define RTABMAP_EXPORTCLOUDSDIALOG_H_
#ifndef RTABMAP_CORE_EXPORTCLOUDSDIALOG_H_
#define RTABMAP_CORE_EXPORTCLOUDSDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QMap>
@@ -51,7 +51,7 @@ class ProgressDialog;
class GainCompensator;
class DBDriver;
class RTABMAPGUI_EXP ExportCloudsDialog : public QDialog
class RTABMAP_GUI_EXPORT ExportCloudsDialog : public QDialog
{
Q_OBJECT

8
guilib/include/rtabmap/gui/ExportDialog.h
View File

@@ -25,10 +25,10 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef RTABMAP_EXPORTDIALOG_H_
#define RTABMAP_EXPORTDIALOG_H_
#ifndef RTABMAP_CORE_EXPORTDIALOG_H_
#define RTABMAP_CORE_EXPORTDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QSettings>
@@ -37,7 +37,7 @@ class Ui_ExportDialog;
namespace rtabmap {
class RTABMAPGUI_EXP ExportDialog : public QDialog
class RTABMAP_GUI_EXPORT ExportDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/GraphViewer.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_GRAPHVIEWER_H_
#define RTABMAP_GRAPHVIEWER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QGraphicsView>
#include <QtCore/QMap>
@@ -49,7 +49,7 @@ namespace rtabmap {
class NodeItem;
class LinkItem;
class RTABMAPGUI_EXP GraphViewer : public QGraphicsView {
class RTABMAP_GUI_EXPORT GraphViewer : public QGraphicsView {
Q_OBJECT;

4
guilib/include/rtabmap/gui/ImageView.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_IMAGEVIEW_H_
#define RTABMAP_IMAGEVIEW_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QGraphicsView>
#include <QtCore/QRectF>
@@ -45,7 +45,7 @@ namespace rtabmap {
class KeypointItem;
class RTABMAPGUI_EXP ImageView : public QWidget {
class RTABMAP_GUI_EXPORT ImageView : public QWidget {
Q_OBJECT

4
guilib/include/rtabmap/gui/KeypointItem.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_KEYPOINTITEM_H_
#define RTABMAP_KEYPOINTITEM_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QGraphicsEllipseItem>
#include <QGraphicsTextItem>
@@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace rtabmap {
class RTABMAPGUI_EXP KeypointItem : public QGraphicsEllipseItem
class RTABMAP_GUI_EXPORT KeypointItem : public QGraphicsEllipseItem
{
public:
KeypointItem(int id, const cv::KeyPoint & kpt, float depth = 0, const QColor & color = Qt::green, QGraphicsItem * parent = 0);

4
guilib/include/rtabmap/gui/LoopClosureViewer.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_LOOPCLOSUREVIEWER_H_
#define RTABMAP_LOOPCLOSUREVIEWER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/core/Parameters.h>
#include <rtabmap/core/Transform.h>
@@ -40,7 +40,7 @@ class Ui_loopClosureViewer;
namespace rtabmap {
class RTABMAPGUI_EXP LoopClosureViewer : public QWidget {
class RTABMAP_GUI_EXPORT LoopClosureViewer : public QWidget {
Q_OBJECT

4
guilib/include/rtabmap/gui/MainWindow.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_MAINWINDOW_H_
#define RTABMAP_MAINWINDOW_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include "rtabmap/utilite/UEventsHandler.h"
#include <QMainWindow>
@@ -76,7 +76,7 @@ class DataRecorder;
class OctoMap;
class MultiSessionLocWidget;
class RTABMAPGUI_EXP MainWindow : public QMainWindow, public UEventsHandler
class RTABMAP_GUI_EXPORT MainWindow : public QMainWindow, public UEventsHandler
{
Q_OBJECT

4
guilib/include/rtabmap/gui/MapVisibilityWidget.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_MAPVISIBILITYWIDGET_H_
#define RTABMAP_MAPVISIBILITYWIDGET_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QWidget>
#include <rtabmap/core/Transform.h>
@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace rtabmap {
class RTABMAPGUI_EXP MapVisibilityWidget : public QWidget {
class RTABMAP_GUI_EXPORT MapVisibilityWidget : public QWidget {
Q_OBJECT;
public:
MapVisibilityWidget(QWidget * parent = 0);

4
guilib/include/rtabmap/gui/MultiSessionLocSubView.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_MULTISESSIONLOCSUBVIEW_H_
#define RTABMAP_MULTISESSIONLOCSUBVIEW_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <opencv2/core.hpp>
#include <QWidget>
@@ -38,7 +38,7 @@ namespace rtabmap {
class ImageView;
class RTABMAPGUI_EXP MultiSessionLocSubView : public QWidget
class RTABMAP_GUI_EXPORT MultiSessionLocSubView : public QWidget
{
Q_OBJECT

4
guilib/include/rtabmap/gui/MultiSessionLocWidget.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_MULTISESSIONLOCWIDGET_H_
#define RTABMAP_MULTISESSIONLOCWIDGET_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include "rtabmap/core/Statistics.h"
#include "rtabmap/core/Signature.h"
@@ -42,7 +42,7 @@ namespace rtabmap {
class MultiSessionLocSubView;
class ImageView;
class RTABMAPGUI_EXP MultiSessionLocWidget : public QWidget
class RTABMAP_GUI_EXPORT MultiSessionLocWidget : public QWidget
{
Q_OBJECT

4
guilib/include/rtabmap/gui/OdometryViewer.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_ODOMETRYVIEWER_H_
#define RTABMAP_ODOMETRYVIEWER_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include "rtabmap/core/OdometryEvent.h"
#include "rtabmap/core/Parameters.h"
@@ -45,7 +45,7 @@ namespace rtabmap {
class ImageView;
class CloudViewer;
class RTABMAPGUI_EXP OdometryViewer : public QDialog, public UEventsHandler
class RTABMAP_GUI_EXPORT OdometryViewer : public QDialog, public UEventsHandler
{
Q_OBJECT

4
guilib/include/rtabmap/gui/ParametersToolBox.h
View File

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_PARAMETERSTOOLBOX_H_
#define RTABMAP_PARAMETERSTOOLBOX_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/core/Parameters.h>
#include <QWidget>
@@ -44,7 +44,7 @@ class QComboBox;
namespace rtabmap {
class RTABMAPGUI_EXP ParametersToolBox: public QWidget
class RTABMAP_GUI_EXPORT ParametersToolBox: public QWidget
{
Q_OBJECT

6
guilib/include/rtabmap/gui/PdfPlot.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_PDFPLOT_H_
#define RTABMAP_PDFPLOT_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <rtabmap/utilite/UPlot.h>
#include "opencv2/opencv.hpp"
@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace rtabmap {
class RTABMAPGUI_EXP PdfPlotItem : public UPlotItem
class RTABMAP_GUI_EXPORT PdfPlotItem : public UPlotItem
{
public:
PdfPlotItem(float dataX, float dataY, float width, int childCount = -1);
@@ -59,7 +59,7 @@ private:
};
class RTABMAPGUI_EXP PdfPlotCurve : public UPlotCurve
class RTABMAP_GUI_EXPORT PdfPlotCurve : public UPlotCurve
{
Q_OBJECT

4
guilib/include/rtabmap/gui/PostProcessingDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_POSTPROCESSINGDIALOG_H_
#define RTABMAP_POSTPROCESSINGDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QtCore/QSettings>
@@ -40,7 +40,7 @@ class QAbstractButton;
namespace rtabmap {
class RTABMAPGUI_EXP PostProcessingDialog : public QDialog
class RTABMAP_GUI_EXPORT PostProcessingDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/PreferencesDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_PREFERENCESDIALOG_H_
#define RTABMAP_PREFERENCESDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
#include <QtCore/QModelIndex>
@@ -63,7 +63,7 @@ class Camera;
class CalibrationDialog;
class CreateSimpleCalibrationDialog;
class RTABMAPGUI_EXP PreferencesDialog : public QDialog
class RTABMAP_GUI_EXPORT PreferencesDialog : public QDialog
{
Q_OBJECT

4
guilib/include/rtabmap/gui/ProgressDialog.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_PROGRESSDIALOG_H_
#define RTABMAP_PROGRESSDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QDialog>
@@ -40,7 +40,7 @@ class QCheckBox;
namespace rtabmap {
class RTABMAPGUI_EXP ProgressDialog : public QDialog
class RTABMAP_GUI_EXPORT ProgressDialog : public QDialog
{
Q_OBJECT

41
guilib/include/rtabmap/gui/RtabmapGuiExp.h
View File

@@ -1,41 +0,0 @@
/*
Copyright (c) 2010-2016, Mathieu Labbe - IntRoLab - Universite de Sherbrooke
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Universite de Sherbrooke nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef RTABMAPGUIEXP_H
#define RTABMAPGUIEXP_H
#if defined(_WIN32)
#if defined(rtabmap_gui_EXPORTS)
#define RTABMAPGUI_EXP __declspec( dllexport )
#else
#define RTABMAPGUI_EXP __declspec( dllimport )
#endif
#else
#define RTABMAPGUI_EXP
#endif
#endif // RTABMAPGUIEXP_H

6
guilib/include/rtabmap/gui/StatsToolBox.h
View File

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RTABMAP_STATSTOOLBOX_H_
#define RTABMAP_STATSTOOLBOX_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QWidget>
#include <QtCore/QMap>
@@ -41,7 +41,7 @@ class QToolBox;
namespace rtabmap {
class RTABMAPGUI_EXP StatItem : public QWidget
class RTABMAP_GUI_EXPORT StatItem : public QWidget
{
Q_OBJECT;
@@ -87,7 +87,7 @@ private:
class RTABMAPGUI_EXP StatsToolBox : public QWidget
class RTABMAP_GUI_EXPORT StatsToolBox : public QWidget
{
Q_OBJECT;

4
guilib/include/rtabmap/utilite/UImageView.h
View File

@@ -8,12 +8,12 @@
#ifndef IMAGEVIEW_H_
#define IMAGEVIEW_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QWidget>
#include <QtGui/QPainter>
class RTABMAPGUI_EXP UImageView : public QWidget
class RTABMAP_GUI_EXPORT UImageView : public QWidget
{
Q_OBJECT;
public:

18
guilib/include/rtabmap/utilite/UPlot.h
View File

@@ -20,7 +20,7 @@
#ifndef UPLOT_H_
#define UPLOT_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/gui/rtabmap_gui_export.h" // DLL export/import defines
#include <QFrame>
#include <QtCore/QList>
@@ -43,7 +43,7 @@ class QScrollArea;
* UPlotItem is a QGraphicsEllipseItem and can be inherited to do custom behaviors
* on an hoverEnterEvent() for example.
*/
class RTABMAPGUI_EXP UPlotItem : public QGraphicsEllipseItem
class RTABMAP_GUI_EXPORT UPlotItem : public QGraphicsEllipseItem
{
public:
/**
@@ -89,7 +89,7 @@ class UPlot;
/**
* UPlotCurve is a curve used to hold data shown in a UPlot.
*/
class RTABMAPGUI_EXP UPlotCurve : public QObject
class RTABMAP_GUI_EXPORT UPlotCurve : public QObject
{
Q_OBJECT
@@ -259,7 +259,7 @@ private:
/**
* A special UPlotCurve that shows as a line at the specified value, spanning all the UPlot.
*/
class RTABMAPGUI_EXP UPlotCurveThreshold : public UPlotCurve
class RTABMAP_GUI_EXPORT UPlotCurveThreshold : public UPlotCurve
{
Q_OBJECT
@@ -292,7 +292,7 @@ private:
/**
* The UPlot axis object.
*/
class RTABMAPGUI_EXP UPlotAxis : public QWidget
class RTABMAP_GUI_EXPORT UPlotAxis : public QWidget
{
public:
/**
@@ -342,7 +342,7 @@ private:
/**
* The UPlot legend item. Used internally by UPlot.
*/
class RTABMAPGUI_EXP UPlotLegendItem : public QPushButton
class RTABMAP_GUI_EXPORT UPlotLegendItem : public QPushButton
{
Q_OBJECT
@@ -383,7 +383,7 @@ private:
/**
* The UPlot legend. Used internally by UPlot.
*/
class RTABMAPGUI_EXP UPlotLegend : public QWidget
class RTABMAP_GUI_EXPORT UPlotLegend : public QWidget
{
Q_OBJECT
@@ -430,7 +430,7 @@ private:
/**
* Orientable QLabel. Inherit QLabel and let you to specify the orientation.
*/
class RTABMAPGUI_EXP UOrientableLabel : public QLabel
class RTABMAP_GUI_EXPORT UOrientableLabel : public QLabel
{
Q_OBJECT
@@ -486,7 +486,7 @@ private:
*
*
*/
class RTABMAPGUI_EXP UPlot : public QWidget
class RTABMAP_GUI_EXPORT UPlot : public QWidget
{
Q_OBJECT