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 "toolset.h" class BasicToolset : public Toolset { Q_OBJECT public: BasicToolset (MainWindow *parent); Q_INVOKABLE void copy(); Q_INVOKABLE void cut(); Q_INVOKABLE void edit(); Q_INVOKABLE void inlineDeep(); Q_INVOKABLE void inlineShallow(); Q_INVOKABLE void insertRaw(); Q_INVOKABLE void invert(); Q_INVOKABLE void modeCircle(); Q_INVOKABLE void modeDraw(); Q_INVOKABLE void modeLinePath(); Q_INVOKABLE void modeMagicWand(); Q_INVOKABLE void modeRectangle(); Q_INVOKABLE void modeSelect(); Q_INVOKABLE void modeCurve(); Q_INVOKABLE void newBFC(); Q_INVOKABLE void newComment(); Q_INVOKABLE void newConditionalLine(); Q_INVOKABLE void newLine(); Q_INVOKABLE void newQuadrilateral(); Q_INVOKABLE void newSubfile(); Q_INVOKABLE void newTriangle(); Q_INVOKABLE void paste(); Q_INVOKABLE void redo(); Q_INVOKABLE void remove(); Q_INVOKABLE void setColor(); Q_INVOKABLE void uncolor(); Q_INVOKABLE void undo(); private: int copyToClipboard(); void doInline (bool deep); };