ldforge: comparison src/gui.cpp

-:2f85d4d286e5
+:72ad83a67165
 for (LDQuickColor & entry : m_quickColors)
 	{	if (entry.isSeparator())
 			ui->colorToolbar->addSeparator();
 		else
 		{	QToolButton* colorButton = new QToolButton;
-			colorButton->setIcon (makeColorIcon (entry.color(), 22));
+			colorButton->setIcon (makeColorIcon (entry.getColor(), 22));
 			colorButton->setIconSize (QSize (22, 22));
-			colorButton->setToolTip (entry.color()->name);
+			colorButton->setToolTip (entry.getColor()->name);
 			connect (colorButton, SIGNAL (clicked()), this, SLOT (slot_quickColor()));
 			ui->colorToolbar->addWidget (colorButton);
 			m_colorButtons << colorButton;
 void ForgeWindow::updateTitle()
 {	str title = fmt (APPNAME " %1", fullVersionString());
 	// Append our current file if we have one
 	if (LDFile::current())
-	{	if (LDFile::current()->name().length() > 0)
+	{	if (LDFile::current()->getName().length() > 0)
-			title += fmt (": %1", basename (LDFile::current()->name()));
+			title += fmt (": %1", basename (LDFile::current()->getName()));
 		else
 			title += fmt (": <anonymous>");
 		if (LDFile::current()->getObjectCount() > 0 &&
 				LDFile::current()->getObject (0)->getType() == LDObject::Comment)
 		{	// Append title
 			LDComment* comm = static_cast<LDComment*> (LDFile::current()->getObject (0));
 			title += fmt (": %1", comm->text);
 		}
-		if (LDFile::current()->history().pos() != LDFile::current()->savePos())
+		if (LDFile::current()->getHistory()->getPosition() != LDFile::current()->getSavePosition())
 			title += '*';
 	}
 #ifdef DEBUG
 	title += " [debug build]";
 	for (int i = 0; i < ui->objectList->count(); ++i)
 		delete ui->objectList->item (i);
 	ui->objectList->clear();
-	for (LDObject* obj : LDFile::current()->objects())
+	for (LDObject* obj : LDFile::current()->getObjects())
 	{	str descr;
 		switch (obj->getType())
 		{	case LDObject::Comment:
 			{	descr = static_cast<LDComment*> (obj)->text;
 			} break;
 			case LDObject::Subfile:
 			{	LDSubfile* ref = static_cast<LDSubfile*> (obj);
-				descr = fmt ("%1 %2, (", ref->fileInfo()->name(), ref->position().stringRep (true));
+				descr = fmt ("%1 %2, (", ref->getFileInfo()->getName(), ref->position().stringRep (true));
 				for (int i = 0; i < 9; ++i)
-					descr += fmt ("%1%2", ref->transform()[i], (i != 8) ? " " : "");
+					descr += fmt ("%1%2", ref->getTransform()[i], (i != 8) ? " " : "");
 				descr += ')';
 			} break;
 			case LDObject::BFC:
 			{	descr = LDBFC::statements[static_cast<LDBFC*> (obj)->type];
 			} break;
 			case LDObject::Overlay:
 			{	LDOverlay* ovl = static_cast<LDOverlay*> (obj);
-				descr = fmt ("[%1] %2 (%3, %4), %5 x %6", g_CameraNames[ovl->camera()],
+				descr = fmt ("[%1] %2 (%3, %4), %5 x %6", g_CameraNames[ovl->getCamera()],
-							 basename (ovl->filename()), ovl->x(), ovl->y(), ovl->width(), ovl->height());
+					basename (ovl->getFileName()), ovl->getX(), ovl->getY(),
+					ovl->getWidth(), ovl->getHeight());
 			}
 			break;
 			default:
 			{	descr = obj->getTypeName();
 		QListWidgetItem* item = new QListWidgetItem (descr);
 		item->setIcon (getIcon (obj->getTypeName()));
 		// Use italic font if hidden
-		if (obj->hidden())
+		if (obj->isHidden())
 		{	QFont font = item->font();
 			font.setItalic (true);
 			item->setFont (font);
 		}
 		// Color gibberish orange on red so it stands out.
 		if (obj->getType() == LDObject::Error)
 		{	item->setBackground (QColor ("#AA0000"));
 			item->setForeground (QColor ("#FFAA00"));
 		}
-		elif (lv_colorize && obj->isColored() && obj->color() != maincolor && obj->color() != edgecolor)
+		elif (lv_colorize && obj->isColored() && obj->getColor() != maincolor && obj->getColor() != edgecolor)
 		{	// If the object isn't in the main or edge color, draw this
 			// list entry in said color.
-			LDColor* col = getColor (obj->color());
+			LDColor* col = getColor (obj->getColor());
 			if (col)
 				item->setForeground (col->faceColor);
 		}
 		return;
 	// Update the shared selection array, though don't do this if this was
 	// called during GL picking, in which case the GL renderer takes care
 	// of the selection.
-	if (m_renderer->picking())
+	if (m_renderer->isPicking())
 		return;
 	QList<LDObject*> priorSelection = selection();
 	// Get the objects from the object list selection
 	LDFile::current()->clearSelection();
 	const QList<QListWidgetItem*> items = ui->objectList->selectedItems();
-	for (LDObject* obj : LDFile::current()->objects())
+	for (LDObject* obj : LDFile::current()->getObjects())
 	{	for (QListWidgetItem* item : items)
 		{	if (item == obj->qObjListEntry)
 			{	obj->select();
 				break;
 			}
 {	beginAction (null);
 	QToolButton* button = static_cast<QToolButton*> (sender());
 	LDColor* col = null;
 	for (const LDQuickColor & entry : m_quickColors)
-	{	if (entry.toolButton() == button)
+	{	if (entry.getToolButton() == button)
-		{	col = entry.color();
+		{	col = entry.getColor();
 			break;
 		}
 	}
 	if (col == null)
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::updateSelection()
 {	g_isSelectionLocked = true;
-	for (LDObject* obj : LDFile::current()->objects())
+	for (LDObject* obj : LDFile::current()->getObjects())
 		obj->setSelected (false);
 	ui->objectList->clearSelection();
 	for (LDObject* obj : selection())
 	for (LDObject* obj : selection())
 	{	if (obj->isColored() == false)
 			continue; // doesn't use color
-		if (result != -1 && obj->color() != result)
+		if (result != -1 && obj->getColor() != result)
 			return -1; // No consensus in object color
 		if (result == -1)
-			result = obj->color();
+			result = obj->getColor();
 	}
 	return result;
 }
 // -----------------------------------------------------------------------------
 LDObject::Type ForgeWindow::getUniformSelectedType()
 {	LDObject::Type result = LDObject::Unidentified;
 	for (LDObject * obj : selection())
-	{	if (result != LDObject::Unidentified && obj->color() != result)
+	{	if (result != LDObject::Unidentified && obj->getColor() != result)
 			return LDObject::Unidentified;
 		if (result == LDObject::Unidentified)
 			result = obj->getType();
 	}
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::deleteByColor (const int colnum)
 {	QList<LDObject*> objs;
-for (LDObject * obj : LDFile::current()->objects())
+	for (LDObject* obj : LDFile::current()->getObjects())
-	{	if (!obj->isColored() || obj->color() != colnum)
+	{	if (!obj->isColored() || obj->getColor() != colnum)
 			continue;
 		objs << obj;
 	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::updateEditModeActions()
-{	const EditMode mode = R()->editMode();
+{	const EditMode mode = R()->getEditMode();
 	ACTION (ModeSelect)->setChecked (mode == Select);
 	ACTION (ModeDraw)->setChecked (mode == Draw);
 	ACTION (ModeCircle)->setChecked (mode == CircleMode);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::slot_editObject (QListWidgetItem* listitem)
 {	LDObject* obj = null;
-	for (LDObject* it : LDFile::current()->objects())
+	for (LDObject* it : LDFile::current()->getObjects())
 	{	if (it->qObjListEntry == listitem)
 		{	obj = it;
 			break;
 		}
 	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void ForgeWindow::save (LDFile* f, bool saveAs)
-{	str path = f->name();
+{	str path = f->getName();
 	if (saveAs || path.isEmpty())
 	{	path = QFileDialog::getSaveFileName (g_win, tr ("Save As"),
-			(f->name().isEmpty()) ? f->name() : f->defaultName(), tr ("LDraw files (*.dat *.ldr)"));
+			(f->getName().isEmpty()) ? f->getName() : f->getDefaultName(),
+			tr ("LDraw files (*.dat *.ldr)"));
 		if (path.isEmpty())
 		{	// User didn't give a file name, abort.
 			return;
 		}
 	paint.fillRect (QRect (1, 1, size - 2, size - 2), col);
 	return QIcon (QPixmap::fromImage (img));
 }
 // =============================================================================
-void makeColorSelector (QComboBox* box)
+void makeColorComboBox (QComboBox* box)
 {	std::map<int, int> counts;
-	for (LDObject * obj : LDFile::current()->objects())
+	for (LDObject * obj : LDFile::current()->getObjects())
 	{	if (!obj->isColored())
 			continue;
-		if (counts.find (obj->color()) == counts.end())
+		if (counts.find (obj->getColor()) == counts.end())
-			counts[obj->color()] = 1;
+			counts[obj->getColor()] = 1;
 		else
-			counts[obj->color()]++;
+			counts[obj->getColor()]++;
 	}
 	box->clear();
 	int row = 0;
 	{	LDColor* col = getColor (pair.first);
 		assert (col != null);
 		QIcon ico = makeColorIcon (col, 16);
 		box->addItem (ico, fmt ("[%1] %2 (%3 object%4)",
-								pair.first, col->name, pair.second, plural (pair.second)));
+			pair.first, col->name, pair.second, plural (pair.second)));
 		box->setItemData (row, pair.first);
 		++row;
 	}
 }
 void ForgeWindow::updateFileList()
 {	ui->fileList->clear();
 	for (LDFile* f : g_loadedFiles)
 	{	// Don't list implicit files unless explicitly desired.
-		if (f->implicit() && !gui_implicitfiles)
+		if (f->isImplicit() && !gui_implicitfiles)
 			continue;
 		// Add an item to the list for this file and store a pointer to it in
 		// the file, so we can find files by the list item.
 		ui->fileList->addItem ("");
 		updateFileListItem (f);
 	}
 }
 void ForgeWindow::updateFileListItem (LDFile* f)
-{	if (f->listItem() == null)
+{	if (f->getListItem() == null)
 	{	// We don't have a list item for this file, so the list either doesn't
 		// exist yet or is out of date. Build the list now.
 		updateFileList();
 		return;
 	}
 	// If this is the current file, it also needs to be the selected item on
 	// the list.
 	if (f == LDFile::current())
-		ui->fileList->setCurrentItem (f->listItem());
+		ui->fileList->setCurrentItem (f->getListItem());
 	// If we list implicit files, draw them with a shade of gray to make them
 	// distinct.
-	if (f->implicit())
+	if (f->isImplicit())
-		f->listItem()->setForeground (QColor (96, 96, 96));
+		f->getListItem()->setForeground (QColor (96, 96, 96));
-	f->listItem()->setText (f->getShortName());
+	f->getListItem()->setText (f->getShortName());
 	// If the file has unsaved changes, draw a little icon next to it to mark that.
-	f->listItem()->setIcon (f->hasUnsavedChanges() ? getIcon ("file-save") : QIcon());
+	f->getListItem()->setIcon (f->hasUnsavedChanges() ? getIcon ("file-save") : QIcon());
 }
 void ForgeWindow::beginAction (QAction* act)
 {	// Open the history so we can record the edits done during this action.
-	if (act != ACTION (Undo) && act != ACTION (Redo) && act != ACTION (Open))
+	if (act == ACTION (Undo) || act == ACTION (Redo) || act == ACTION (Open))
-		LDFile::current()->openHistory();
+		LDFile::current()->getHistory()->setIgnoring (true);
 }
 void ForgeWindow::endAction()
 {	// Close the history now.
-	LDFile::current()->closeHistory();
+	LDFile::current()->addHistoryStep();
 	// Update the list item of the current file - we may need to draw an icon
 	// now that marks it as having unsaved changes.
 	updateFileListItem (LDFile::current());
 }
 void ForgeWindow::changeCurrentFile()
 {	LDFile* f = null;
 	QListWidgetItem* item = ui->fileList->currentItem();
 	// Find the file pointer of the item that was selected.
-for (LDFile * it : g_loadedFiles)
+	for (LDFile* it : g_loadedFiles)
-	{	if (it->listItem() == item)
+	{	if (it->getListItem() == item)
 		{	f = it;
 			break;
 		}
 	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDQuickColor::LDQuickColor (LDColor* color, QToolButton* toolButton) :
-	m_color (color),
+	m_Color (color),
-	m_toolButton (toolButton) {}
+	m_ToolButton (toolButton) {}
 LDQuickColor LDQuickColor::getSeparator()
 {	return LDQuickColor (null, null);
 }
 bool LDQuickColor::isSeparator() const
-{	return color() == null;
+{	return getColor() == null;
 }

Mercurial > ldforge / file comparison

comparison: src/gui.cpp

src/gui.cpp