apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed saving session without objects (to save fixed vocabulary in binary format)

Browse Source
This commit is contained in:
matlabbe 2018-08-30 12:21:51 -04:00
parent 147a8a0dac
commit 9d0c03f661
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/MainWindow.cpp
View File

@ -406,7 +406,7 @@ void MainWindow::loadSession()
} }
QMessageBox::information(this, tr("Session loaded!"), tr("Session \"%1\" successfully loaded (%2 objects)!").arg(path).arg(objWidgets_.size())); QMessageBox::information(this, tr("Session loaded!"), tr("Session \"%1\" successfully loaded (%2 objects, %3 vocabulary words)!").arg(path).arg(objWidgets_.size()).arg(findObject_->vocabulary()->size()));
if(!camera_->isRunning() && !sceneImage_.empty()) if(!camera_->isRunning() && !sceneImage_.empty())
{ {
@ -417,20 +417,17 @@ void MainWindow::loadSession()
} }
void MainWindow::saveSession() void MainWindow::saveSession()
{ {
if(objWidgets_.size()) QString path = QFileDialog::getSaveFileName(this, tr("Save session..."), Settings::workingDirectory(), "*.bin");
if(!path.isEmpty())
{ {
QString path = QFileDialog::getSaveFileName(this, tr("Save session..."), Settings::workingDirectory(), "*.bin"); if(QFileInfo(path).suffix().compare("bin") != 0)
if(!path.isEmpty())
{ {
if(QFileInfo(path).suffix().compare("bin") != 0) path.append(".bin");
{ }
path.append(".bin");
}
if(findObject_->saveSession(path)) if(findObject_->saveSession(path))
{ {
QMessageBox::information(this, tr("Session saved!"), tr("Session \"%1\" successfully saved (%2 objects)!").arg(path).arg(objWidgets_.size())); QMessageBox::information(this, tr("Session saved!"), tr("Session \"%1\" successfully saved (%2 objects, %3 vocabulary words)!").arg(path).arg(objWidgets_.size()).arg(findObject_->vocabulary()->size()));
}
} }
} }
} }