1 files changed, 62 insertions, 56 deletions

diff --git a/src/GudhUI/gui/Menu_edge_contraction.cpp b/src/GudhUI/gui/Menu_edge_contraction.cpp
index dd2621be..a679b0bf 100644
--- a/src/GudhUI/gui/Menu_edge_contraction.cpp
+++ b/src/GudhUI/gui/Menu_edge_contraction.cpp
@@ -1,91 +1,97 @@
-/*
- * Menu_edge_contraction.cpp
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
  *
- *  Created on: Sep 11, 2014
- *      Author: dsalinas
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MENU_EDGE_CONTRACTION_CPP_
-#define MENU_EDGE_CONTRACTION_CPP_
-
+#ifndef GUI_MENU_EDGE_CONTRACTION_CPP_
+#define GUI_MENU_EDGE_CONTRACTION_CPP_
 
 #include "Menu_edge_contraction.h"
 
-Menu_edge_contraction::Menu_edge_contraction(MainWindow* parent,const Model& model):
-parent_(parent),model_(model)
-{
-	setupUi(this);
-	connectActions(parent_);
+Menu_edge_contraction::Menu_edge_contraction(MainWindow* parent, const Model& model) :
+    parent_(parent), model_(model) {
+  setupUi(this);
+  connectActions(parent_);
 }
 
-void Menu_edge_contraction::connectActions(MainWindow* parent)
-{
-	QObject::connect(
-			this->horizontalSlider,
-			SIGNAL(valueChanged(int)),
-			this,
-			SLOT(slider_value_changed(int))
-	);
+void Menu_edge_contraction::connectActions(MainWindow* parent) {
+  QObject::connect(
+                   this->horizontalSlider,
+                   SIGNAL(valueChanged(int)),
+                   this,
+                   SLOT(slider_value_changed(int)));
 
 
-	QObject::connect(this, SIGNAL(contract_edges(unsigned)), parent, SLOT(contract_edges(unsigned)));
-
-	QObject::connect(this->pushButton_collapse, SIGNAL(clicked()), this, SLOT(send_contract_edges()));
+  QObject::connect(this, SIGNAL(contract_edges(unsigned)), parent, SLOT(contract_edges(unsigned)));
 
+  QObject::connect(this->pushButton_collapse, SIGNAL(clicked()), this, SLOT(send_contract_edges()));
 }
 
-void Menu_edge_contraction::slider_value_changed(int new_slider_value){
-	int num_collapses =
-			(horizontalSlider->value()==1)? 1 : horizontalSlider->value() * model_.num_vertices() / 100 ;
-	this->txt_nb_vertices->setNum((int)model_.num_vertices());
-	this->txt_nb_collapses->setNum(num_collapses);
-	this->spinBox_nb_remaining_vertices->setValue(model_.num_vertices()-num_collapses);
+void Menu_edge_contraction::slider_value_changed(int new_slider_value) {
+  int num_collapses =
+      (horizontalSlider->value() == 1) ? 1 : horizontalSlider->value() * model_.num_vertices() / 100;
+  this->txt_nb_vertices->setNum(static_cast<int>(model_.num_vertices()));
+  this->txt_nb_collapses->setNum(num_collapses);
+  this->spinBox_nb_remaining_vertices->setValue(model_.num_vertices() - num_collapses);
 }
 
-
 void
-Menu_edge_contraction::update_slider_value(){
-	int num_vertices = model_.num_vertices();
-	int num_collapses = (horizontalSlider->value()==1)? 1 : horizontalSlider->value() * num_vertices / 100 ;
-	int horizontal_slider_position = num_vertices>0?  num_collapses/(double)num_vertices * 100 : 1  ;
-	horizontalSlider->setValue(horizontal_slider_position);
+Menu_edge_contraction::update_slider_value() {
+  int num_vertices = model_.num_vertices();
+  int num_collapses = (horizontalSlider->value() == 1) ? 1 : horizontalSlider->value() * num_vertices / 100;
+  int horizontal_slider_position = num_vertices > 0 ? num_collapses / static_cast<double>(num_vertices * 100) : 1;
+  horizontalSlider->setValue(horizontal_slider_position);
 }
 
-
 void
-Menu_edge_contraction::update_gui_numbers(){
-	update_slider_value();
-	bool ok;
-	int num_collapses = this->txt_nb_collapses->text().toInt(&ok,10);
-	if(!ok) return;
-	this->txt_nb_vertices->setNum((int)model_.num_vertices());
-	this->txt_nb_collapses->setNum(num_collapses);
-	this->spinBox_nb_remaining_vertices->setValue(model_.num_vertices()-num_collapses);
+Menu_edge_contraction::update_gui_numbers() {
+  update_slider_value();
+  bool ok;
+  int num_collapses = this->txt_nb_collapses->text().toInt(&ok, 10);
+  if (!ok) return;
+  this->txt_nb_vertices->setNum(static_cast<int>(model_.num_vertices()));
+  this->txt_nb_collapses->setNum(num_collapses);
+  this->spinBox_nb_remaining_vertices->setValue(model_.num_vertices() - num_collapses);
 }
 
 void
-Menu_edge_contraction::update_gui_numbers(int new_value){
-	update_gui_numbers();
+Menu_edge_contraction::update_gui_numbers(int new_value) {
+  update_gui_numbers();
 }
 
-
 void
-Menu_edge_contraction::send_contract_edges(){
-	emit(contract_edges(num_collapses()));
-	update_gui_numbers();
+Menu_edge_contraction::send_contract_edges() {
+  emit(contract_edges(num_collapses()));
+  update_gui_numbers();
 }
 
 unsigned
-Menu_edge_contraction::num_vertices(){
-	return model_.num_vertices();
+Menu_edge_contraction::num_vertices() {
+  return model_.num_vertices();
 }
 
 unsigned
-Menu_edge_contraction::num_collapses(){
-	return (horizontalSlider->value()==1)? 1 : horizontalSlider->value() * num_vertices() / 100 ;
+Menu_edge_contraction::num_collapses() {
+  return (horizontalSlider->value() == 1) ? 1 : horizontalSlider->value() * num_vertices() / 100;
 }
 
-
 #include "Menu_edge_contraction.moc"
 
-#endif /* MENU_EDGE_CONTRACTION_CPP_ */
+#endif  // GUI_MENU_EDGE_CONTRACTION_CPP_