ldforge: comparison src/gui.cpp

-:b85554206155
+:afa691788bdb
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 int ForgeWindow::deleteSelection()
-{	if (m_sel.size() == 0)
+{	if (selection().isEmpty())
 		return 0;
-	QList<LDObject*> selCopy = m_sel;
+	QList<LDObject*> selCopy = selection();
 	int num = 0;
 	// Delete the objects that were being selected
-for (LDObject * obj : selCopy)
+	for (LDObject* obj : selCopy)
 	{	LDFile::current()->forgetObject (obj);
 		++num;
 		delete obj;
 	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::scrollToSelection()
-{	if (m_sel.size() == 0)
+{	if (selection().isEmpty())
 		return;
-	LDObject* obj = m_sel[m_sel.size() - 1];
+	LDObject* obj = selection().last();
 	ui->objectList->scrollToItem (obj->qObjListEntry);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 	// called during GL picking, in which case the GL renderer takes care
 	// of the selection.
 	if (m_renderer->picking())
 		return;
-	QList<LDObject*> priorSelection = m_sel;
+	QList<LDObject*> priorSelection = selection();
 	// Get the objects from the object list selection
-	m_sel.clear();
+	LDFile::current()->clearSelection();
 	const QList<QListWidgetItem*> items = ui->objectList->selectedItems();
 	for (LDObject* obj : LDFile::current()->objects())
-		for (QListWidgetItem* item : items)
+	{	for (QListWidgetItem* item : items)
 		{	if (item == obj->qObjListEntry)
-			{	m_sel << obj;
+			{	obj->select();
 				break;
 			}
 		}
+	}
 	// Update the GL renderer
-	for (LDObject* obj : priorSelection)
+	QList<LDObject*> compound = priorSelection + selection();
-	{	obj->setSelected (false);
+	removeDuplicates (compound);
+	for (LDObject* obj : compound)
 		m_renderer->compileObject (obj);
-	}
-	for (LDObject* obj : m_sel)
-	{	obj->setSelected (true);
-		m_renderer->compileObject (obj);
-	}
 	m_renderer->update();
 }
 // =============================================================================
 void ForgeWindow::slot_quickColor()
 {	beginAction (null);
 	QToolButton* button = static_cast<QToolButton*> (sender());
 	LDColor* col = null;
-for (const LDQuickColor & entry : m_quickColors)
+	for (const LDQuickColor & entry : m_quickColors)
 	{	if (entry.toolButton() == button)
 		{	col = entry.color();
 			break;
 		}
 	}
 	if (col == null)
 		return;
 	short newColor = col->index;
-	for (LDObject * obj : m_sel)
+	for (LDObject* obj : selection())
 	{	if (obj->isColored() == false)
 			continue; // uncolored object
 		obj->setColor (newColor);
 		R()->compileObject (obj);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 int ForgeWindow::getInsertionPoint()
-{	if (m_sel.size() > 0)
+{	// If we have a selection, put the item after it.
-	{	// If we have a selection, put the item after it.
+	if (!selection().isEmpty())
-		return (m_sel[m_sel.size() - 1]->getIndex()) + 1;
+		return selection().last()->getIndex() + 1;
-	}
 	// Otherwise place the object at the end.
 	return LDFile::current()->numObjs();
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::updateSelection()
 {	g_bSelectionLocked = true;
-for (LDObject * obj : LDFile::current()->objects())
+	for (LDObject* obj : LDFile::current()->objects())
 		obj->setSelected (false);
 	ui->objectList->clearSelection();
-for (LDObject * obj : m_sel)
+	for (LDObject* obj : selection())
 	{	if (obj->qObjListEntry == null)
 			continue;
 		obj->qObjListEntry->setSelected (true);
 		obj->setSelected (true);
 	slot_selectionChanged();
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-bool ForgeWindow::isSelected (LDObject* obj)
-{	LDObject* needle = obj->topLevelParent();
-for (LDObject * hay : m_sel)
-		if (hay == needle)
-			return true;
-	return false;
-}
 short ForgeWindow::getSelectedColor()
 {	short result = -1;
-for (LDObject * obj : m_sel)
+	for (LDObject* obj : selection())
 	{	if (obj->isColored() == false)
 			continue; // doesn't use color
 		if (result != -1 && obj->color() != result)
 			return -1; // No consensus in object color
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDObject::Type ForgeWindow::uniformSelectedType()
 {	LDObject::Type result = LDObject::Unidentified;
-for (LDObject * obj : m_sel)
+	for (LDObject * obj : selection())
 	{	if (result != LDObject::Unidentified && obj->color() != result)
 			return LDObject::Unidentified;
 		if (result == LDObject::Unidentified)
 			result = obj->getType();
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::spawnContextMenu (const QPoint pos)
-{	const bool single = (g_win->sel().size() == 1);
+{	const bool single = (selection().size() == 1);
-	LDObject* singleObj = (single) ? g_win->sel() [0] : null;
+	LDObject* singleObj = (single) ? selection()[0] : null;
 	QMenu* contextMenu = new QMenu;
 	if (single && singleObj->getType() != LDObject::Empty)
 	{	contextMenu->addAction (ACTION (Edit));
 void ForgeWindow::setStatusBarText (str text)
 {	statusBar()->showMessage (text);
 }
-void ForgeWindow::clearSelection()
-{	m_sel.clear();
-}
 Ui_LDForgeUI* ForgeWindow::interface() const
 {	return ui;
 }
 #define act(N) QAction* ForgeWindow::action##N() { return ui->action##N; }

Mercurial > ldforge / file comparison

comparison: src/gui.cpp

src/gui.cpp