From a3c851a45d0a3db2310b6ac28c9ff226c10e92ba Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 1 Jul 2014 23:10:38 +0000
Subject: [PATCH] pp
---
Common/OpenFile.cpp | 18 ++++++------------
Mesh/filterElements.cpp | 2 +-
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 929ca952da..0da2124a3f 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -86,6 +86,12 @@ static void FinishUpBoundingBox()
double l = sqrt(SQU(range[0]) + SQU(range[2]));
CTX::instance()->min[1] -= l; CTX::instance()->max[1] += l;
}
+
+ CTX::instance()->lc = sqrt(SQU(CTX::instance()->max[0] - CTX::instance()->min[0]) +
+ SQU(CTX::instance()->max[1] - CTX::instance()->min[1]) +
+ SQU(CTX::instance()->max[2] - CTX::instance()->min[2]));
+ for(int i = 0; i < 3; i++)
+ CTX::instance()->cg[i] = 0.5 * (CTX::instance()->min[i] + CTX::instance()->max[i]);
}
void SetBoundingBox(double xmin, double xmax,
@@ -96,12 +102,6 @@ void SetBoundingBox(double xmin, double xmax,
CTX::instance()->min[1] = ymin; CTX::instance()->max[1] = ymax;
CTX::instance()->min[2] = zmin; CTX::instance()->max[2] = zmax;
FinishUpBoundingBox();
- CTX::instance()->lc = sqrt(SQU(CTX::instance()->max[0] - CTX::instance()->min[0]) +
- SQU(CTX::instance()->max[1] - CTX::instance()->min[1]) +
- SQU(CTX::instance()->max[2] - CTX::instance()->min[2]));
- for(int i = 0; i < 3; i++)
- CTX::instance()->cg[i] = 0.5 * (CTX::instance()->min[i] + CTX::instance()->max[i]);
-
}
void SetBoundingBox(bool aroundVisible)
@@ -127,12 +127,6 @@ void SetBoundingBox(bool aroundVisible)
CTX::instance()->min[1] = bb.min().y(); CTX::instance()->max[1] = bb.max().y();
CTX::instance()->min[2] = bb.min().z(); CTX::instance()->max[2] = bb.max().z();
FinishUpBoundingBox();
- CTX::instance()->lc = sqrt(SQU(CTX::instance()->max[0] - CTX::instance()->min[0]) +
- SQU(CTX::instance()->max[1] - CTX::instance()->min[1]) +
- SQU(CTX::instance()->max[2] - CTX::instance()->min[2]));
- for(int i = 0; i < 3; i++)
- CTX::instance()->cg[i] = 0.5 * (CTX::instance()->min[i] + CTX::instance()->max[i]);
-
}
// FIXME: this is necessary for now to have an approximate CTX::instance()->lc
diff --git a/Mesh/filterElements.cpp b/Mesh/filterElements.cpp
index ad22a4d9fc..fa25fc70bc 100644
--- a/Mesh/filterElements.cpp
+++ b/Mesh/filterElements.cpp
@@ -150,7 +150,7 @@ void filterColumns(std::vector<MElement*> &elem,
// delete c[i];
}
}
- printf("%i --> %i\n",elem.size(),toKeep.size());
+ printf("%d --> %d\n", (int)elem.size(), (int)toKeep.size());
elem = toKeep;
}
--
GitLab