Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed reloading model references.

Browse source
This commit is contained in:
Leonardo Zide 2018-01-06 10:15:24 -08:00
parent e097ad630b
commit 601401fa1b
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
common/lc_mainwindow.cpp
View file

@ -818,7 +818,7 @@ void lcMainWindow::ProjectFileChanged(const QString& Path)
if (Ignore)
return;
QString Text = tr("The file '%1' has been modified by another application, do you want to reload it?").arg(Path);
QString Text = tr("The file '%1' has been modified by another application, do you want to reload it?").arg(QDir::toNativeSeparators(Path));
Ignore = true;
@ -830,19 +830,32 @@ void lcMainWindow::ProjectFileChanged(const QString& Path)
Ignore = false;
Project* NewProject = new Project;
QFileInfo FileInfo(Path);
Project* CurrentProject = lcGetActiveProject();
if (NewProject->Load(Path))
if (FileInfo == QFileInfo(CurrentProject->GetFileName()))
{
QByteArray TabLayout = SaveTabLayout();
gApplication->SetProject(NewProject);
RestoreTabLayout(TabLayout);
UpdateAllViews();
Project* NewProject = new Project;
if (NewProject->Load(Path))
{
QByteArray TabLayout = SaveTabLayout();
gApplication->SetProject(NewProject);
RestoreTabLayout(TabLayout);
UpdateAllViews();
}
else
{
QMessageBox::information(this, tr("LeoCAD"), tr("Error loading '%1'.").arg(Path));
delete NewProject;
}
}
else
{
QMessageBox::information(this, tr("LeoCAD"), tr("Error loading '%1'.").arg(Path));
delete NewProject;
PieceInfo* Info = lcGetPiecesLibrary()->FindPiece(FileInfo.fileName().toLatin1(), CurrentProject, false, true);
if (Info)
Info->GetProject()->Load(Path);
}
}
@ -1258,8 +1271,7 @@ void lcMainWindow::RestoreTabLayout(const QByteArray& TabLayout)
}
};
QLayout* TabLayout = TabWidget->layout();
LoadWidget(TabLayout->itemAt(0)->widget());
LoadWidget(TabWidget ? TabWidget->layout()->itemAt(0)->widget() : nullptr);
}
if (!mModelTabWidget->count())

5
common/pieceinf.h
View file

@ -61,6 +61,11 @@ public:
return mModel;
}
Project* GetProject() const
{
return mProject;
}
void SetMesh(lcMesh* Mesh);
int AddRef()