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

fixed Win32 build (VS2010)

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1050 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-12 22:36:56 +00:00
parent a4061275c2
commit 1c3f78f2d6
15 changed files with 135 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@
#ifndef DATABASEVIEWER_H_
#define DATABASEVIEWER_H_
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include <QtGui/QMainWindow>
#include <QtCore/QByteArray>
@@ -42,7 +42,7 @@ class Memory;
class ImageView;
}
class RTABMAP_EXP DatabaseViewer : public QMainWindow
class RTABMAPGUI_EXP DatabaseViewer : public QMainWindow
{
Q_OBJECT

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

@@ -20,7 +20,7 @@
#ifndef KEYPOINTITEM_H_
#define KEYPOINTITEM_H_
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include <QtGui/QGraphicsEllipseItem>
#include <QtGui/QGraphicsTextItem>
@@ -29,7 +29,7 @@
namespace rtabmap {
class RTABMAP_EXP KeypointItem : public QGraphicsEllipseItem
class RTABMAPGUI_EXP KeypointItem : public QGraphicsEllipseItem
{
public:
KeypointItem(qreal x, qreal y, int r, const QString & info, const QColor & color = Qt::green, QGraphicsItem * parent = 0);

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

@@ -20,7 +20,7 @@
#ifndef MAINWINDOW_H_
#define MAINWINDOW_H_
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/utilite/UEventsHandler.h"
#include <QtGui/QMainWindow>
@@ -55,7 +55,7 @@ class StatsToolBox;
class DetailedProgressDialog;
class TwistGridWidget;
class RTABMAP_EXP MainWindow : public QMainWindow, public UEventsHandler
class RTABMAPGUI_EXP MainWindow : public QMainWindow, public UEventsHandler
{
Q_OBJECT

2
guilib/src/GuiLib.qrc
View File

@@ -6,7 +6,7 @@
<file>images/Play1Normal.png</file>
<file>images/Pause.ico</file>
<file>images/PauseOnLoop.ico</file>
<file>images/PauseOnLocalLoop.ico</file>
<file>images/PauseOnLocalLoop.ico</file>
<file>images/PauseLoopRejected.ico</file>
<file>qss/default.qss</file>
<file>images/Plot16.png</file>

2
guilib/src/ImageView.cpp
View File

@@ -202,7 +202,7 @@ void ImageView::updateZoom()
{
scaleRatio = this->geometry().width()/this->sceneRect().width();
}
_minZoom = log(scaleRatio)/log(2)*50+250;
_minZoom = log(scaleRatio)/log(2.0)*50+250;
}
void ImageView::wheelEvent(QWheelEvent * e)

2
guilib/src/utilite/UPlot.cpp
View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "utilite/UPlot.h"
#include "UPlot.h"
#include "rtabmap/utilite/ULogger.h"
#include <QtGui/QGraphicsScene>

18
guilib/src/utilite/UPlot.h
View File

@@ -20,8 +20,6 @@
#ifndef UPLOT_H_
#define UPLOT_H_
#include "rtabmap/utilite/UtiLiteExp.h" // DLL export/import defines
#include <QtGui/QFrame>
#include <QtCore/QList>
#include <QtCore/QMap>
@@ -42,7 +40,7 @@ class QFormLayout;
* UPlotItem is a QGraphicsEllipseItem and can be inherited to do custom behaviors
* on an hoverEnterEvent() for example.
*/
class UTILITE_EXP UPlotItem : public QGraphicsEllipseItem
class UPlotItem : public QGraphicsEllipseItem
{
public:
/**
@@ -88,7 +86,7 @@ class UPlot;
/**
* UPlotCurve is a curve used to hold data shown in a UPlot.
*/
class UTILITE_EXP UPlotCurve : public QObject
class UPlotCurve : public QObject
{
Q_OBJECT
@@ -257,7 +255,7 @@ private:
/**
* A special UPlotCurve that shows as a line at the specified value, spanning all the UPlot.
*/
class UTILITE_EXP UPlotCurveThreshold : public UPlotCurve
class UPlotCurveThreshold : public UPlotCurve
{
Q_OBJECT
@@ -290,7 +288,7 @@ private:
/**
* The UPlot axis object.
*/
class UTILITE_EXP UPlotAxis : public QWidget
class UPlotAxis : public QWidget
{
public:
/**
@@ -340,7 +338,7 @@ private:
/**
* The UPlot legend item. Used internally by UPlot.
*/
class UTILITE_EXP UPlotLegendItem : public QPushButton
class UPlotLegendItem : public QPushButton
{
Q_OBJECT
@@ -376,7 +374,7 @@ private:
/**
* The UPlot legend. Used internally by UPlot.
*/
class UTILITE_EXP UPlotLegend : public QWidget
class UPlotLegend : public QWidget
{
Q_OBJECT
@@ -418,7 +416,7 @@ private:
/**
* Orientable QLabel. Inherit QLabel and let you to specify the orientation.
*/
class UTILITE_EXP UOrientableLabel : public QLabel
class UOrientableLabel : public QLabel
{
Q_OBJECT
@@ -474,7 +472,7 @@ private:
*
*
*/
class UTILITE_EXP UPlot : public QWidget
class UPlot : public QWidget
{
Q_OBJECT