From 209e6deeacb7d6ec5894c3b04310d9ede026cdcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 4 Nov 2015 17:51:20 +0100 Subject: [PATCH] improve add polylines --- Polyhedron/demo/Polyhedron/Add_polylines_dialog.ui | 2 +- Polyhedron/demo/Polyhedron/MainWindow.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Polyhedron/demo/Polyhedron/Add_polylines_dialog.ui b/Polyhedron/demo/Polyhedron/Add_polylines_dialog.ui index 302c250c6ce..adf75f4ecbf 100644 --- a/Polyhedron/demo/Polyhedron/Add_polylines_dialog.ui +++ b/Polyhedron/demo/Polyhedron/Add_polylines_dialog.ui @@ -36,7 +36,7 @@ p, li { white-space: pre-wrap; } false - New polyline format: A1 A2 A3 B1 B2 B3 C1 C2 C3... + Polyline format: Ax Ay A3 Bx By Bz ... Zx Zy Zz diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index df8aa9f3832..c0e9596da9a 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -1486,6 +1486,14 @@ void MainWindow::on_addButton_clicked() int counter = 0; double coord[3]; bool ok = true; + if (list.isEmpty()) return; + if (list.size()%3!=0){ + QMessageBox *msgBox = new QMessageBox; + msgBox->setWindowTitle("Error"); + msgBox->setText("ERROR : Input should consists of triplets."); + msgBox->exec(); + return; + } Q_FOREACH(QString s, list) { if(!s.isEmpty())