ldforge: comparison src/toolsets/algorithmtoolset.cpp

-:dc3ceb65cda7
+:4603d8fd063e
 void AlgorithmToolset::splitQuads()
 {
 	int num = 0;
-	for (LDObjectIterator<LDQuad> it (Selection()); it.isValid(); ++it)
+	for (LDObjectIterator<LDQuad> it (selectedObjects()); it.isValid(); ++it)
 	{
 		// Find the index of this quad
 		int index = it->lineNumber();
 		if (index == -1)
 		QList<LDTriangle*> triangles = it->splitToTriangles();
 		// Replace the quad with the first triangle and add the second triangle
 		// after the first one.
-		CurrentDocument()->setObject (index, triangles[0]);
+		currentDocument()->setObject (index, triangles[0]);
-		CurrentDocument()->insertObj (index + 1, triangles[1]);
+		currentDocument()->insertObj (index + 1, triangles[1]);
 		num++;
 	}
 	print ("%1 quadrilaterals split", num);
 }
 void AlgorithmToolset::editRaw()
 {
-	if (Selection().size() != 1)
+	if (selectedObjects().size() != 1)
 		return;
-	LDObject* obj = Selection()[0];
+	LDObject* obj = selectedObjects()[0];
 	QDialog* dlg = new QDialog;
 	Ui::EditRawUI ui;
 	ui.setupUi (dlg);
 	ui.code->setText (obj->asText());
 	obj->replace (newobj);
 }
 void AlgorithmToolset::makeBorders()
 {
-	LDObjectList objs = Selection();
+	LDObjectList objs = selectedObjects();
 	int num = 0;
 	for (LDObject* obj : objs)
 	{
 		const LDObjectType type = obj->type();
 		{
 			if (lines[i] == null)
 				continue;
 			long idx = obj->lineNumber() + i + 1;
-			CurrentDocument()->insertObj (idx, lines[i]);
+			currentDocument()->insertObj (idx, lines[i]);
 			++num;
 		}
 	}
 	print (tr ("Added %1 border lines"), num);
 void AlgorithmToolset::roundCoordinates()
 {
 	setlocale (LC_ALL, "C");
 	int num = 0;
-	for (LDObject* obj : Selection())
+	for (LDObject* obj : selectedObjects())
 	{
 		LDMatrixObject* mo = dynamic_cast<LDMatrixObject*> (obj);
 		if (mo != null)
 		{
 	if (ui.x->isChecked()) sel << X;
 	if (ui.y->isChecked()) sel << Y;
 	if (ui.z->isChecked()) sel << Z;
-	for (LDObject* obj : Selection())
+	for (LDObject* obj : selectedObjects())
 	{
 		for (int i = 0; i < obj->numVertices(); ++i)
 		{
 			Vertex v = obj->vertex (i);
 	if (ui.x->isChecked()) sel << X;
 	if (ui.y->isChecked()) sel << Y;
 	if (ui.z->isChecked()) sel << Z;
-	for (LDObject* obj : Selection())
+	for (LDObject* obj : selectedObjects())
 	{
 		for (int i = 0; i < obj->numVertices(); ++i)
 		{
 			Vertex v = obj->vertex (i);
 void AlgorithmToolset::demote()
 {
 	int num = 0;
-	for (LDObjectIterator<LDCondLine> it (Selection()); it.isValid(); ++it)
+	for (LDObjectIterator<LDCondLine> it (selectedObjects()); it.isValid(); ++it)
 	{
 		it->toEdgeLine();
 		++num;
 	}
 	print (tr ("Converted %1 conditional lines"), num);
 }
-bool AlgorithmToolset::isColorUsed (LDColor color) const
+bool AlgorithmToolset::isColorUsed (LDColor color)
 {
-	for (LDObject* obj : CurrentDocument()->objects())
+	for (LDObject* obj : currentDocument()->objects())
 	{
 		if (obj->isColored() and obj->color() == color)
 			return true;
 	}
 	{
 		print (tr ("Cannot auto-color: all colors are in use!"));
 		return;
 	}
-	for (LDObject* obj : Selection())
+	for (LDObject* obj : selectedObjects())
 	{
 		if (not obj->isColored())
 			continue;
 		obj->setColor (color);
 		ui->m_date->date().toString ("yyyy-MM-dd"),
 		ui->m_username->text(),
 		ui->m_comment->text()));
 	// Find a spot to place the new comment
-	for (obj = CurrentDocument()->getObject (0);
+	for (obj = currentDocument()->getObject (0);
 		obj and obj->next() and not obj->next()->isScemantic();
 		obj = obj->next())
 	{
 		LDComment* comment = dynamic_cast<LDComment*> (obj);
 		prevIsHistory = ishistory;
 	}
 	int idx = obj ? obj->lineNumber() : 0;
-	CurrentDocument()->insertObj (idx++, comment);
+	currentDocument()->insertObj (idx++, comment);
 	// If we're adding a history line right before a scemantic object, pad it
 	// an empty line
 	if (obj and obj->next() and obj->next()->isScemantic())
-		CurrentDocument()->insertObj (idx, new LDEmpty);
+		currentDocument()->insertObj (idx, new LDEmpty);
 	m_window->buildObjList();
 	delete ui;
 }
 	if (not ok)
 		return;
 	m_config->setSplitLinesSegments (segments);
-	for (LDObject* obj : Selection())
+	for (LDObject* obj : selectedObjects())
 	{
 		if (not isOneOf (obj->type(), OBJ_Line, OBJ_CondLine))
 			continue;
 		QVector<LDObject*> newsegs;
 		}
 		int ln = obj->lineNumber();
 		for (LDObject* seg : newsegs)
-			CurrentDocument()->insertObj (ln++, seg);
+			currentDocument()->insertObj (ln++, seg);
 		obj->destroy();
 	}
 	m_window->buildObjList();
 	m_window->refresh();
 }
 void AlgorithmToolset::subfileSelection()
 {
-	if (Selection().size() == 0)
+	if (selectedObjects().size() == 0)
 		return;
-	QString			parentpath (CurrentDocument()->fullPath());
+	QString			parentpath (currentDocument()->fullPath());
 	// BFC type of the new subfile - it shall inherit the BFC type of the parent document
 	BFCStatement	bfctype (BFCStatement::NoCertify);
 	// Dirname of the new subfile
 	// Title of the new subfile
 	QString			subtitle;
 	// Comment containing the title of the parent document
-	LDComment*	titleobj = dynamic_cast<LDComment*> (CurrentDocument()->getObject (0));
+	LDComment*	titleobj = dynamic_cast<LDComment*> (currentDocument()->getObject (0));
 	// License text for the subfile
 	QString			license (PreferredLicenseText());
 	// LDraw code body of the new subfile (i.e. code of the selection)
 	// Full path of the subfile to be
 	QString			fullsubname;
 	// Where to insert the subfile reference?
-	int				refidx (Selection()[0]->lineNumber());
+	int				refidx (selectedObjects()[0]->lineNumber());
 	// Determine title of subfile
 	if (titleobj != null)
 		subtitle = "~" + titleobj->text();
 	else
 	while (subtitle.startsWith ("~~"))
 		subtitle.remove (0, 1);
 	// If this the parent document isn't already in s/, we need to stuff it into
 	// a subdirectory named s/. Ensure it exists!
-	QString topdirname = Basename (Dirname (CurrentDocument()->fullPath()));
+	QString topdirname = Basename (Dirname (currentDocument()->fullPath()));
 	if (topdirname != "s")
 	{
 		QString desiredPath = subdirname + "/s";
 		QString title = tr ("Create subfile directory?");
 		} while (FindDocument ("s\\" + Basename (fullsubname)) != null or QFile (fullsubname).exists());
 	}
 	// Determine the BFC winding type used in the main document - it is to
 	// be carried over to the subfile.
-	for (LDObjectIterator<LDBFC> it (CurrentDocument()); it.isValid(); ++it)
+	for (LDObjectIterator<LDBFC> it (currentDocument()); it.isValid(); ++it)
 	{
 		if (isOneOf (it->statement(), BFCStatement::CertifyCCW, BFCStatement::CertifyCW, BFCStatement::NoCertify))
 		{
 			bfctype = it->statement();
 			break;
 		}
 	}
 	// Get the body of the document in LDraw code
-	for (LDObject* obj : Selection())
+	for (LDObject* obj : selectedObjects())
 		code << obj->asText();
 	// Create the new subfile document
-	LDDocument* doc = LDDocument::createNew();
+	LDDocument* doc = m_window->newDocument();
 	doc->setImplicit (false);
 	doc->setFullPath (fullsubname);
 	doc->setName (LDDocument::shortenName (fullsubname));
 	LDObjectList objs;
 	// Try save it
 	if (m_window->save (doc, true))
 	{
 		// Save was successful. Delete the original selection now from the
 		// main document.
-		for (LDObject* obj : Selection())
+		for (LDObject* obj : selectedObjects())
 			obj->destroy();
 		// Add a reference to the new subfile to where the selection was
 		LDSubfile* ref = LDSpawn<LDSubfile>();
 		ref->setColor (MainColor);
 		ref->setFileInfo (doc);
 		ref->setPosition (Origin);
 		ref->setTransform (IdentityMatrix);
-		CurrentDocument()->insertObj (refidx, ref);
+		currentDocument()->insertObj (refidx, ref);
 		// Refresh stuff
 		m_window->updateDocumentList();
 		m_window->doFullRefresh();
 	}

Mercurial > ldforge / file comparison

comparison: src/toolsets/algorithmtoolset.cpp

src/toolsets/algorithmtoolset.cpp