ldforge: comparison src/mainwindow.cpp

-:29dc03eceb5f
+:ce0c9f2e6b9c
 	m_isSelectionLocked(false)
 {
 	g_win = this;
 	ui.setupUi(this);
 	m_updatingTabs = false;
-	m_renderer = new GLRenderer(this);
 	m_tabs = new QTabBar;
 	m_tabs->setTabsClosable(true);
 	ui.verticalLayout->insertWidget(0, m_tabs);
 	createBlankDocument();
-	m_renderer->setDocument(m_currentDocument);
-	// Stuff the renderer into its frame
-	QVBoxLayout* rendererLayout = new QVBoxLayout(ui.rendererFrame);
-	rendererLayout->addWidget(renderer());
 	connect(ui.objectList, SIGNAL(itemSelectionChanged()), this, SLOT(selectionChanged()));
 	connect(ui.objectList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(objectListDoubleClicked(QListWidgetItem*)));
 	connect(m_tabs, SIGNAL(currentChanged(int)), this, SLOT(tabSelected()));
 	connect(m_tabs, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
 	updateRecentFilesMenu();
 	updateColorToolbar();
 	updateTitle();
 	loadShortcuts();
 	setMinimumSize(300, 200);
-	connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(doLastSecondCleanup()));
 	connect(
 		ui.ringToolSegments, SIGNAL(valueChanged(int)),
 		this, SLOT(circleToolSegmentsChanged())
 	);
 	connect(
 	}
 }
 MainWindow::~MainWindow()
 {
+	for (GLRenderer* renderer : m_renderers.values())
+		delete renderer;
+	delete &ui;
 	g_win = nullptr;
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::endAction()
 {
 	m_currentDocument->addHistoryStep();
 	updateDocumentListItem(m_currentDocument);
 	refresh();
-}
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void MainWindow::doLastSecondCleanup()
-{
-	delete m_renderer;
-	delete &ui;
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::updateRecentFilesMenu()
 	ui.actionGridMedium->setChecked(grid == Grid::Medium);
 	ui.actionGridFine->setChecked(grid == Grid::Fine);
 	// Recompile all Bézier curves, the changing grid affects their precision.
 	for (LDObjectIterator<LDBezierCurve> it(m_currentDocument); it.isValid(); ++it)
-		renderer()->compileObject(it);
+		currentRenderer()->compileObject(it);
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::updateTitle()
 			}
 			case OBJ_Overlay:
 			{
 				LDOverlay* ovl = static_cast<LDOverlay*>(obj);
-				descr = format("[%1] %2(%3, %4), %5 x %6", renderer()->cameraName((ECamera) ovl->camera()),
+				descr = format("[%1] %2(%3, %4), %5 x %6", currentRenderer()->cameraName((ECamera) ovl->camera()),
 					Basename(ovl->fileName()), ovl->x(), ovl->y(),
 					ovl->width(), ovl->height());
 				break;
 			}
 	// Update the GL renderer
 	LDObjectList compound = priorSelection + selectedObjects();
 	removeDuplicates(compound);
 	for (LDObject* obj : compound)
-		renderer()->compileObject(obj);
+		currentRenderer()->compileObject(obj);
-	renderer()->update();
+	currentRenderer()->update();
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::recentFileClicked()
 	{
 		if (not obj->isColored())
 			continue; // uncolored object
 		obj->setColor(color);
-		renderer()->compileObject(obj);
+		currentRenderer()->compileObject(obj);
 	}
 	endAction();
 	refresh();
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::doFullRefresh()
 {
+	this->buildObjectList();
+	this->currentRenderer()->hardRefresh();
+}
+// ---------------------------------------------------------------------------------------------------------------------
+//
+// Builds the object list and tells the GL renderer to do a soft update.
+//
+void MainWindow::refresh()
+{
 	buildObjectList();
-	m_renderer->hardRefresh();
+	currentRenderer()->update();
-}
-// ---------------------------------------------------------------------------------------------------------------------
-//
-// Builds the object list and tells the GL renderer to do a soft update.
-//
-void MainWindow::refresh()
-{
-	buildObjectList();
-	m_renderer->update();
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::updateSelection()
 	{
 		contextMenu->addSeparator();
 		contextMenu->addAction(ui.actionSubfileSelection);
 	}
-	if (renderer()->camera() != EFreeCamera)
+	if (currentRenderer()->camera() != EFreeCamera)
 	{
 		contextMenu->addSeparator();
 		contextMenu->addAction(ui.actionSetDrawDepth);
 	}
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::updateEditModeActions()
 {
-	const EditModeType mode = renderer()->currentEditModeType();
+	const EditModeType mode = currentRenderer()->currentEditModeType();
 	ui.actionModeSelect->setChecked(mode == EditModeType::Select);
 	ui.actionModeDraw->setChecked(mode == EditModeType::Draw);
 	ui.actionModeRectangle->setChecked(mode == EditModeType::Rectangle);
 	ui.actionModeCircle->setChecked(mode == EditModeType::Circle);
 	ui.actionModeMagicWand->setChecked(mode == EditModeType::MagicWand);
 }
 // Adds a message to the renderer's message manager.
 void MainWindow::addMessage(QString msg)
 {
-	m_renderer->messageLog()->addLine(msg);
+	this->currentRenderer()->messageLog()->addLine(msg);
 }
 // ============================================================================
 void ObjectList::contextMenuEvent(QContextMenuEvent* ev)
 {
 	ui.actionDrawConditionalLines->setChecked(config->drawConditionalLines());
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
-GLRenderer* MainWindow::renderer()
+GLRenderer* MainWindow::currentRenderer()
 {
-	return m_renderer;
+	return m_renderers[m_currentDocument];
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 void MainWindow::setQuickColors(const QList<ColorToolbarItem>& colors)
 {
 	LDDocument* document = m_documents->createNew();
 	connect(document->history(), SIGNAL(undone()), this, SLOT(historyTraversed()));
 	connect(document->history(), SIGNAL(redone()), this, SLOT(historyTraversed()));
 	connect(document->history(), SIGNAL(stepAdded()), this, SLOT(updateActions()));
+	connect(document, SIGNAL(closed()), this, SLOT(documentClosed()));
+	GLRenderer* renderer = new GLRenderer {document, this};
+	m_renderers[document] = renderer;
+	ui.rendererStack->addWidget(renderer);
 	if (not cache)
+	{
+		changeDocument(document);
 		document->openForEditing();
+	}
 	return document;
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
 // TODO: document may be null, this shouldn't be the case
 //
 void MainWindow::changeDocument(LDDocument* document)
 {
-	// Implicit files were loaded for caching purposes and may never be switched to.
+	// Implicit files were loaded for caching purposes and may
+	// not be switched to.
 	if (document and document->isCache())
 		return;
 	m_currentDocument = document;
 	{
 		// A ton of stuff needs to be updated
 		updateDocumentListItem(document);
 		buildObjectList();
 		updateTitle();
-		m_renderer->setDocument(document);
+		ui.rendererStack->setCurrentWidget(m_renderers[document]);
-		m_renderer->compiler()->needMerge();
 		print("Changed document to %1", document->getDisplayName());
 	}
 }
 // ---------------------------------------------------------------------------------------------------------------------
 	return m_currentDocument->getSelection();
 }
 // ---------------------------------------------------------------------------------------------------------------------
 //
-void MainWindow::currentDocumentClosed()
+void MainWindow::documentClosed()
 {
-	LDDocument* old = currentDocument();
+	LDDocument* document = qobject_cast<LDDocument*>(sender());
-	// Find a replacement document to use
+	if (not document)
-	for (LDDocument* doc : m_documents->allDocuments())
+		return;
-	{
-		if (doc != old and not doc->isCache())
+	if (document == currentDocument())
-		{
+	{
-			changeDocument(doc);
+		LDDocument* previousCurrentDocument = currentDocument();
-			break;
-		}
+		// Find a replacement document to use
-	}
+		for (LDDocument* document : m_documents->allDocuments())
+		{
-	if (currentDocument() == old)
+			if (document != previousCurrentDocument and not document->isCache())
-	{
+			{
-		// Failed to change to a suitable document, open a new one.
+				changeDocument(document);
-		createBlankDocument();
+				break;
+			}
+		}
+		if (currentDocument() == previousCurrentDocument)
+		{
+			// Failed to change to a suitable document, open a new one.
+			createBlankDocument();
+		}
+	}
+	if (m_renderers.contains(document))
+	{
+		delete m_renderers[document];
+		m_renderers.remove(document);
 	}
 }
 ExtProgramToolset* MainWindow::externalPrograms()
 {

Mercurial > ldforge / file comparison

comparison: src/mainwindow.cpp

src/mainwindow.cpp