ldforge: comparison src/ldDocument.cpp

-:dc3ceb65cda7
+:4603d8fd063e
 ConfigOption (QStringList RecentFiles)
 ConfigOption (bool TryDownloadMissingFiles = false)
 static bool g_loadingMainFile = false;
-static const int g_maxRecentFiles = 10;
+enum { MAX_RECENT_FILES = 10 };
 static bool g_aborted = false;
 static LDDocument* g_logoedStud;
 static LDDocument* g_logoedStud2;
-static QList<LDDocument*> g_allDocuments;
-static QList<LDDocument*> g_explicitDocuments;
-static LDDocument* g_currentDocument;
 static bool g_loadingLogoedStuds = false;
 const QStringList g_specialSubdirectories ({ "s", "48", "8" });
 // =============================================================================
 //
-LDDocument::LDDocument() :
+LDDocument::LDDocument (QObject* parent) :
+	QObject (parent),
+	HierarchyElement (parent),
 	m_history (new History),
 	m_isImplicit (true),
 	m_flags (0),
 	m_verticesOutdated (true),
 	m_needVertexMerge (true),
 {
 	setSavePosition (-1);
 	setTabIndex (-1);
 	m_history->setDocument (this);
 	m_needsReCache = true;
-	g_allDocuments << this;
-}
-// =============================================================================
-//
-LDDocument* LDDocument::createNew()
-{
-	return new LDDocument();
 }
 // =============================================================================
 //
 LDDocument::~LDDocument()
 {
-	g_allDocuments.removeOne (this);
 	m_flags |= DOCF_IsBeingDestroyed;
 	delete m_history;
 	delete m_gldata;
 }
 	{
 		m_isImplicit = a;
 		if (a == false)
 		{
-			g_explicitDocuments << this;
 			print ("Opened %1", name());
 			// Implicit files are not compiled by the GL renderer. Now that this
 			// part is no longer implicit, it needs to be compiled.
-			if (g_win != null)
+			m_window->R()->compiler()->compileDocument (this);
-				g_win->R()->compiler()->compileDocument (this);
 		}
 		else
 		{
-			g_explicitDocuments.removeOne (this);
 			print ("Closed %1", name());
 		}
-		if (g_win != null)
+		m_window->updateDocumentList();
-			g_win->updateDocumentList();
+		// If the current document just became implicit (i.e. user closed it), we need to get a new one to show.
-		// If the current document just became implicit (e.g. it was 'closed'),
+		if (currentDocument() == this and a)
-		// we need to get a new current document.
+			m_window->currentDocumentClosed();
-		if (current() == this and isImplicit())
+	}
-		{
-			if (explicitDocuments().isEmpty())
-				newFile();
-			else
-				setCurrent (explicitDocuments().first());
-		}
-	}
-}
-// =============================================================================
-//
-QList<LDDocument*> const& LDDocument::explicitDocuments()
-{
-	return g_explicitDocuments;
 }
 // =============================================================================
 //
 LDDocument* FindDocument (QString name)
 {
-	for (LDDocument* file : g_allDocuments)
+	for (LDDocument* document : g_win->allDocuments())
 	{
-		if (file == null)
+		if (isOneOf (name, document->name(), document->defaultName()))
-			continue;
+			return document;
-		if (isOneOf (name, file->name(), file->defaultName()))
-			return file;
 	}
 	return nullptr;
 }
 //
 static QString FindDocumentPath (QString relpath, bool subdirs)
 {
 	QString fullPath;
-	// LDraw models use Windows-style path separators. If we're not on Windows,
+	// LDraw models use backslashes as path separators. Replace those into forward slashes for Qt.
-	// replace the path separator now before opening any files. Qt expects
-	// forward-slashes as directory separators.
-#ifndef WIN32
 	relpath.replace ("\\", "/");
-#endif // WIN32
+	// Try find it relative to other currently open documents. We want a file in the immediate vicinity of a current
-	// Try find it relative to other currently open documents. We want a file
+	// part model to override stock LDraw stuff.
-	// in the immediate vicinity of a current model to override stock LDraw stuff.
 	QString reltop = Basename (Dirname (relpath));
-	for (LDDocument* doc : g_allDocuments)
+	for (LDDocument* doc : g_win->allDocuments())
 	{
-		if (doc == null)
-			continue;
 		QString partpath = format ("%1/%2", Dirname (doc->fullPath()), relpath);
 		QFile f (partpath);
 		if (f.exists())
 		{
 	if (QFile::exists (fullPath))
 		return fullPath;
 	if (subdirs)
 	{
-		// Look in sub-directories: parts and p. Also look in net_downloadpath, since that's
+		// Look in sub-directories: parts and p. Also look in the download path, since that's where we download parts
-		// where we download parts from the PT to.
+		// from the PT to.
 		QStringList dirs = { g_win->configBag()->lDrawPath(), g_win->configBag()->downloadFilePath() };
 		for (const QString& topdir : dirs)
 		{
 			for (const QString& subdir : QStringList ({ "parts", "p" }))
 			{
 	}
 	if (not fp)
 		return nullptr;
-	LDDocument* load = (fileToOverride != null ? fileToOverride : LDDocument::createNew());
+	LDDocument* load = (fileToOverride != null ? fileToOverride : g_win->newDocument (implicit));
-	load->setImplicit (implicit);
 	load->setFullPath (fullpath);
 	load->setName (LDDocument::shortenName (load->fullPath()));
 	// Loading the file shouldn't count as actual edits to the document.
 	load->history()->setIgnoring (true);
 	load->addObjects (objs);
 	if (g_loadingMainFile)
 	{
-		LDDocument::setCurrent (load);
+		g_win->changeDocument (load);
 		g_win->R()->setDocument (load);
 		print (QObject::tr ("File %1 parsed successfully (%2 errors)."), path, numWarnings);
 	}
 	load->history()->setIgnoring (false);
 	setlocale (LC_ALL, "C");
 	// If we have unsaved changes, warn and give the option of saving.
 	if (hasUnsavedChanges())
 	{
-		QString message = format (QObject::tr ("There are unsaved changes to %1. Should it be saved?"),
+		QString message = format (tr ("There are unsaved changes to %1. Should it be saved?"), getDisplayName());
-getDisplayName());
+		int button = msgbox::question (m_window, QObject::tr ("Unsaved Changes"), message,
-		int button = msgbox::question (g_win, QObject::tr ("Unsaved Changes"), message,
 			(msgbox::Yes | msgbox::No | msgbox::Cancel), msgbox::Cancel);
 		switch (button)
 		{
 			case msgbox::Yes:
 			{
 				// If we don't have a file path yet, we have to ask the user for one.
 				if (name().length() == 0)
 				{
-					QString newpath = QFileDialog::getSaveFileName (g_win, QObject::tr ("Save As"),
+					QString newpath = QFileDialog::getSaveFileName (m_window, QObject::tr ("Save As"),
-						CurrentDocument()->name(), QObject::tr ("LDraw files (*.dat *.ldr)"));
+						name(), QObject::tr ("LDraw files (*.dat *.ldr)"));
 					if (newpath.length() == 0)
 						return false;
 					setName (newpath);
 				if (not save())
 				{
 					message = format (QObject::tr ("Failed to save %1 (%2)\nDo you still want to close?"),
 						name(), strerror (errno));
-					if (msgbox::critical (g_win, QObject::tr ("Save Failure"), message,
+					if (msgbox::critical (m_window, QObject::tr ("Save Failure"), message,
 						(msgbox::Yes | msgbox::No), msgbox::No) == msgbox::No)
 					{
 						return false;
 					}
 				}
 // =============================================================================
 //
 void CloseAllDocuments()
 {
-	for (LDDocument* file : g_explicitDocuments)
+	for (LDDocument* file : g_win->allDocuments())
 		file->dismiss();
-}
-// =============================================================================
-//
-void newFile()
-{
-	// Create a new anonymous file and set it to our current
-	LDDocument* f = LDDocument::createNew();
-	f->setName ("");
-	f->setImplicit (false);
-	LDDocument::setCurrent (f);
-	LDDocument::closeInitialFile();
-	g_win->R()->setDocument (f);
-	g_win->doFullRefresh();
-	g_win->updateTitle();
-	g_win->updateActions();
 }
 // =============================================================================
 //
 void AddRecentFile (QString path)
 		recentFiles.removeAt (idx);
 	}
 	// If there's too many recent files, drop one out.
-	while (recentFiles.size() > (g_maxRecentFiles - 1))
+	while (recentFiles.size() > (MAX_RECENT_FILES - 1))
 		recentFiles.removeAt (0);
 	// Add the file
 	recentFiles << path;
 	g_win->configBag()->setRecentFiles (recentFiles);
 	// If there's already a file with the same name, this file must replace it.
 	LDDocument* documentToReplace = nullptr;
 	LDDocument* file = nullptr;
 	QString shortName = LDDocument::shortenName (path);
-	for (LDDocument* doc : g_allDocuments)
+	for (LDDocument* doc : g_win->allDocuments())
 	{
-		if (doc != null and doc->name() == shortName)
+		if (doc->name() == shortName)
 		{
 			documentToReplace = doc;
 			break;
 		}
 	}
 		g_loadingMainFile = false;
 		return;
 	}
 	file->setImplicit (false);
+	g_win->closeInitialDocument();
-	// If we have an anonymous, unchanged file open as the only open file
+	g_win->changeDocument (file);
-	// (aside of the one we just opened), close it now.
-	LDDocument::closeInitialFile();
-	// Rebuild the object tree view now.
-	LDDocument::setCurrent (file);
 	g_win->doFullRefresh();
-	// Add it to the recent files list.
 	AddRecentFile (path);
 	g_loadingMainFile = false;
 	// If there were problems loading subfile references, try see if we can find these
 	// files on the parts tracker.
 		if (nameComment->text().left (6) == "Name: ")
 		{
 			QString newname = shortenName (path);
 			nameComment->setText (format ("Name: %1", newname));
-			g_win->buildObjList();
+			m_window->buildObjList();
 		}
 	}
 	QByteArray data;
 	// We have successfully saved, update the save position now.
 	setSavePosition (history()->position());
 	setFullPath (path);
 	setName (shortenName (path));
+	m_window->updateDocumentListItem (this);
-	g_win->updateDocumentListItem (this);
+	m_window->updateTitle();
-	g_win->updateTitle();
 	return true;
 }
 // =============================================================================
 //
 			obj->replace (ParseLine (static_cast<LDError*> (obj)->contents()));
 	}
 	m_needsReCache = true;
-	if (this == CurrentDocument())
+	if (this == m_window->currentDocument())
-		g_win->buildObjList();
+		m_window->buildObjList();
 }
 // =============================================================================
 //
 int LDDocument::addObject (LDObject* obj)
 {
 	history()->add (new AddHistory (objects().size(), obj));
 	m_objects << obj;
 	addKnownVertices (obj);
 	obj->setDocument (this);
-	g_win->R()->compileObject (obj);
+	m_window->R()->compileObject (obj);
 	return getObjectCount() - 1;
 }
 // =============================================================================
 //
 void LDDocument::insertObj (int pos, LDObject* obj)
 {
 	history()->add (new AddHistory (pos, obj));
 	m_objects.insert (pos, obj);
 	obj->setDocument (this);
-	g_win->R()->compileObject (obj);
+	m_window->R()->compileObject (obj);
 #ifdef DEBUG
 	if (not isImplicit())
 		dprint ("Inserted object #%1 (%2) at %3\n", obj->id(), obj->typeName(), pos);
 // =============================================================================
 //
 bool IsSafeToCloseAll()
 {
-	for (LDDocument* f : LDDocument::explicitDocuments())
+	for (LDDocument* f : g_win->allDocuments())
 	{
 		if (not f->isSafeToClose())
 			return false;
 	}
 	m_objectVertices.remove (m_objects[idx]);
 	m_objects[idx]->deselect();
 	m_objects[idx]->setDocument (nullptr);
 	obj->setDocument (this);
 	addKnownVertices (obj);
-	g_win->R()->compileObject (obj);
+	m_window->R()->compileObject (obj);
 	m_objects[idx] = obj;
 	needVertexMerge();
 }
 // =============================================================================
 LDObjectList LDDocument::inlineContents (bool deep, bool renderinline)
 {
 	// Possibly substitute with logoed studs:
 	// stud.dat -> stud-logo.dat
 	// stud2.dat -> stud-logo2.dat
-	if (g_win->configBag()->useLogoStuds() and renderinline)
+	if (m_config->useLogoStuds() and renderinline)
 	{
 		// Ensure logoed studs are loaded first
 		LoadLogoStuds();
 		if (name() == "stud.dat" and g_logoedStud != null)
 		else
 			objs << obj->createCopy();
 	}
 	return objs;
-}
-// =============================================================================
-//
-LDDocument* LDDocument::current()
-{
-	return g_currentDocument;
-}
-// =============================================================================
-// Sets the given file as the current one on display. At some point in time this
-// was an operation completely unheard of. ;)
-//
-// TODO: f can be temporarily null. This probably should not be the case.
-// =============================================================================
-void LDDocument::setCurrent (LDDocument* f)
-{
-	// Implicit files were loaded for caching purposes and must never be set
-	// current.
-	if (f != null and f->isImplicit())
-		return;
-	g_currentDocument = f;
-	if (g_win and f)
-	{
-		// A ton of stuff needs to be updated
-		g_win->updateDocumentListItem (f);
-		g_win->buildObjList();
-		g_win->updateTitle();
-		g_win->R()->setDocument (f);
-		g_win->R()->compiler()->needMerge();
-		print ("Changed file to %1", f->getDisplayName());
-	}
-}
-// =============================================================================
-//
-int LDDocument::countExplicitFiles()
-{
-	return g_explicitDocuments.size();
-}
-// =============================================================================
-// This little beauty closes the initial file that was open at first when opening
-// a new file over it.
-// =============================================================================
-void LDDocument::closeInitialFile()
-{
-	if (g_explicitDocuments.size() == 2 and
-		g_explicitDocuments[0]->name().isEmpty() and
-		not g_explicitDocuments[1]->name().isEmpty() and
-		not g_explicitDocuments[0]->hasUnsavedChanges())
-	{
-		LDDocument* filetoclose = g_explicitDocuments.first();
-		filetoclose->dismiss();
-	}
 }
 // =============================================================================
 //
 void LoadLogoStuds()
 void LDDocument::addToSelection (LDObject* obj) // [protected]
 {
 	if (not obj->isSelected() and obj->document() == this)
 	{
 		m_sel << obj;
-		g_win->R()->compileObject (obj);
+		m_window->R()->compileObject (obj);
 		obj->setSelected (true);
 	}
 }
 // =============================================================================
 void LDDocument::removeFromSelection (LDObject* obj) // [protected]
 {
 	if (obj->isSelected() and obj->document() == this)
 	{
 		m_sel.removeOne (obj);
-		g_win->R()->compileObject (obj);
+		m_window->R()->compileObject (obj);
 		obj->setSelected (false);
 	}
 }
 // =============================================================================
 //
 void LDDocument::clearSelection()
 {
 	for (LDObject* obj : m_sel)
 	{
-		g_win->R()->compileObject (obj);
+		m_window->R()->compileObject (obj);
 		obj->setSelected (false);
 	}
 	m_sel.clear();
 }

Mercurial > ldforge / file comparison

comparison: src/ldDocument.cpp

src/ldDocument.cpp