Sun, 29 Jan 2017 15:05:14 +0200
Major overhaul of object→document relationship: added the Model class which models the object buffer. Each object is to be included in a model (an invariant that currently does not hold). A document is a subclass of a model. The LDObject is also now agnostic about selection, and the selection is now a set. A lot of things are probably broken now but it's a major step forward.
The LDObject::destroy method is also now gone. The model decides when objects are destroyed and calls the destructor directly. The end result removes a lot of cruft and adds structure to LDObject relations.
Notes:
- Inlining does not currently work (nothing simply gets inlined in)
- More work is required to ensure that each object actually goes into a model
/* * LDForge: LDraw parts authoring CAD * Copyright (C) 2013 - 2017 Teemu Piippo * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once #include <QObject> #include "main.h" #include "configuration.h" class MainWindow; class GuiUtilities; class LDDocument; class DocumentManager; class PrimitiveManager; class Grid; class MathFunctions; // // Objects that are to take part in the MainWindow's hierarchy multiple-inherit from this class to get a pointer back // to the MainWindow class along with a few useful pointers and methods. // class HierarchyElement { public: HierarchyElement (QObject* parent); const QSet<LDObject*>& selectedObjects(); LDDocument* currentDocument(); GuiUtilities* guiUtilities() const; PrimitiveManager* primitives(); Grid* grid() const; MathFunctions* math() const; // Utility functions QString preferredLicenseText() const; protected: MainWindow* m_window; DocumentManager* m_documents; Configuration* m_config; };