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

DbViewer: optimized fetching wm states from db, added checkbox along graph iteration slider to generate intermediate graphes.

Browse Source
This commit is contained in:
matlabbe
2018-02-23 10:12:36 -05:00
parent c3ab04b436
commit 69d28db660
7 changed files with 112 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
corelib/src/DBDriver.cpp
View File

@@ -263,6 +263,15 @@ std::map<int, std::pair<std::map<std::string, float>, double> > DBDriver::getAll
return statistics;
}
std::map<int, std::vector<int> > DBDriver::getAllStatisticsWmStates() const
{
std::map<int, std::vector<int> > wmStates;
_dbSafeAccessMutex.lock();
wmStates = getAllStatisticsWmStatesQuery();
_dbSafeAccessMutex.unlock();
return wmStates;
}
std::string DBDriver::getDatabaseVersion() const
{
std::string version = "0.0.0";

50
corelib/src/DBDriverSqlite3.cpp
View File

@@ -1196,6 +1196,56 @@ std::map<int, std::pair<std::map<std::string, float>, double> > DBDriverSqlite3:
return data;
}
std::map<int, std::vector<int> > DBDriverSqlite3::getAllStatisticsWmStatesQuery() const
{
UDEBUG("");
std::map<int, std::vector<int> > data;
if(_ppDb)
{
if(uStrNumCmp(_version, "0.16.2") >= 0)
{
std::stringstream query;
query << "SELECT id, wm_state "
<< "FROM Statistics;";
int rc = SQLITE_OK;
sqlite3_stmt * ppStmt = 0;
rc = sqlite3_prepare_v2(_ppDb, query.str().c_str(), -1, &ppStmt, 0);
UASSERT_MSG(rc == SQLITE_OK, uFormat("DB error (%s): %s", _version.c_str(), sqlite3_errmsg(_ppDb)).c_str());
rc = sqlite3_step(ppStmt);
while(rc == SQLITE_ROW)
{
int index = 0;
int id = sqlite3_column_int(ppStmt, index++);
std::vector<int> wmState;
const void * dataPtr = sqlite3_column_blob(ppStmt, index);
int dataSize = sqlite3_column_bytes(ppStmt, index++);
if(dataSize>0 && dataPtr)
{
cv::Mat wmStateMat = uncompressData(cv::Mat(1, dataSize, CV_8UC1, (void *)dataPtr));
UASSERT(wmStateMat.type() == CV_32SC1 && wmStateMat.rows == 1);
wmState.resize(wmStateMat.cols);
memcpy(wmState.data(), wmStateMat.data, wmState.size()*sizeof(int));
}
if(!wmState.empty())
{
data.insert(std::make_pair(id, wmState));
}
rc = sqlite3_step(ppStmt);
}
UASSERT_MSG(rc == SQLITE_DONE, uFormat("DB error (%s): %s", _version.c_str(), sqlite3_errmsg(_ppDb)).c_str());
rc = sqlite3_finalize(ppStmt);
UASSERT_MSG(rc == SQLITE_OK, uFormat("DB error (%s): %s", _version.c_str(), sqlite3_errmsg(_ppDb)).c_str());
}
}
UDEBUG("");
return data;
}
void DBDriverSqlite3::loadNodeDataQuery(std::list<Signature *> & signatures, bool images, bool scan, bool userData, bool occupancyGrid) const
{
UDEBUG("load data for %d signatures", (int)signatures.size());

1
corelib/src/DBDriverSqlite3.h
View File

@@ -72,6 +72,7 @@ private:
virtual ParametersMap getLastParametersQuery() const;
virtual std::map<std::string, float> getStatisticsQuery(int nodeId, double & stamp, std::vector<int> * wmState) const;
virtual std::map<int, std::pair<std::map<std::string, float>, double> > getAllStatisticsQuery() const;
virtual std::map<int, std::vector<int> > getAllStatisticsWmStatesQuery() const;
virtual void executeNoResultQuery(const std::string & sql) const;