mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 09:30:25 +08:00
MERGE branch STM 325:449 into trunk
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
@@ -44,6 +44,7 @@ class Plot;
|
||||
class PdfPlotCurve;
|
||||
class StatsToolBox;
|
||||
class DetailedProgressDialog;
|
||||
class TwistGridWidget;
|
||||
|
||||
class RTABMAP_EXP MainWindow : public QMainWindow, public UEventsHandler
|
||||
{
|
||||
@@ -71,7 +72,7 @@ public:
|
||||
* dialog is automatically destroyed with the MainWindow.
|
||||
*/
|
||||
MainWindow(PreferencesDialog * prefDialog = 0, QWidget * parent = 0);
|
||||
~MainWindow();
|
||||
virtual ~MainWindow();
|
||||
|
||||
QString getWorkingDirectory() const;
|
||||
|
||||
@@ -118,10 +119,11 @@ signals:
|
||||
void stateChanged(MainWindow::State);
|
||||
void rtabmapEventInitReceived(int status, const QString & info);
|
||||
void imgRateChanged(double);
|
||||
void timeLimitChanged(double);
|
||||
void timeLimitChanged(float);
|
||||
void noMoreImagesReceived();
|
||||
void loopClosureThrChanged(float);
|
||||
void retrievalThrChanged(float);
|
||||
void twistReceived(float x, float y, float z, float roll, float pitch, float yaw, int row, int col);
|
||||
|
||||
private:
|
||||
void drawKeypoints(const std::multimap<int, cv::KeyPoint> & refWords, const std::multimap<int, cv::KeyPoint> & loopWords);
|
||||
@@ -143,6 +145,7 @@ private:
|
||||
|
||||
QSet<int> _lastIds;
|
||||
int _lastId;
|
||||
bool _processingStatistics;
|
||||
|
||||
QMap<int, QByteArray> _imagesMap;
|
||||
|
||||
|
||||
@@ -104,6 +104,7 @@ public:
|
||||
// source panel
|
||||
double getGeneralImageRate() const;
|
||||
bool getGeneralAutoRestart() const;
|
||||
bool getGeneralCameraKeypoints() const;
|
||||
int getSourceType() const;
|
||||
QString getSourceTypeStr() const;
|
||||
int getSourceWidth() const;
|
||||
@@ -117,10 +118,11 @@ public:
|
||||
int getSourceUsbDeviceId() const; //UsbDevice group
|
||||
QString getSourceDatabasePath() const; //Database group
|
||||
bool getSourceDatabaseIgnoreChildren() const; //Database group
|
||||
bool getSourceDatabaseLoadActions() const; //Database group
|
||||
|
||||
//
|
||||
bool isImagesKept() const;
|
||||
double getTimeLimit() const;
|
||||
float getTimeLimit() const;
|
||||
|
||||
//specific
|
||||
double getLoopThr() const;
|
||||
@@ -137,7 +139,7 @@ public slots:
|
||||
void setRetrievalThr(int value);
|
||||
void setImgRate(double value);
|
||||
void setAutoRestart(bool value);
|
||||
void setTimeLimit(double value);
|
||||
void setTimeLimit(float value);
|
||||
void selectSource(Src src = kSrcUndef);
|
||||
|
||||
private slots:
|
||||
@@ -152,12 +154,12 @@ private slots:
|
||||
void addParameter(int value);
|
||||
void addParameter(double value);
|
||||
void addParameter(const QString & value);
|
||||
void updatePredictionLCSliders();
|
||||
void updatePredictionLC();
|
||||
void updatePredictionPlot();
|
||||
void updateKpROI();
|
||||
void changeWorkingDirectory();
|
||||
void changeDictionaryPath();
|
||||
void readSettingsEnd();
|
||||
void setupTreeView();
|
||||
|
||||
protected:
|
||||
virtual void showEvent ( QShowEvent * event );
|
||||
@@ -178,9 +180,7 @@ protected:
|
||||
|
||||
private:
|
||||
bool validateForm();
|
||||
void setupTreeView();
|
||||
void setupSignals();
|
||||
void setupPredictionPanel();
|
||||
void setupKpRoiPanel();
|
||||
bool parseModel(QList<QGroupBox*> & boxes, QStandardItem * parentItem, int currentLevel, int & absoluteIndex);
|
||||
void addParameter(const QObject * object, int value);
|
||||
@@ -199,10 +199,6 @@ private:
|
||||
QStandardItemModel * _indexModel;
|
||||
bool _initialized;
|
||||
|
||||
//For Bayes filter prediction parameters
|
||||
QList<QSlider*> _predictionLCSliders; // Sliders used to setup the prediction
|
||||
bool _predictionPanelInitialized;
|
||||
|
||||
QProgressDialog * _progressDialog;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user