ldforge2: comparison src/main.cpp

-:2aa15daa0216
+:3ea38fd469ca
 #include "src/settingseditor/settingseditor.h"
 #include "src/ui/circletooloptionswidget.h"
 #include "src/ui/objecteditor.h"
 #include "src/version.h"
 #include "src/widgets/colorselectdialog.h"
+#include "src/parser.h"
 #include <GL/glew.h>
 static const QDir LOCALE_DIR {":/locale"};
 class ModelSubWindow : public QMdiSubWindow
 {
 	Q_OBJECT
 public:
 	ModelData(QObject* parent) : QObject {parent} {}
 	std::unique_ptr<PartRenderer> canvas;
-	std::unique_ptr<QItemSelectionModel> itemSelectionModel;
 	std::unique_ptr<EditTools> tools;
 	std::unique_ptr<AxesLayer> axesLayer;
 	std::unique_ptr<GridLayer> gridLayer;
+	std::unique_ptr<QTextDocument> textbuffer;
+	std::unique_ptr<QTextCursor> textcursor;
 	Model* model;
 };
 class Signal final : public QObject
 {
 	return subWindow;
 }
 static QSet<ElementId> resolveIdsFromSelection(const ModelData* data)
 {
-	const auto selection = data->itemSelectionModel->selection();
+//	const auto selection = data->itemSelectionModel->selection();
 	QSet<ElementId> selectedIndexes;
-	for (const QModelIndex& qindex : selection.indexes()) {
+/*	for (const QModelIndex& qindex : selection.indexes()) {
 		const std::size_t row = unsigned_cast(qindex.row());
 		selectedIndexes.insert(data->model->idAt(row));
 	}
-	return selectedIndexes;
+*/	return selectedIndexes;
 }
 int main(int argc, char *argv[])
 {
 	doQtRegistrations();
 	ColorTable colorTable;
 	gl::RenderPreferences renderPreferences;
 	MessageLog messageLog;
 	Signal settingsChanged;
 	ui.setupUi(&mainWindow);
+	QFont monospace{"Monospace"};
+	monospace.setStyleHint(QFont::TypeWriter);
+	monospace.setPointSize(10);
+	monospace.setFixedPitch(true);
+	ui.modelEdit->setFont(monospace);
 	ToolWidgets toolWidgets{
 		.circleToolOptions = new CircleToolOptionsWidget{&mainWindow},
 		.objectEditor = new ObjectEditor{&mainWindow},
 	};
 	const auto updateTitle = [&ui, &mainWindow]{
 		}
 	};
 	const auto executeAction = [&](
 		Model* model, const ModelAction& action
 	) {
+		/*
 		std::visit(overloaded{
 			[model](const AppendToModel& action){
 				model->append(action.newElement);
 			},
 			[model](const DeleteFromModel& action){
 			},
 			[model](const ModifyModel& action){
 				model->assignAt(action.position, action.newElement);
 			},
 		}, action);
+		*/
 	};
 	const auto restoreSettings = [&]{
 		recentlyOpenedFiles = setting<Setting::RecentFiles>();
 		renderPreferences = loadRenderPreferences();
 		libraries.restoreFromSettings();
 		Model* model = documents.getModelById(modelId);
 		if (model != nullptr) {
 			ModelData* data = new ModelData(&documents);
 			data->tools = std::make_unique<EditTools>();
 			data->canvas = std::make_unique<PartRenderer>(model, &documents, colorTable);
-			data->itemSelectionModel = std::make_unique<QItemSelectionModel>();
-			data->itemSelectionModel->setModel(model);
 			data->axesLayer = std::make_unique<AxesLayer>();
 			constexpr glm::mat4 XZ = {{1, 0, 0, 0}, {0, 0, 1, 0}, {0, 1, 0, 0}, {0, 0, 0, 1}};
 			data->gridLayer = std::make_unique<GridLayer>();
 			data->gridLayer->setGridMatrix(XZ);
 			data->tools->setGridMatrix(XZ);
 			data->model = model;
 			data->canvas->addRenderLayer(data->axesLayer.get());
 			data->canvas->setLayerEnabled(data->axesLayer.get(), setting<Setting::DrawAxes>());
 			data->canvas->addRenderLayer(data->gridLayer.get());
 			data->canvas->addRenderLayer(data->tools.get());
+			QString modeltext;
+			QTextStream stream{&modeltext};
+			::save(*model, &stream);
+			data->textbuffer = std::make_unique<QTextDocument>();
+			data->textbuffer->setPlainText(modeltext);
+			data->textbuffer->setDocumentLayout(new QPlainTextDocumentLayout(data->textbuffer.get()));
+			data->textcursor = std::make_unique<QTextCursor>(data->textbuffer.get());
 			documents.setModelPayload(modelId, data);
 			QObject::connect(
 				data->tools.get(),
 				&EditTools::modelAction,
 				std::bind(executeAction, model, std::placeholders::_1));
-			QObject::connect(
-				data->itemSelectionModel.get(),
-				&QItemSelectionModel::selectionChanged,
-				[modelId, &documents, &toolWidgets]{
-				ModelData* data = findModelData(&documents, modelId);
-				if (data != nullptr) {
-					data->canvas->setSelection(resolveIdsFromSelection(data));
-					/*
-					if (indices.size() == 1) {
-						opt<std::size_t> index = data->model->find(*indices.begin());
-						if (index.has_value()) {
-							toolWidgets.objectEditor->setObject((*data->model)[*index]);
-						}
-					}
-					else {
-						toolWidgets.objectEditor->reset();
-					}
-					*/
-				}
-			});
 			data->canvas->setRenderPreferences(renderPreferences);
 			QObject::connect(
 				data->tools.get(),
 				&EditTools::newStatusText,
 				[&](const QString& newStatusText) {
 					mainWindow.statusBar()->showMessage(newStatusText);
 				});
+#if 0
 			QObject::connect(
 				data->tools.get(),
 				&EditTools::select,
 				[modelId, &documents](const QSet<ElementId>& indices, bool retain) {
 					ModelData* data = findModelData(&documents, modelId);
 					if (data != nullptr) {
 						if (not retain) {
-							data->itemSelectionModel->clear();
+							data->textcursor->clearSelection();
 						}
 						for (const ElementId id : indices) {
 							opt<int> index = data->model->find(id);
 							if (index.has_value()) {
 								const QModelIndex qindex = data->model->index(*index);
 								data->itemSelectionModel->select(qindex, QItemSelectionModel::Select);
 							}
 						}
 					}
 				});
+#endif
 			QObject::connect(&settingsChanged, &Signal::triggered, [modelId, &documents]{
 				ModelData* data = findModelData(&documents, modelId);
 				if (data != nullptr) {
 					data->gridLayer->settingsChanged();
 				}
 			else {
 				save(*modelId);
 			}
 		}
 	});
-	QObject::connect(ui.actionDelete, &QAction::triggered, [&]{
-		if (Model* model = currentModelBody(&ui, &documents)) {
-			std::vector<int> selectedRows = rows(ui.modelListView->selectionModel()->selectedRows());
-			std::sort(selectedRows.begin(), selectedRows.end(), std::greater<int>{});
-			for (int row : selectedRows) {
-				executeAction(model, DeleteFromModel{.position = unsigned_cast(row)});
-			}
-		}
-	});
 	QObject::connect(ui.actionDrawAxes, &QAction::triggered, [&](bool drawAxes){
 		renderPreferences.drawAxes = drawAxes;
 		saveSettings();
 		updateRenderPreferences(&ui, &renderPreferences, &documents);
 	});
 	[&](QMdiSubWindow* subWindow) {
 		ModelSubWindow* modelSubWindow = qobject_cast<ModelSubWindow*>(subWindow);
 		if (modelSubWindow != nullptr) {
 			if (ModelData* data = documents.findPayload<ModelData>(modelSubWindow->modelId)) {
 				checkEditingModeAction(data->tools->currentEditingMode());
-				if (data->itemSelectionModel != nullptr) {
+				ui.modelEdit->setDocument(data->textbuffer.get());
-					ui.modelListView->setModel(data->model);
+				ui.modelEdit->setTextCursor(*data->textcursor);
-					ui.modelListView->setSelectionModel(data->itemSelectionModel.get());
-				}
 			}
 		}
 		else {
 			checkEditingModeAction(EditingMode::SelectMode);
 		}
 			}
 			about(&mainWindow);
 		}
 	);
 	QObject::connect(
-		ui.actionCopy,
+		ui.modelEdit,
-		&QAction::triggered,
+		&QPlainTextEdit::textChanged,
 		[&]{
-			if (Model* model = currentModelBody(&ui, &documents)) {
+			if (ModelData* data = currentModelData(&ui, &documents)) {
-				std::vector<int> selectedRows = rows(ui.modelListView->selectionModel()->selectedRows());
+				Model* const model = data->model;
-				QString text;
+				model->clear();
-				for (int row : selectedRows) {
+				QString text = ui.modelEdit->toPlainText();
-					const std::size_t i = static_cast<std::size_t>(row);
+				QTextStream stream{&text};
-					text += modelElementToString((*model)[i]);
+				Parser parser(stream);
-					text += QStringLiteral("\r\n");
+				parser.parseBody(*data->model);
-				}
+				data->canvas->update();
-				app.clipboard()->setText(text);
 			}
 		});
 	mainWindow.tabifyDockWidget(ui.messageLogDock, ui.toolOptionsDock);
 	mainWindow.restoreGeometry(setting<Setting::MainWindowGeometry>());
 	mainWindow.restoreState(setting<Setting::MainWindowState>());

Mercurial > ldforge2 / file comparison

comparison: src/main.cpp

src/main.cpp