diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp index 36737d3592e..b977b2030ae 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp @@ -220,6 +220,7 @@ public Q_SLOTS: dock_widget->prevButton->setEnabled(false); dock_widget->nextButton->setEnabled(false); dock_widget->stopButton->setEnabled(false); + dock_widget->frameSlider->setEnabled(false); initial_points.clear(); initial_points.shrink_to_fit(); }); @@ -242,18 +243,12 @@ public Q_SLOTS: dock_widget->prevButton->setEnabled(true); dock_widget->nextButton->setEnabled(true); dock_widget->stopButton->setEnabled(true); + dock_widget->frameSlider->setEnabled(true); if(!info.exists()) { QMessageBox::warning(mw, "Error","File does not exist."); return; } - if(info.baseName() != sm_item->name()) - { - QMessageBox::warning(mw, "Wrong Name", - QString("The frame file must have the same name as the mesh file.(%1.trjs)") - .arg(sm_item->name())); - return; - } if(!dock_widget->isVisible()) { dock_widget->show(); } diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui index 82130fc7e43..6e6102118fa 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui +++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui @@ -6,8 +6,8 @@ 0 0 - 444 - 150 + 202 + 151 @@ -97,36 +97,86 @@ + + + 0 + 0 + + - Start + + + + + :/cgal/icons/resources/play.jpeg:/cgal/icons/resources/play.jpeg + + + 0 + 0 + + - Stop + + + + + :/cgal/icons/resources/pause.jpeg:/cgal/icons/resources/pause.jpeg + + + 0 + 0 + + - Prev + + + + + :/cgal/icons/resources/left_arrow.png:/cgal/icons/resources/left_arrow.png + + + 0 + 0 + + - Next + + + + + :/cgal/icons/resources/right_arrow.png:/cgal/icons/resources/right_arrow.png + + + 0 + 0 + + - Reset + + + + + :/cgal/icons/resources/reset.jpg:/cgal/icons/resources/reset.jpg @@ -135,6 +185,9 @@ - + + + + diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc b/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc index aef40f45e8f..9a10f5c14a8 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc +++ b/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc @@ -33,6 +33,9 @@ resources/help_button.png resources/exit.png resources/menu.png + resources/play.jpeg + resources/pause.jpeg + resources/reset.jpg resources/about.html diff --git a/Polyhedron/demo/Polyhedron/resources/pause.jpeg b/Polyhedron/demo/Polyhedron/resources/pause.jpeg new file mode 100644 index 00000000000..1da108b76f8 Binary files /dev/null and b/Polyhedron/demo/Polyhedron/resources/pause.jpeg differ diff --git a/Polyhedron/demo/Polyhedron/resources/play.jpeg b/Polyhedron/demo/Polyhedron/resources/play.jpeg new file mode 100644 index 00000000000..c039554ae98 Binary files /dev/null and b/Polyhedron/demo/Polyhedron/resources/play.jpeg differ diff --git a/Polyhedron/demo/Polyhedron/resources/reset.jpg b/Polyhedron/demo/Polyhedron/resources/reset.jpg new file mode 100644 index 00000000000..c83b429e0c8 Binary files /dev/null and b/Polyhedron/demo/Polyhedron/resources/reset.jpg differ