ldforge: comparison src/ldObject.cpp

-:3b1d2cc6603e
+:efcb47c64a72
 }
 LDSubfileReference::LDSubfileReference (Model* model) :
 LDMatrixObject (model) {}
-LDOBJ_DEFAULT_CTOR (LDEmpty, LDObject)
 LDOBJ_DEFAULT_CTOR (LDError, LDObject)
 LDOBJ_DEFAULT_CTOR (LDLine, LDObject)
 LDOBJ_DEFAULT_CTOR (LDTriangle, LDObject)
 LDOBJ_DEFAULT_CTOR (LDCondLine, LDLine)
 LDOBJ_DEFAULT_CTOR (LDQuad, LDObject)
 LDOBJ_DEFAULT_CTOR (LDBfc, LDObject)
-LDOBJ_DEFAULT_CTOR (LDComment, LDObject)
 LDOBJ_DEFAULT_CTOR (LDBezierCurve, LDObject)
 LDObject::~LDObject()
 {
 	// Delete the GL lists
 	if (g_win)
 		g_win->renderer()->forgetObject(this);
 	// Remove this object from the list of LDObjects
 	g_allObjects.erase(g_allObjects.find(id()));
-}
-// =============================================================================
-//
-QString LDComment::asText() const
-{
-	return format ("0 %1", text());
 }
 // =============================================================================
 //
 QString LDSubfileReference::asText() const
 	return contents();
 }
 // =============================================================================
 //
-QString LDEmpty::asText() const
-{
-	return "";
-}
-// =============================================================================
-//
 QString LDBfc::asText() const
 {
 	return format ("0 BFC %1", statementToString());
 }
 }
 int LDQuad::triangleCount() const
 {
 	return 2;
+}
+int LDObject::numVertices() const
+{
+	return 0;
 }
 // =============================================================================
 //
 LDLine::LDLine (Vertex v1, Vertex v2, Model* model) :
 		data->vertices[i] = vertex (i);
 	return data;
 }
+LDColor LDObject::defaultColor() const
+{
+	return MainColor;
+}
+bool LDObject::isColored() const
+{
+	return true;
+}
+bool LDObject::isScemantic() const
+{
+	return true;
+}
+bool LDObject::hasMatrix() const
+{
+	return false;
+}
 // =============================================================================
 //
 QList<LDPolygon> LDSubfileReference::inlinePolygons()
 {
 	QList<LDPolygon> data = fileInfo()->inlinePolygons();
 // =============================================================================
 //
 void LDObject::invert() {}
 void LDBfc::invert() {}
-void LDEmpty::invert() {}
-void LDComment::invert() {}
 void LDError::invert() {}
 // =============================================================================
 //
 void LDTriangle::invert()
 	return g_allObjects.value(id);
 }
 // =============================================================================
 //
-// Hook the set accessors of certain properties to this changeProperty function.
-// It takes care of history management so we can capture low-level changes, this
-// makes history stuff work out of the box.
-//
-template<typename T>
-static void changeProperty(LDObject* object, T* property, const T& value)
-{
-	if (*property == value)
-		return;
-	int position = object->lineNumber();
-	if (position != -1)
-	{
-		QString before = object->asText();
-		*property = value;
-		emit object->codeChanged(position, before, object->asText());
-	}
-	else
-	{
-		*property = value;
-	}
-}
-// =============================================================================
-//
 void LDObject::setColor (LDColor color)
 {
-	changeProperty (this, &m_color, color);
+	changeProperty(&m_color, color);
 }
 // =============================================================================
 //
 // Get a vertex by index
 //
 // Set a vertex to the given value
 //
 void LDObject::setVertex (int i, const Vertex& vert)
 {
-	changeProperty (this, &m_coords[i], vert);
+	changeProperty(&m_coords[i], vert);
 }
 LDMatrixObject::LDMatrixObject (Model* model) :
 LDObject (model),
 	m_position (Origin) {}
 // =============================================================================
 //
 void LDMatrixObject::setPosition (const Vertex& a)
 {
-	changeProperty (this, &m_position, a);
+	changeProperty(&m_position, a);
 }
 // =============================================================================
 //
 const Matrix& LDMatrixObject::transformationMatrix() const
 	return m_transformationMatrix;
 }
 void LDMatrixObject::setTransformationMatrix (const Matrix& val)
 {
-	changeProperty (this, &m_transformationMatrix, val);
+	changeProperty(&m_transformationMatrix, val);
 }
 LDError::LDError (QString contents, QString reason, Model* model) :
 LDObject (model),
 	m_contents (contents),
 }
 void LDError::setFileReferenced (QString value)
 {
 	m_fileReferenced = value;
-}
-LDComment::LDComment (QString text, Model* model) :
-LDObject {model},
-m_text {text} {}
-QString LDComment::text() const
-{
-	return m_text;
-}
-void LDComment::setText (QString value)
-{
-	changeProperty (this, &m_text, value);
 }
 LDBfc::LDBfc (const BfcStatement type, Model* model) :
 LDObject {model},
 m_statement {type} {}
 	return m_fileInfo;
 }
 void LDSubfileReference::setFileInfo (LDDocument* newReferee)
 {
-	changeProperty (this, &m_fileInfo, newReferee);
+	changeProperty(&m_fileInfo, newReferee);
 	if (model())
 		model()->recountTriangles();
 	// If it's an immediate subfile reference (i.e. this subfile is in an opened document), we need to pre-compile the
 	{
 		return typeName();
 	}
 }
-QString LDEmpty::objectListText() const
-{
-	return "";
-}
 QString LDError::objectListText() const
 {
 	return "ERROR: " + asText();
 }
 	result += ')';
 	return result;
 }
-QString LDComment::objectListText() const
-{
-	return text().simplified();
-}
 QString LDBfc::objectListText() const
 {
 	return statementToString();
 }

Mercurial > ldforge / file comparison

comparison: src/ldObject.cpp

src/ldObject.cpp