diff -r 6988973515d2 -r ca23936b455b src/document.h --- a/src/document.h Wed May 25 20:36:34 2022 +0300 +++ b/src/document.h Mon Jun 06 22:01:22 2022 +0300 @@ -23,46 +23,38 @@ #include "ui/canvas.h" #include "model.h" #include "vertexmap.h" -#include "edithistory.h" -class Document : public QWidget +class EditorTabWidget : public QWidget { Q_OBJECT public: - explicit Document( + explicit EditorTabWidget( Model* model, DocumentManager* documents, const ldraw::ColorTable& colorTable, QWidget *parent = nullptr); - ~Document() override; + ~EditorTabWidget() override; QByteArray saveSplitterState() const; void restoreSplitterState(const QByteArray& state); - std::unique_ptr editModel(); void applyToVertices(VertexMap::ApplyFunction fn) const; - const Model& getModel() const; - const QSet selectedObjects() const; + const QSet selectedObjects() const; const ldraw::ColorTable& colorTable; Canvas* const canvas; + Model* const model; Q_SLOT void editingModeTriggered(); Q_SLOT void canvasMouseClick(QMouseEvent* event); Q_SLOT void canvasMouseMove(QMouseEvent* event); - void select(const QSet &selected); - DrawState drawState; + void select(const QSet &selected); Q_SIGNALS: void newStatusText(const QString& newStatusText); void splitterChanged(); private: void initializeTools(); void closeShape(); - Model* model; + DrawState drawState; DocumentManager* const documents; VertexMap vertexMap; class Ui_Document& ui; QToolBar* toolsBar; std::vector toolActions; - class ObjectEditor* objectEditor; - /** - * @brief History information of edits to this model - */ - // EditHistory editHistory; };