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

Added printThreadId option in ULogger

Browse Source
This commit is contained in:
matlabbe
2016-01-05 13:55:21 -05:00
parent bf2bd3fe50
commit 97dd9bb7d5
8 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,6 +132,7 @@ public:
int getGeneralLoggerPauseLevel() const;
int getGeneralLoggerType() const;
bool getGeneralLoggerPrintTime() const;
bool getGeneralLoggerPrintThreadId() const;
bool isVerticalLayoutUsed() const;
bool imageRejectedShown() const;
bool imageHighestHypShown() const;

1
guilib/src/MainWindow.cpp
View File

@@ -2418,6 +2418,7 @@ void MainWindow::applyPrefSettings(PreferencesDialog::PANEL_FLAGS flags)
ULogger::setType((ULogger::Type)_preferencesDialog->getGeneralLoggerType(),
(_preferencesDialog->getWorkingDirectory()+QDir::separator()+LOG_FILE_NAME).toStdString(), true);
ULogger::setPrintTime(_preferencesDialog->getGeneralLoggerPrintTime());
ULogger::setPrintThreadId(_preferencesDialog->getGeneralLoggerPrintThreadId());
}
}

8
guilib/src/PreferencesDialog.cpp
View File

@@ -329,6 +329,7 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
connect(_ui->comboBox_loggerEventLevel, SIGNAL(currentIndexChanged(int)), this, SLOT(makeObsoleteLoggingPanel()));
connect(_ui->comboBox_loggerPauseLevel, SIGNAL(currentIndexChanged(int)), this, SLOT(makeObsoleteLoggingPanel()));
connect(_ui->checkBox_logger_printTime, SIGNAL(stateChanged(int)), this, SLOT(makeObsoleteLoggingPanel()));
connect(_ui->checkBox_logger_printThreadId, SIGNAL(stateChanged(int)), this, SLOT(makeObsoleteLoggingPanel()));
connect(_ui->comboBox_loggerType, SIGNAL(currentIndexChanged(int)), this, SLOT(makeObsoleteLoggingPanel()));
//Source panel
@@ -1121,6 +1122,7 @@ void PreferencesDialog::resetSettings(QGroupBox * groupBox)
_ui->comboBox_loggerEventLevel->setCurrentIndex(3);
_ui->comboBox_loggerPauseLevel->setCurrentIndex(3);
_ui->checkBox_logger_printTime->setChecked(true);
_ui->checkBox_logger_printThreadId->setChecked(false);
_ui->comboBox_loggerType->setCurrentIndex(1);
}
else if(groupBox->objectName() == _ui->groupBox_source0->objectName())
@@ -1381,6 +1383,7 @@ void PreferencesDialog::readGuiSettings(const QString & filePath)
_ui->comboBox_loggerPauseLevel->setCurrentIndex(settings.value("loggerPauseLevel", _ui->comboBox_loggerPauseLevel->currentIndex()).toInt());
_ui->comboBox_loggerType->setCurrentIndex(settings.value("loggerType", _ui->comboBox_loggerType->currentIndex()).toInt());
_ui->checkBox_logger_printTime->setChecked(settings.value("loggerPrintTime", _ui->checkBox_logger_printTime->isChecked()).toBool());
_ui->checkBox_logger_printThreadId->setChecked(settings.value("loggerPrintThreadId", _ui->checkBox_logger_printThreadId->isChecked()).toBool());
_ui->checkBox_verticalLayoutUsed->setChecked(settings.value("verticalLayoutUsed", _ui->checkBox_verticalLayoutUsed->isChecked()).toBool());
_ui->checkBox_imageRejectedShown->setChecked(settings.value("imageRejectedShown", _ui->checkBox_imageRejectedShown->isChecked()).toBool());
_ui->checkBox_imageHighestHypShown->setChecked(settings.value("imageHighestHypShown", _ui->checkBox_imageHighestHypShown->isChecked()).toBool());
@@ -1730,6 +1733,7 @@ void PreferencesDialog::writeGuiSettings(const QString & filePath) const
settings.setValue("loggerPauseLevel", _ui->comboBox_loggerPauseLevel->currentIndex());
settings.setValue("loggerType", _ui->comboBox_loggerType->currentIndex());
settings.setValue("loggerPrintTime", _ui->checkBox_logger_printTime->isChecked());
settings.setValue("loggerPrintThreadId", _ui->checkBox_logger_printThreadId->isChecked());
settings.setValue("verticalLayoutUsed", _ui->checkBox_verticalLayoutUsed->isChecked());
settings.setValue("imageRejectedShown", _ui->checkBox_imageRejectedShown->isChecked());
settings.setValue("imageHighestHypShown", _ui->checkBox_imageHighestHypShown->isChecked());
@@ -3443,6 +3447,10 @@ bool PreferencesDialog::getGeneralLoggerPrintTime() const
{
return _ui->checkBox_logger_printTime->isChecked();
}
bool PreferencesDialog::getGeneralLoggerPrintThreadId() const
{
return _ui->checkBox_logger_printThreadId->isChecked();
}
bool PreferencesDialog::isVerticalLayoutUsed() const
{
return _ui->checkBox_verticalLayoutUsed->isChecked();

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

@@ -63,7 +63,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-366</y>
<y>0</y>
<width>633</width>
<height>2118</height>
</rect>
@@ -86,7 +86,7 @@
<enum>QFrame::Raised</enum>
</property>
<property name="currentIndex">
<number>13</number>
<number>2</number>
</property>
<widget class="QWidget" name="page_22">
<layout class="QVBoxLayout" name="verticalLayout_29" stretch="0,1">
@@ -1555,7 +1555,7 @@ Show a yellow background when the number of odometry inliers goes under this thr
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QComboBox" name="comboBox_loggerType">
<property name="currentIndex">
<number>1</number>
@@ -1580,7 +1580,7 @@ Show a yellow background when the number of odometry inliers goes under this thr
</item>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QLabel" name="label_68">
<property name="text">
<string>Logger type:
@@ -1594,6 +1594,29 @@ when using the file type, logs are saved in LogRtabmap.txt (located in the worki
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_118">
<property name="text">
<string>Logger print thread ID.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_logger_printThreadId">
<property name="text">
<string/>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -10899,7 +10922,7 @@ Lower the ratio -&gt; higher the precision. 0 means disabled, matching the neare
<customwidget>
<class>UPlot</class>
<extends>QWidget</extends>
<header>rtabmap/utilite/UPlot.h</header>
<header>../include/rtabmap/utilite/UPlot.h</header>
<container>1</container>
</customwidget>
</customwidgets>