Skip to content

Commit 0681789

Browse files
committed
old format compatibility fixed
1 parent 7c6261c commit 0681789

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/libGUI/MainWindow.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ void MainWindow::onBookmarkAddedToWidget(const QModelIndex &, int first, int las
232232
const std::vector<osg::Vec3d>& eyes = m_rootScene->getUserScene()->getBookmarks()->getEyes();
233233
const std::vector<osg::Vec3d>& ups = m_rootScene->getUserScene()->getBookmarks()->getUps();
234234
const std::vector<double>& fovs = m_rootScene->getUserScene()->getBookmarks()->getFovs();
235+
235236
int sz = m_rootScene->getUserScene()->getBookmarks()->getNumBookmarks();
236237
if (first<0 || first>=sz) return;
237238
if (last<0 || last>=sz) return;

src/libSGEntities/Bookmarks.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ void entity::Bookmarks::deleteBookmark(BookmarkWidget *widget, const QModelIndex
120120
void entity::Bookmarks::resetModel(BookmarkWidget *widget)
121121
{
122122
// widget->clear();
123+
// to load old version data successfully, have to set FOV to deafult since it's missing
124+
if (m_fovs.size() != m_names.size()) m_fovs.resize(m_names.size(), 60.);
125+
123126
for (unsigned int i=0; i<m_names.size(); ++i){
124127
widget->addItem(QString((m_names[i]).c_str()));
125128
QListWidgetItem* item = widget->item(i);

0 commit comments

Comments
 (0)