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

Added close buttons to CameraViewer and OdometryViewer dialogs

Browse Source
This commit is contained in:
matlabbe
2015-04-06 13:35:44 -04:00
parent 19f59a8c60
commit 5b5a32839c
12 changed files with 427 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include <rtabmap/utilite/UEventsHandler.h>
#include <QWidget>
#include <QDialog>
#include <rtabmap/core/SensorData.h>
namespace rtabmap {
@@ -39,7 +39,7 @@ namespace rtabmap {
class ImageView;
class CloudViewer;
class RTABMAPGUI_EXP CameraViewer : public QWidget, public UEventsHandler
class RTABMAPGUI_EXP CameraViewer : public QDialog, public UEventsHandler
{
Q_OBJECT
public:
@@ -49,7 +49,7 @@ public:
public slots:
void showImage(const rtabmap::SensorData & data);
protected:
void handleEvent(UEvent * event);
virtual void handleEvent(UEvent * event);
private:
ImageView* imageView_;

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

@@ -31,47 +31,50 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include "rtabmap/core/SensorData.h"
#include "rtabmap/gui/CloudViewer.h"
#include "rtabmap/core/OdometryInfo.h"
#include <QDialog>
#include "rtabmap/utilite/UEventsHandler.h"
#include "rtabmap/utilite/UTimer.h"
#include "rtabmap/utilite/UMutex.h"
class QSpinBox;
class QDoubleSpinBox;
namespace rtabmap {
class RTABMAPGUI_EXP OdometryViewer : public CloudViewer, public UEventsHandler
class ImageView;
class CloudViewer;
class RTABMAPGUI_EXP OdometryViewer : public QDialog, public UEventsHandler
{
Q_OBJECT
public:
OdometryViewer(int maxClouds = 10, int decimation = 2, float voxelSize = 0.0f, int qualityWarningThr=0, QWidget * parent = 0);
virtual ~OdometryViewer() {}
virtual ~OdometryViewer();
public slots:
virtual void clear();
protected:
void handleAction(QAction * a);
virtual void handleEvent(UEvent * event);
private slots:
void processData();
void processData(const rtabmap::SensorData & data, const rtabmap::OdometryInfo & info);
private:
UMutex dataMutex_;
std::list<rtabmap::SensorData> data_;
int dataQuality_;
ImageView* imageView_;
CloudViewer* cloudView_;
bool processingData_;
bool odomImageShow_;
bool odomImageDepthShow_;
Transform lastOdomPose_;
UTimer timer_;
int maxClouds_;
float voxelSize_;
int decimation_;
int qualityWarningThr_;
int id_;
std::map<int, pcl::PointCloud<pcl::PointXYZRGB>::Ptr > clouds_;
QAction * _aSetVoxelSize;
QAction * _aSetDecimation;
QAction * _aSetCloudHistorySize;
QAction * _aPause;
QSpinBox * maxCloudsSpin_;
QDoubleSpinBox * voxelSpin_;
QSpinBox * decimationSpin_;
int validDecimationValue_;
};
} /* namespace rtabmap */

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

@@ -57,8 +57,6 @@ class QDoubleSpinBox;
namespace rtabmap {
class OdometryThread;
class CameraThread;
class Signature;
class LoopClosureViewer;
class CameraRGBD;
@@ -245,9 +243,7 @@ private slots:
void updateBasicParameter();
void openDatabaseViewer();
void showOpenNI2GroupBox(bool);
void cleanOdometryTest();
void testOdometry();
void cleanRGBDCameraTest();
void testRGBDCamera();
protected:
@@ -299,10 +295,6 @@ private:
QProgressDialog * _progressDialog;
//Odometry test
CameraThread * _cameraThread;
OdometryThread * _odomThread;
//calibration
CalibrationDialog * _calibrationDialog;