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

Fixed ini configuration file encoding bug (unicode vs native, maybe only appeared on Linux)

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/branches/0.3/rtabmap@91 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-06-09 16:00:45 +00:00
parent 9b4cf9cf5f
commit f6a782727f
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corelib/src/Rtabmap.cpp
View File

@@ -1573,7 +1573,6 @@ void Rtabmap::dumpPrediction() const
void Rtabmap::readParameters(const char * configFile, ParametersMap & parameters) void Rtabmap::readParameters(const char * configFile, ParametersMap & parameters)
{ {
CSimpleIniA ini; CSimpleIniA ini;
ini.SetUnicode();
ini.LoadFile(configFile); ini.LoadFile(configFile);
const CSimpleIniA::TKeyVal * keyValMap = ini.GetSection("Core"); const CSimpleIniA::TKeyVal * keyValMap = ini.GetSection("Core");
if(keyValMap) if(keyValMap)
@@ -1601,7 +1600,6 @@ void Rtabmap::readParameters(const char * configFile, ParametersMap & parameters
void Rtabmap::writeParameters(const char * configFile, const ParametersMap & parameters) void Rtabmap::writeParameters(const char * configFile, const ParametersMap & parameters)
{ {
CSimpleIniA ini; CSimpleIniA ini;
ini.SetUnicode();
ini.LoadFile(configFile); ini.LoadFile(configFile);
for(ParametersMap::const_iterator i=parameters.begin(); i!=parameters.end(); ++i) for(ParametersMap::const_iterator i=parameters.begin(); i!=parameters.end(); ++i)

4
guilib/src/PreferencesDialog.cpp
View File

@@ -204,7 +204,6 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
_ui->treeView->expandToDepth(1); _ui->treeView->expandToDepth(1);
_obsoletePanels = kPanelAll; _obsoletePanels = kPanelAll;
_initialized = true;
_progressDialog = new QProgressDialog(this); _progressDialog = new QProgressDialog(this);
_progressDialog->setWindowTitle(tr("Read parameters...")); _progressDialog->setWindowTitle(tr("Read parameters..."));
@@ -947,13 +946,14 @@ void PreferencesDialog::selectSource(Src src)
} }
else else
{ {
this->readSettings(); this->readSettingsBegin();
} }
} }
} }
void PreferencesDialog::setParameter(const std::string & key, const std::string & value) void PreferencesDialog::setParameter(const std::string & key, const std::string & value)
{ {
UDEBUG("%s=%s", key.c_str(), value.c_str());
QObject * obj = _ui->stackedWidget->findChild<QObject*>(key.c_str()); QObject * obj = _ui->stackedWidget->findChild<QObject*>(key.c_str());
if(obj) if(obj)
{ {