From 5fc698634b872839fc088b1b3518a6166e8455a7 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 3 Mar 2010 07:06:21 +0000
Subject: [PATCH] fix warnings
---
Fltk/classificationEditor.cpp | 18 +++++++++---------
Mesh/multiscalePartition.cpp | 2 +-
Solver/multiscaleLaplace.cpp | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Fltk/classificationEditor.cpp b/Fltk/classificationEditor.cpp
index 0173c74c2f..71b01db037 100644
--- a/Fltk/classificationEditor.cpp
+++ b/Fltk/classificationEditor.cpp
@@ -311,8 +311,8 @@ static void class_hide_cb(Fl_Widget *w, void *data)
static void show_only_edges_cb(Fl_Widget *w, void *data)
{
classificationEditor *e = (classificationEditor*)data;
- static int old_sf = opt_mesh_surfaces_faces(0, GMSH_GET, 0.);
- static int old_se = opt_mesh_surfaces_edges(0, GMSH_GET, 0.);
+ static int old_sf = (int)opt_mesh_surfaces_faces(0, GMSH_GET, 0.);
+ static int old_se = (int)opt_mesh_surfaces_edges(0, GMSH_GET, 0.);
if(e->toggles[CLASS_TOGGLE_SHOW_ONLY_EDGES]->value()){
opt_mesh_lines(0, GMSH_SET | GMSH_GUI, 1.);
opt_mesh_surfaces_faces(0, GMSH_SET | GMSH_GUI, 0.);
@@ -354,12 +354,10 @@ static void class_delete_edge_cb(Fl_Widget *w, void *data)
for(unsigned int i = 0; i < FlGui::instance()->selectedElements.size(); i++)
FlGui::instance()->selectedElements[i]->setVisibility(1);
}
- // ok, we compute edges !
if(ib == 'e') {
GModel::current()->setSelection(0);
break;
}
- // do nothing
if(ib == 'q') {
GModel::current()->setSelection(0);
ele.clear();
@@ -617,7 +615,8 @@ classificationEditor::classificationEditor() : selected(0)
buttons[CLASS_BUTTON_SELECT_ALL_ELEMENTS]->callback(class_select_all_elements_cb, this);
toggles[CLASS_TOGGLE_HIDE] = new Fl_Check_Button
- (x + 1.5 * BBB + WB, y, width - 1.5 * BBB - x - 2 * WB, BH, "Hide unselected elements");
+ ((int)(x + 1.5 * BBB + WB), y, (int)(width - 1.5 * BBB - x - 2 * WB), BH,
+ "Hide unselected elements");
toggles[CLASS_TOGGLE_HIDE]->type(FL_TOGGLE_BUTTON);
toggles[CLASS_TOGGLE_HIDE]->callback(class_hide_cb, this);
@@ -648,7 +647,8 @@ classificationEditor::classificationEditor() : selected(0)
inputs[CLASS_VALUE_ANGLE]->callback(update_edges_cb, this);
toggles[CLASS_TOGGLE_SHOW_ONLY_EDGES] = new Fl_Check_Button
- (x + 1.5 * BBB + WB, y, width - x - 1.5 * BBB - 2 * WB, BH, "Show only edges");
+ ((int)(x + 1.5 * BBB + WB), y, (int)(width - x - 1.5 * BBB - 2 * WB), BH,
+ "Show only edges");
toggles[CLASS_TOGGLE_SHOW_ONLY_EDGES]->type(FL_TOGGLE_BUTTON);
toggles[CLASS_TOGGLE_SHOW_ONLY_EDGES]->callback(show_only_edges_cb, this);
@@ -660,12 +660,12 @@ classificationEditor::classificationEditor() : selected(0)
y += BH;
buttons[CLASS_BUTTON_DELETE_FROM_SELECTION] = new Fl_Button
- (x, y, 1.5 * BBB, BH, "Delete edges from selection");
+ (x, y, (int)(1.5 * BBB), BH, "Delete edges from selection");
buttons[CLASS_BUTTON_DELETE_FROM_SELECTION]->callback(class_delete_edge_cb, this);
buttons[CLASS_BUTTON_DELETE_FROM_SELECTION]->deactivate();
buttons[CLASS_BUTTON_RESET_SELECTION] = new Fl_Button
- (x + 1.5 * BBB + WB, y, BBB, BH, "Reset selection");
+ (x + (int)(1.5 * BBB + WB), y, BBB, BH, "Reset selection");
buttons[CLASS_BUTTON_RESET_SELECTION]->callback(class_reset_selection_cb, this);
buttons[CLASS_BUTTON_RESET_SELECTION]->deactivate();
@@ -695,7 +695,7 @@ classificationEditor::classificationEditor() : selected(0)
buttons[CLASS_BUTTON_SELECT_ALL_SURFACES]->callback(class_select_all_surfaces_cb, this);
buttons[CLASS_BUTTON_CLASSIFY] = new Fl_Return_Button
- (x + 1.5 * BBB + WB, y, BBB, BH, "Reclassify");
+ ((int)(x + 1.5 * BBB + WB), y, BBB, BH, "Reclassify");
buttons[CLASS_BUTTON_CLASSIFY]->callback(class_classify_cb, this);
buttons[CLASS_BUTTON_CLASSIFY]->deactivate();
diff --git a/Mesh/multiscalePartition.cpp b/Mesh/multiscalePartition.cpp
index 658f998a54..0fba0a7960 100644
--- a/Mesh/multiscalePartition.cpp
+++ b/Mesh/multiscalePartition.cpp
@@ -161,7 +161,7 @@ static int getAspectRatio(std::vector<MElement *> &elements,
}
tot_length += iLength;
}
- int AR = 1.0;
+ int AR = 1;
if (boundaries.size() > 0){
tot_length /= boundaries.size();
AR = (int) ceil(2*3.14*area3D/(tot_length*tot_length));
diff --git a/Solver/multiscaleLaplace.cpp b/Solver/multiscaleLaplace.cpp
index b28aed2fd1..2f8699976d 100644
--- a/Solver/multiscaleLaplace.cpp
+++ b/Solver/multiscaleLaplace.cpp
@@ -258,7 +258,7 @@ static void recur_compute_centers_ (double R, double a1, double a2,
rad = std::max(rad,sqrt ((c.x() - p.x())*(c.x() - p.x())+
(c.y() - p.y())*(c.y() - p.y())));
}
- if (std::abs(rad/root->radius) < 0.9 && abs(rad) < 0.99){
+ if (std::abs(rad/root->radius) < 0.9 && std::abs(rad) < 0.99){
centers.push_back(std::make_pair(c,zero));
}
}
--
GitLab