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

Moved some common include files to public headers folder

Browse Source
This commit is contained in:
matlabbe
2015-08-25 10:32:27 -04:00
parent 0ac79d0e8f
commit 0cf1ea8777
39 changed files with 103 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -63,7 +63,7 @@ class AboutDialog;
class Plot;
class PdfPlotCurve;
class StatsToolBox;
class DetailedProgressDialog;
class ProgressDialog;
class TwistGridWidget;
class ExportCloudsDialog;
class PostProcessingDialog;
@@ -297,7 +297,7 @@ private:
PdfPlotCurve * _likelihoodCurve;
PdfPlotCurve * _rawLikelihoodCurve;
DetailedProgressDialog * _initProgressDialog;
ProgressDialog * _initProgressDialog;
QString _graphSavingFileName;
QMap<int, QString> _exportPosesFileName;

8
guilib/src/PdfPlot.h → guilib/include/rtabmap/gui/PdfPlot.h
View File

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

14
guilib/src/DetailedProgressDialog.h → guilib/include/rtabmap/gui/ProgressDialog.h
View File

@@ -25,8 +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 DETAILEDPROGRESSDIALOG_H_
#define DETAILEDPROGRESSDIALOG_H_
#ifndef PROGRESSDIALOG_H_
#define PROGRESSDIALOG_H_
#include "rtabmap/gui/RtabmapGuiExp.h" // DLL export/import defines
#include <QDialog>
@@ -38,13 +40,13 @@ class QCheckBox;
namespace rtabmap {
class DetailedProgressDialog : public QDialog
class RTABMAPGUI_EXP ProgressDialog : public QDialog
{
Q_OBJECT
public:
DetailedProgressDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
virtual ~DetailedProgressDialog();
ProgressDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
virtual ~ProgressDialog();
void setEndMessage(const QString & message) {_endMessage = message;} // Message shown when the progress is finished
void setValue(int value);
@@ -73,4 +75,4 @@ private:
}
#endif /* DETAILEDPROGRESSDIALOG_H_ */
#endif /* PROGRESSDIALOG_H_ */

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

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

0
guilib/include/rtabmap/gui/UCv2Qt.h → guilib/include/rtabmap/utilite/UCv2Qt.h
View File

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

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

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

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

16
guilib/src/CMakeLists.txt
View File

@@ -6,13 +6,13 @@ SET(headers_ui
../include/${PROJECT_PREFIX}/gui/PreferencesDialog.h
../include/${PROJECT_PREFIX}/gui/DatabaseViewer.h
./AboutDialog.h
./ConsoleWidget.h
../include/${PROJECT_PREFIX}/gui/ConsoleWidget.h
../include/${PROJECT_PREFIX}/gui/ImageView.h
./PdfPlot.h
./StatsToolBox.h
./DetailedProgressDialog.h
./utilite/UPlot.h
./utilite/UImageView.h
../include/${PROJECT_PREFIX}/gui/PdfPlot.h
../include/${PROJECT_PREFIX}/gui/StatsToolBox.h
../include/${PROJECT_PREFIX}/gui/ProgressDialog.h
../include/${PROJECT_PREFIX}/utilite/UPlot.h
../include/${PROJECT_PREFIX}/utilite/UImageView.h
../include/${PROJECT_PREFIX}/gui/CloudViewer.h
../include/${PROJECT_PREFIX}/gui/OdometryViewer.h
../include/${PROJECT_PREFIX}/gui/LoopClosureViewer.h
@@ -23,7 +23,7 @@ SET(headers_ui
./PostProcessingDialog.h
./ExportCloudsDialog.h
./MapVisibilityWidget.h
./GraphViewer.h
../include/${PROJECT_PREFIX}/gui/GraphViewer.h
./CreateSimpleCalibrationDialog.h
)
@@ -69,7 +69,7 @@ SET(SRC_FILES
./ImageView.cpp
./PdfPlot.cpp
./StatsToolBox.cpp
./DetailedProgressDialog.cpp
./ProgressDialog.cpp
./AboutDialog.cpp
./ConsoleWidget.cpp
./DatabaseViewer.cpp

2
guilib/src/CalibrationDialog.cpp
View File

@@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QCloseEvent>
#include <rtabmap/core/CameraEvent.h>
#include <rtabmap/gui/UCv2Qt.h>
#include <rtabmap/utilite/UCv2Qt.h>
#include <rtabmap/utilite/ULogger.h>

2
guilib/src/CameraViewer.cpp
View File

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/util3d.h>
#include <rtabmap/gui/ImageView.h>
#include <rtabmap/gui/CloudViewer.h>
#include <rtabmap/gui/UCv2Qt.h>
#include <rtabmap/utilite/UCv2Qt.h>
#include <rtabmap/utilite/ULogger.h>
#include <QtCore/QMetaType>
#include <QHBoxLayout>

2
guilib/src/ConsoleWidget.cpp
View File

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "ConsoleWidget.h"
#include "rtabmap/gui/ConsoleWidget.h"
#include "ui_consoleWidget.h"
#include <rtabmap/utilite/ULogger.h>
#include <rtabmap/utilite/UEventsManager.h>

2
guilib/src/DataRecorder.cpp
View File

@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/CameraEvent.h>
#include <rtabmap/core/util3d.h>
#include <rtabmap/gui/ImageView.h>
#include <rtabmap/gui/UCv2Qt.h>
#include <rtabmap/utilite/UCv2Qt.h>
#include <QtCore/QMetaType>
#include <QMessageBox>
#include <QtGui/QCloseEvent>

18
guilib/src/DatabaseViewer.cpp
View File

@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/core/Memory.h"
#include "rtabmap/core/DBDriver.h"
#include "rtabmap/gui/KeypointItem.h"
#include "rtabmap/gui/UCv2Qt.h"
#include "rtabmap/utilite/UCv2Qt.h"
#include "rtabmap/core/util3d.h"
#include "rtabmap/core/util3d_transforms.h"
#include "rtabmap/core/util3d_filtering.h"
@@ -63,7 +63,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/gui/DataRecorder.h"
#include "rtabmap/core/SensorData.h"
#include "ExportDialog.h"
#include "DetailedProgressDialog.h"
#include "rtabmap/gui/ProgressDialog.h"
#include <pcl/io/pcd_io.h>
#include <pcl/filters/voxel_grid.h>
@@ -797,7 +797,7 @@ void DatabaseViewer::exportDatabase()
if(recorder.init(path, false))
{
rtabmap::DetailedProgressDialog * progressDialog = new rtabmap::DetailedProgressDialog(this);
rtabmap::ProgressDialog * progressDialog = new rtabmap::ProgressDialog(this);
progressDialog->setAttribute(Qt::WA_DeleteOnClose);
progressDialog->setMaximumSteps(ids.size());
progressDialog->show();
@@ -1237,7 +1237,7 @@ void DatabaseViewer::view3DMap()
}
if(optimizedPoses.size() > 0)
{
rtabmap::DetailedProgressDialog progressDialog(this);
rtabmap::ProgressDialog progressDialog(this);
progressDialog.setMaximumSteps((int)optimizedPoses.size());
progressDialog.show();
@@ -1338,7 +1338,7 @@ void DatabaseViewer::generate3DMap()
}
if(optimizedPoses.size() > 0)
{
rtabmap::DetailedProgressDialog progressDialog;
rtabmap::ProgressDialog progressDialog;
progressDialog.setMaximumSteps((int)optimizedPoses.size());
progressDialog.show();
@@ -1435,7 +1435,7 @@ void DatabaseViewer::refineAllNeighborLinks()
{
if(neighborLinks_.size())
{
rtabmap::DetailedProgressDialog progressDialog(this);
rtabmap::ProgressDialog progressDialog(this);
progressDialog.setMaximumSteps(neighborLinks_.size());
progressDialog.show();
@@ -1460,7 +1460,7 @@ void DatabaseViewer::refineAllLoopClosureLinks()
{
if(loopLinks_.size())
{
rtabmap::DetailedProgressDialog progressDialog(this);
rtabmap::ProgressDialog progressDialog(this);
progressDialog.setMaximumSteps(loopLinks_.size());
progressDialog.show();
@@ -1485,7 +1485,7 @@ void DatabaseViewer::refineVisuallyAllNeighborLinks()
{
if(neighborLinks_.size())
{
rtabmap::DetailedProgressDialog progressDialog(this);
rtabmap::ProgressDialog progressDialog(this);
progressDialog.setMaximumSteps(neighborLinks_.size());
progressDialog.show();
@@ -1510,7 +1510,7 @@ void DatabaseViewer::refineVisuallyAllLoopClosureLinks()
{
if(loopLinks_.size())
{
rtabmap::DetailedProgressDialog progressDialog(this);
rtabmap::ProgressDialog progressDialog(this);
progressDialog.setMaximumSteps(loopLinks_.size());
progressDialog.show();

4
guilib/src/GraphViewer.cpp
View File

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "GraphViewer.h"
#include "rtabmap/gui/GraphViewer.h"
#include <QGraphicsView>
#include <QVBoxLayout>
@@ -45,7 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QtCore/QUrl>
#include <rtabmap/core/util3d.h>
#include <rtabmap/gui/UCv2Qt.h>
#include <rtabmap/utilite/UCv2Qt.h>
#include <rtabmap/utilite/UStl.h>
#include <rtabmap/utilite/ULogger.h>

12
guilib/src/MainWindow.cpp
View File

@@ -43,20 +43,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/gui/KeypointItem.h"
#include "rtabmap/gui/DataRecorder.h"
#include "rtabmap/gui/DatabaseViewer.h"
#include "rtabmap/gui/PdfPlot.h"
#include "rtabmap/gui/StatsToolBox.h"
#include "rtabmap/gui/ProgressDialog.h"
#include <rtabmap/utilite/UStl.h>
#include <rtabmap/utilite/ULogger.h>
#include <rtabmap/utilite/UEventsManager.h>
#include <rtabmap/utilite/UFile.h>
#include <rtabmap/utilite/UConversion.h>
#include "utilite/UPlot.h"
#include "rtabmap/gui/UCv2Qt.h"
#include "rtabmap/utilite/UPlot.h"
#include "rtabmap/utilite/UCv2Qt.h"
#include "ExportCloudsDialog.h"
#include "AboutDialog.h"
#include "PdfPlot.h"
#include "StatsToolBox.h"
#include "DetailedProgressDialog.h"
#include "PostProcessingDialog.h"
#include <QtGui/QCloseEvent>
@@ -250,7 +250,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) :
_ui->doubleSpinBox_stats_detectionRate->setValue(_preferencesDialog->getDetectionRate());
_ui->doubleSpinBox_stats_timeLimit->setValue(_preferencesDialog->getTimeLimit());
_initProgressDialog = new DetailedProgressDialog(this);
_initProgressDialog = new ProgressDialog(this);
_initProgressDialog->setWindowTitle(tr("Progress dialog"));
_initProgressDialog->setMinimumWidth(800);

2
guilib/src/OdometryViewer.cpp
View File

@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/core/OdometryEvent.h"
#include "rtabmap/utilite/ULogger.h"
#include "rtabmap/utilite/UConversion.h"
#include "rtabmap/gui/UCv2Qt.h"
#include "rtabmap/utilite/UCv2Qt.h"
#include "rtabmap/gui/ImageView.h"
#include "rtabmap/gui/CloudViewer.h"

4
guilib/src/PdfPlot.cpp
View File

@@ -25,9 +25,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "PdfPlot.h"
#include "rtabmap/gui/PdfPlot.h"
#include <rtabmap/utilite/ULogger.h>
#include "rtabmap/gui/UCv2Qt.h"
#include "rtabmap/utilite/UCv2Qt.h"
#include "rtabmap/core/util3d.h"
namespace rtabmap {

4
guilib/src/PreferencesDialog.cpp
View File

@@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/gui/CameraViewer.h"
#include "rtabmap/gui/CloudViewer.h"
#include "rtabmap/gui/ImageView.h"
#include "GraphViewer.h"
#include "rtabmap/gui/GraphViewer.h"
#include "ExportCloudsDialog.h"
#include "PostProcessingDialog.h"
#include "CreateSimpleCalibrationDialog.h"
@@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/utilite/UConversion.h>
#include <rtabmap/utilite/UStl.h>
#include <rtabmap/utilite/UEventsManager.h>
#include "utilite/UPlot.h"
#include "rtabmap/utilite/UPlot.h"
#include <opencv2/opencv_modules.hpp>
#if CV_MAJOR_VERSION < 3

24
guilib/src/DetailedProgressDialog.cpp → guilib/src/ProgressDialog.cpp
View File

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "DetailedProgressDialog.h"
#include "rtabmap/gui/ProgressDialog.h"
#include <QLayout>
#include <QProgressBar>
#include <QTextEdit>
@@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace rtabmap {
DetailedProgressDialog::DetailedProgressDialog(QWidget *parent, Qt::WindowFlags flags) :
ProgressDialog::ProgressDialog(QWidget *parent, Qt::WindowFlags flags) :
QDialog(parent, flags),
_delayedClosingTime(1)
{
@@ -73,12 +73,12 @@ DetailedProgressDialog::DetailedProgressDialog(QWidget *parent, Qt::WindowFlags
this->setModal(true);
}
DetailedProgressDialog::~DetailedProgressDialog()
ProgressDialog::~ProgressDialog()
{
}
void DetailedProgressDialog::setAutoClose(bool on, int delayedClosingTimeSec)
void ProgressDialog::setAutoClose(bool on, int delayedClosingTimeSec)
{
if(delayedClosingTimeSec >= 0)
{
@@ -87,7 +87,7 @@ void DetailedProgressDialog::setAutoClose(bool on, int delayedClosingTimeSec)
_closeWhenDoneCheckBox->setChecked(on);
}
void DetailedProgressDialog::appendText(const QString & text, const QColor & color)
void ProgressDialog::appendText(const QString & text, const QColor & color)
{
_text->setText(text);
QString html = tr("<html><font color=\"#999999\">%1 </font><font color=\"%2\">%3</font></html>").arg(QTime::currentTime().toString("HH:mm:ss")).arg(color.name()).arg(text);
@@ -96,7 +96,7 @@ void DetailedProgressDialog::appendText(const QString & text, const QColor & col
_detailedText->horizontalScrollBar()->setSliderPosition(0);
_detailedText->verticalScrollBar()->setSliderPosition(_detailedText->verticalScrollBar()->maximum());
}
void DetailedProgressDialog::setValue(int value)
void ProgressDialog::setValue(int value)
{
_progressBar->setValue(value);
if(value == _progressBar->maximum())
@@ -113,16 +113,16 @@ void DetailedProgressDialog::setValue(int value)
}
}
}
int DetailedProgressDialog::maximumSteps() const
int ProgressDialog::maximumSteps() const
{
return _progressBar->maximum();
}
void DetailedProgressDialog::setMaximumSteps(int steps)
void ProgressDialog::setMaximumSteps(int steps)
{
_progressBar->setMaximum(steps);
}
void DetailedProgressDialog::incrementStep()
void ProgressDialog::incrementStep()
{
//incremental progress bar (if we don't know how many items will be added)
if(_progressBar->value() == _progressBar->maximum()-1)
@@ -132,7 +132,7 @@ void DetailedProgressDialog::incrementStep()
_progressBar->setValue(_progressBar->value()+1);
}
void DetailedProgressDialog::clear()
void ProgressDialog::clear()
{
_text->clear();
_progressBar->reset();
@@ -140,13 +140,13 @@ void DetailedProgressDialog::clear()
_closeButton->setEnabled(false);
}
void DetailedProgressDialog::resetProgress()
void ProgressDialog::resetProgress()
{
_progressBar->reset();
_closeButton->setEnabled(false);
}
void DetailedProgressDialog::closeEvent(QCloseEvent *event)
void ProgressDialog::closeEvent(QCloseEvent *event)
{
if(_progressBar->value() == _progressBar->maximum())
{

4
guilib/src/StatsToolBox.cpp
View File

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "StatsToolBox.h"
#include "rtabmap/gui/StatsToolBox.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QToolBox>
#include <QDialog>
#include "utilite/UPlot.h"
#include "rtabmap/utilite/UPlot.h"
#include <rtabmap/utilite/ULogger.h>
namespace rtabmap {

2
guilib/src/ui/DatabaseViewer.ui
View File

@@ -2317,7 +2317,7 @@
<customwidget>
<class>rtabmap::GraphViewer</class>
<extends>QGraphicsView</extends>
<header>GraphViewer.h</header>
<header>rtabmap/gui/GraphViewer.h</header>
</customwidget>
</customwidgets>
<resources/>

2
guilib/src/ui/calibrationDialog.ui
View File

@@ -712,7 +712,7 @@
<customwidget>
<class>UImageView</class>
<extends>QWidget</extends>
<header>utilite/UImageView.h</header>
<header>rtabmap/utilite/UImageView.h</header>
<container>1</container>
</customwidget>
</customwidgets>

8
guilib/src/ui/mainWindow.ui
View File

@@ -1258,7 +1258,7 @@
<customwidget>
<class>UPlot</class>
<extends>QWidget</extends>
<header>utilite/UPlot.h</header>
<header>../include/rtabmap/utilite/UPlot.h</header>
<container>1</container>
</customwidget>
<customwidget>
@@ -1269,13 +1269,13 @@
<customwidget>
<class>rtabmap::StatsToolBox</class>
<extends>QWidget</extends>
<header>StatsToolBox.h</header>
<header>../include/rtabmap/gui/StatsToolBox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>rtabmap::ConsoleWidget</class>
<extends>QWidget</extends>
<header>ConsoleWidget.h</header>
<header>../include/rtabmap/gui/ConsoleWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
@@ -1299,7 +1299,7 @@
<customwidget>
<class>rtabmap::GraphViewer</class>
<extends>QGraphicsView</extends>
<header>GraphViewer.h</header>
<header>../include/rtabmap/gui/GraphViewer.h</header>
</customwidget>
</customwidgets>
<resources>

2
guilib/src/ui/preferencesDialog.ui
View File

@@ -9797,7 +9797,7 @@ Lower the ratio -&gt; higher the precision. 0 means disabled, matching the neare
<customwidget>
<class>UPlot</class>
<extends>QWidget</extends>
<header>utilite/UPlot.h</header>
<header>rtabmap/utilite/UPlot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

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 "UPlot.h"
#include "rtabmap/utilite/UPlot.h"
#include "rtabmap/utilite/ULogger.h"
#include "rtabmap/utilite/UMath.h"