diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp index 2561811eaf7..95d0214d827 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp @@ -634,18 +634,18 @@ void Basic_generator_plugin::generateTetrahedron() } else { - QString text = dock_widget->extremaEdit_2->text(); + QString text = dock_widget->point_textEdit_2->toPlainText(); QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; - if (list.size() != 3) { + if (list.size() != 12) { QMessageBox* msgBox = new QMessageBox; msgBox->setWindowTitle("Error"); - msgBox->setText("ERROR : Input should consists of 3 doubles."); + msgBox->setText("ERROR : Input should consists of 12 doubles."); msgBox->exec(); return; } - for (int i = 0; i < 3; ++i) + for (int i = 0; i < 12; ++i) { bool ok; list.at(i).toDouble(&ok); @@ -658,8 +658,12 @@ void Basic_generator_plugin::generateTetrahedron() return; } } - - + CGAL::make_tetrahedron( + Point(list.at(0).toDouble(), list.at(1).toDouble(), list.at(2).toDouble()), + Point(list.at(3).toDouble(), list.at(4).toDouble(), list.at(5).toDouble()), + Point(list.at(6).toDouble(), list.at(7).toDouble(), list.at(8).toDouble()), + Point(list.at(9).toDouble(), list.at(10).toDouble(), list.at(11).toDouble()), + tetrahedron); } Facegraph_item* tet_item = new Facegraph_item(tetrahedron); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui index 2ee7ceac420..8b1af419912 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui @@ -856,35 +856,38 @@ QGroupBox::title { - Bbox + Multi-line - + - 8 - 9 - 46 - 207 + 10 + 10 + 451 + 201 - - <html><head/><body><p>Coordinates of the minimum and the maximum of the Bbox.</p></body></html> + + + 0 + 0 + - - Extrema: + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> +p, li { white-space: pre-wrap; } +hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } +</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"><br /></p></body></html> - - - - - 60 - 100 - 401 - 24 - + + false - - 1.0 1.0 1.0 + + Point format: P0x P0y P0z P1x P1y P1z P2x P2y P2z P3x P3y P3z