Small bugfix, a few GUI changes

#41

IsotropicRemesher.cc

@@ -253,7 +253,7 @@ void IsotropicRemesher::Collapses(Embedding *embedding, double low,
 
       auto mvh0 = meta_mesh->from_vertex_handle(mheh);
 
-      int newmvh1edges = static_cast<int>(meta_mesh->valence(mvh0)) - 1;
+      int newmvh1edges = static_cast<int>(meta_mesh->valence(mvh0)) - 2;
       if (meta_mesh->from_vertex_handle(mheh0)
           == meta_mesh->from_vertex_handle(mheh1)) {
         splitw -= embedding->MetaHalfedgeWeight(mheh0);

MetaMeshToolbox.cc

@@ -7,18 +7,6 @@ MetaMeshToolbox::MetaMeshToolbox(QWidget* parent) : QWidget(parent)
 {
   QGridLayout* layout = new QGridLayout(this);
 
-  vbox_ = new QVBoxLayout;
-  checkbox_implicit_dijkstra_ = new QRadioButton("Implicit Dijkstra from Voronoi");
-  checkbox_a_star_triangulation_ = new QRadioButton("Bidirectional A* triangulation");
-  checkbox_a_star_midpoint_triangulation_ = new QRadioButton("A* with midpoints from Voronoi");
-  mode_selection_ = new QGroupBox("Initial triangulation type");
-  checkbox_a_star_triangulation_->setChecked(true);
-  vbox_->addWidget(checkbox_implicit_dijkstra_);
-  vbox_->addWidget(checkbox_a_star_triangulation_);
-  vbox_->addWidget(checkbox_a_star_midpoint_triangulation_);
-  vbox_->addStretch(1);
-  mode_selection_->setLayout(vbox_);
-
   combo_box_tests_ = new QComboBox;
   combo_box_tests_->addItem("Display Mesh Info");
   combo_box_tests_->addItem("Mesh Properties");
@@ -100,7 +88,7 @@ MetaMeshToolbox::MetaMeshToolbox(QWidget* parent) : QWidget(parent)
   input_length_->setToolTip("Edge length in % of object diagonal");
 
   input_iterations_ = new QSpinBox();
-  input_iterations_->setRange(1,100);
+  input_iterations_->setRange(1,1000);
   input_iterations_->setValue(10);
   input_iterations_->setSingleStep(1);
   input_iterations_->setToolTip("Number of times the algorithm runs");
@@ -116,37 +104,36 @@ MetaMeshToolbox::MetaMeshToolbox(QWidget* parent) : QWidget(parent)
   layout->addWidget(button_triangulate_, 0, 0, 1, 6);
   layout->addWidget(button_randomize_ratio_, 1, 0, 1, 6);
   layout->addWidget(button_randomize_total_, 2, 0, 1, 6);
-  layout->addWidget(mode_selection_, 3, 0, 1, 6);
-  layout->addWidget(input_ratio_, 4, 0, 1, 6);
-  layout->addWidget(button_run_test_, 5, 0, 1, 3);
-  layout->addWidget(combo_box_tests_, 5, 3, 1, 3);
-  layout->addWidget(checkbox_copy_markings_, 6, 0, 1, 3);
-  layout->addWidget(button_retrace_, 6, 3, 1, 3);
-  layout->addWidget(button_rotate_, 7, 0, 1, 3);
-  layout->addWidget(button_split_, 7, 3, 1, 3);
-  layout->addWidget(button_collapse_, 8, 0, 1, 3);
-  layout->addWidget(button_relocate_, 8, 3, 1, 3);
-  layout->addWidget(button_dummy1_, 9, 0, 1, 3);
-  layout->addWidget(button_dummy2_, 9, 3, 1, 3);
-  layout->addWidget(button_next_, 10, 0, 1, 2);
-  layout->addWidget(button_opp_, 10, 2, 1, 2);
-  layout->addWidget(button_prev_, 10, 4, 1, 2);
-  layout->addWidget(button_remesh_, 12, 0, 1, 3);
-  layout->addWidget(label_smtype, 11, 3, 1, 3);
-  layout->addWidget(combo_box_remeshing_smtype_, 12, 3, 1, 3);
-  layout->addWidget(label_strtype, 13, 0, 1, 3);
-  layout->addWidget(combo_box_remeshing_strype_, 14, 0, 1, 3);
-  layout->addWidget(label_corder, 13, 3, 1, 3);
-  layout->addWidget(combo_box_remeshing_crorder_, 14, 3, 1, 3);
-  layout->addWidget(checkbox_limit_flips_, 16, 0, 1, 2);
-  layout->addWidget(label_alpha, 15, 2, 1, 2);
-  layout->addWidget(input_alpha_, 16, 2, 1, 2);
-  layout->addWidget(label_beta, 15, 4, 1, 2);
-  layout->addWidget(input_beta_, 16, 4, 1, 2);
-  layout->addWidget(checkbox_data_output_, 18, 0, 1, 2);
-  layout->addWidget(label_length, 17, 2, 1, 2);
-  layout->addWidget(input_length_, 18, 2, 1, 2);
-  layout->addWidget(label_iterations, 17, 4, 1, 2);
-  layout->addWidget(input_iterations_, 18, 4, 1, 2);
+  layout->addWidget(input_ratio_, 3, 0, 1, 6);
+  layout->addWidget(button_run_test_, 4, 0, 1, 3);
+  layout->addWidget(combo_box_tests_, 4, 3, 1, 3);
+  layout->addWidget(checkbox_copy_markings_, 5, 0, 1, 3);
+  layout->addWidget(button_retrace_, 5, 3, 1, 3);
+  layout->addWidget(button_rotate_, 6, 0, 1, 3);
+  layout->addWidget(button_split_, 6, 3, 1, 3);
+  layout->addWidget(button_collapse_, 7, 0, 1, 3);
+  layout->addWidget(button_relocate_, 7, 3, 1, 3);
+  layout->addWidget(button_dummy1_, 8, 0, 1, 3);
+  layout->addWidget(button_dummy2_, 8, 3, 1, 3);
+  layout->addWidget(button_next_, 9, 0, 1, 2);
+  layout->addWidget(button_opp_, 9, 2, 1, 2);
+  layout->addWidget(button_prev_, 9, 4, 1, 2);
+  layout->addWidget(button_remesh_, 11, 0, 1, 3);
+  layout->addWidget(label_smtype, 10, 3, 1, 3);
+  layout->addWidget(combo_box_remeshing_smtype_, 11, 3, 1, 3);
+  layout->addWidget(label_strtype, 12, 0, 1, 3);
+  layout->addWidget(combo_box_remeshing_strype_, 13, 0, 1, 3);
+  layout->addWidget(label_corder, 12, 3, 1, 3);
+  layout->addWidget(combo_box_remeshing_crorder_, 13, 3, 1, 3);
+  layout->addWidget(checkbox_limit_flips_, 15, 0, 1, 2);
+  layout->addWidget(label_alpha, 14, 2, 1, 2);
+  layout->addWidget(input_alpha_, 15, 2, 1, 2);
+  layout->addWidget(label_beta, 14, 4, 1, 2);
+  layout->addWidget(input_beta_, 15, 4, 1, 2);
+  layout->addWidget(checkbox_data_output_, 17, 0, 1, 2);
+  layout->addWidget(label_length, 16, 2, 1, 2);
+  layout->addWidget(input_length_, 17, 2, 1, 2);
+  layout->addWidget(label_iterations, 16, 4, 1, 2);
+  layout->addWidget(input_iterations_, 17, 4, 1, 2);
   this->setLayout(layout);
 }

MetaMeshToolbox.hh

@@ -16,11 +16,6 @@ class MetaMeshToolbox : public QWidget
 public:
   MetaMeshToolbox(QWidget* parent = nullptr);
 
-    QGroupBox* mode_selection_;
-    QVBoxLayout* vbox_;
-    QRadioButton* checkbox_implicit_dijkstra_;
-    QRadioButton* checkbox_a_star_triangulation_;
-    QRadioButton* checkbox_a_star_midpoint_triangulation_;
     QComboBox* combo_box_tests_;
 
     QPushButton* button_triangulate_;