Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-30 20:34:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Show a progress dialog while scanning parts folders.

Browse source
This commit is contained in:
Leonardo Zide 2017-11-24 18:19:29 -08:00
parent 9c5709feea
commit 035da7ce0a
5 changed files with 78 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
common/lc_application.cpp
View file

@ -5,6 +5,7 @@
#include "lc_profile.h"
#include "project.h"
#include "lc_mainwindow.h"
#include "lc_partselectionwidget.h"
#include "lc_shortcuts.h"
#include "view.h"
@ -82,20 +83,23 @@ void lcApplication::ExportClipboard(const QByteArray& Clipboard)
SetClipboard(Clipboard);
}
bool lcApplication::LoadPiecesLibrary(const QList<QPair<QString, bool>>& LibraryPaths)
bool lcApplication::LoadPartsLibrary(const QList<QPair<QString, bool>>& LibraryPaths, bool OnlyUsePaths)
{
if (mLibrary == nullptr)
mLibrary = new lcPiecesLibrary();
char* EnvPath = getenv("LEOCAD_LIB");
if (!OnlyUsePaths)
{
char* EnvPath = getenv("LEOCAD_LIB");
if (EnvPath && EnvPath[0])
return mLibrary->Load(EnvPath);
if (EnvPath && EnvPath[0])
return mLibrary->Load(EnvPath);
QString CustomPath = lcGetProfileString(LC_PROFILE_PARTS_LIBRARY);
QString CustomPath = lcGetProfileString(LC_PROFILE_PARTS_LIBRARY);
if (!CustomPath.isEmpty())
return mLibrary->Load(CustomPath);
if (!CustomPath.isEmpty())
return mLibrary->Load(CustomPath);
}
for (const QPair<QString, bool>& LibraryPathEntry : LibraryPaths)
{
@ -149,6 +153,7 @@ void lcApplication::ParseStringArgument(int* CurArg, int argc, char* argv[], con
bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool>>& LibraryPaths, bool& ShowWindow)
{
// todo: parse command line using Qt to handle multibyte strings.
bool OnlyUseLibraryPaths = false;
bool SaveImage = false;
bool SaveWavefront = false;
bool Save3DS = false;
@ -182,6 +187,7 @@ bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool
{
LibraryPaths.clear();
LibraryPaths += qMakePair<QString, bool>(LibPath, false);
OnlyUseLibraryPaths = true;
}
}
else if ((strcmp(Param, "-i") == 0) || (strcmp(Param, "--image") == 0))
@ -320,7 +326,7 @@ bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool
ShowWindow = !SaveImage && !SaveWavefront && !Save3DS && !SaveCOLLADA;
if (!LoadPiecesLibrary(LibraryPaths))
if (!LoadPartsLibrary(LibraryPaths, OnlyUseLibraryPaths))
{
QString Message;
@ -494,6 +500,14 @@ bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool
}
}
if (ShowWindow)
{
gMainWindow->SetColorIndex(lcGetColorIndex(4));
gMainWindow->GetPartSelectionWidget()->SetDefaultPart();
gMainWindow->UpdateRecentFiles();
gMainWindow->show();
}
return true;
}

2
common/lc_application.h
View file

@ -46,7 +46,7 @@ public:
void Shutdown();
void ShowPreferencesDialog();
bool LoadPiecesLibrary(const QList<QPair<QString, bool>>& LibraryPaths);
bool LoadPartsLibrary(const QList<QPair<QString, bool>>& LibraryPaths, bool OnlyUsePaths);
void SetClipboard(const QByteArray& Clipboard);
void ExportClipboard(const QByteArray& Clipboard);

69
common/lc_library.cpp
View file

@ -534,12 +534,16 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir)
}
const QLatin1String BaseFolders[] = { QLatin1String("unofficial/"), QLatin1String("") };
const int NumBaseFolders = sizeof(BaseFolders) / sizeof(BaseFolders[0]);
if (mPieces.empty())
{
for (unsigned int BaseFolderIdx = 0; BaseFolderIdx < sizeof(BaseFolders) / sizeof(BaseFolders[0]); BaseFolderIdx++)
QDir BaseDirs[NumBaseFolders];
for (unsigned int BaseFolderIdx = 0; BaseFolderIdx < NumBaseFolders; BaseFolderIdx++)
{
QDir Dir(QDir(LibraryDir.absoluteFilePath(BaseFolders[BaseFolderIdx])).absoluteFilePath(QLatin1String("parts/")), QLatin1String("*.dat"), QDir::SortFlags(QDir::Name | QDir::IgnoreCase), QDir::Files | QDir::Hidden | QDir::Readable);
BaseDirs[BaseFolderIdx] = QDir(QDir(LibraryDir.absoluteFilePath(BaseFolders[BaseFolderIdx])).absoluteFilePath(QLatin1String("parts/")), QLatin1String("*.dat"), QDir::SortFlags(QDir::Name | QDir::IgnoreCase), QDir::Files | QDir::Hidden | QDir::Readable);
QDir& Dir = BaseDirs[BaseFolderIdx];
QStringList FileList = Dir.entryList();
for (int FileIdx = 0; FileIdx < FileList.size(); FileIdx++)
@ -573,21 +577,40 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir)
if (mHasUnofficial && mPieces.find(Name) != mPieces.end())
continue;
lcDiskFile PieceFile(Dir.absoluteFilePath(FileList[FileIdx]));
if (!PieceFile.Open(QIODevice::ReadOnly))
continue;
char Line[1024];
if (!PieceFile.ReadLine(Line, sizeof(Line)))
continue;
PieceInfo* Info = new PieceInfo();
if (BaseFolderIdx == 0)
mHasUnofficial = true;
Src = (char*)Line + 2;
Dst = Info->m_strDescription;
strncpy(Info->mFileName, FileString, sizeof(Info->mFileName));
Info->mFileName[sizeof(Info->mFileName) - 1] = 0;
Info->mUnofficial = (BaseFolderIdx == 0);
mPieces[Name] = Info;
}
}
if (!mPieces.empty())
{
QAtomicInt FilesLoaded;
auto ReadDescriptions = [&BaseDirs, &FilesLoaded](const std::pair<std::string, PieceInfo*>& Entry)
{
PieceInfo* Info = Entry.second;
FilesLoaded += 1;
QDir& Dir = BaseDirs[Info->mUnofficial ? 0 : 1];
lcDiskFile PieceFile(Dir.absoluteFilePath(Info->mFileName));
char Line[1024];
if (!PieceFile.Open(QIODevice::ReadOnly) || !PieceFile.ReadLine(Line, sizeof(Line)))
{
strcpy(Info->m_strDescription, "Unknown");
return;
}
const char* Src = Line + 2;
char* Dst = Info->m_strDescription;
for (;;)
{
@ -600,12 +623,28 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir)
*Dst = 0;
break;
}
};
strncpy(Info->mFileName, FileString, sizeof(Info->mFileName));
Info->mFileName[sizeof(Info->mFileName) - 1] = 0;
QProgressDialog* ProgressDialog = new QProgressDialog(nullptr);
ProgressDialog->setWindowFlags(ProgressDialog->windowFlags() & ~Qt::WindowCloseButtonHint);
ProgressDialog->setWindowTitle(tr("Initializing"));
ProgressDialog->setLabelText(tr("Loading Parts Library"));
ProgressDialog->setMaximum(mPieces.size());
ProgressDialog->setMinimum(0);
ProgressDialog->setValue(0);
ProgressDialog->setCancelButton(nullptr);
ProgressDialog->show();
mPieces[Name] = Info;
QFuture<void> LoadFuture = QtConcurrent::map(mPieces, ReadDescriptions);
while (!LoadFuture.isFinished())
{
ProgressDialog->setValue(FilesLoaded);
QApplication::processEvents();
}
ProgressDialog->deleteLater();
}
}

1
common/pieceinf.h
View file

@ -155,6 +155,7 @@ public:
int mZipFileIndex;
lcuint32 mFlags;
lcPieceInfoState mState;
bool mUnofficial;
protected:
void ReleaseMesh();

8
qt/qtmain.cpp
View file

@ -2,9 +2,6 @@
#include "lc_application.h"
#include "lc_qupdatedialog.h"
#include "lc_mainwindow.h"
#include "project.h"
#include "lc_colors.h"
#include "lc_partselectionwidget.h"
#include <QApplication>
#include <locale.h>
@ -178,11 +175,6 @@ int main(int argc, char *argv[])
if (ShowWindow)
{
gMainWindow->SetColorIndex(lcGetColorIndex(4));
gMainWindow->GetPartSelectionWidget()->SetDefaultPart();
gMainWindow->UpdateRecentFiles();
gMainWindow->show();
#if !LC_DISABLE_UPDATE_CHECK
lcDoInitialUpdateCheck();
#endif