From 6e40cab6b242754dd6c687ed2bce201e4ef113f2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 9 Dec 2012 21:27:06 +0000
Subject: [PATCH] pp
---
Post/PViewDataGModel.h | 4 ++--
Post/PViewDataList.cpp | 5 +++--
Post/PViewDataRemote.h | 12 ++++++------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index c3e2f2c7f4..b95cfb3e03 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -241,8 +241,8 @@ class PViewDataGModel : public PViewData {
int fileIndex, FILE *fp, bool binary, bool swap, int step,
double time, int partition, int numComp, int numNodes,
const std::string &interpolationScheme);
- virtual bool writeMSH(const std::string &fileName, double version=2.2, bool binary=false, bool savemesh=true,
- bool multipleView=false);
+ virtual bool writeMSH(const std::string &fileName, double version=2.2, bool binary=false,
+ bool savemesh=true, bool multipleView=false);
bool readMED(const std::string &fileName, int fileIndex);
bool writeMED(const std::string &fileName);
};
diff --git a/Post/PViewDataList.cpp b/Post/PViewDataList.cpp
index 37e449ed98..7ccd38e5a6 100644
--- a/Post/PViewDataList.cpp
+++ b/Post/PViewDataList.cpp
@@ -830,7 +830,7 @@ int PViewDataList::_getRawData(int idxtype, std::vector<double> **l, int **ne,
int type = 0;
// No constant nn for polygons!
if(idxtype > 23 && idxtype < 30)
- Msg::Warning("No constant number of nodes for polygons and polyhedra.");
+ Msg::Warning("No constant number of nodes for polygons and polyhedra");
switch(idxtype){
case 0 : *l = &SP; *ne = &NbSP; *nc = 1; *nn = 1; type = TYPE_PNT; break;
case 1 : *l = &VP; *ne = &NbVP; *nc = 3; *nn = 1; type = TYPE_PNT; break;
@@ -887,7 +887,8 @@ void PViewDataList::setOrder2(int type)
}
const polynomialBasis *fs = (polynomialBasis*)BasisFactory::create(typeMSH);
if(!fs){
- Msg::Error("Could not find polynomial function space for element type %d", typeMSH);
+ Msg::Error("Could not find polynomial function space for element type %d",
+ typeMSH);
return;
}
setInterpolationMatrices(type, fs->coefficients, fs->monomials,
diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h
index fea61f5939..e2028df070 100644
--- a/Post/PViewDataRemote.h
+++ b/Post/PViewDataRemote.h
@@ -17,16 +17,16 @@
// The container for a remote dataset (does not contain any actual
// data)
class PViewDataRemote : public PViewData {
- private:
+ private:
onelab::localNetworkClient *_remote;
double _min, _max;
int _numTimeSteps;
double _time;
SBoundingBox3d _bbox;
public:
- PViewDataRemote(onelab::localNetworkClient *remote, double min, double max, int numsteps,
- double time, SBoundingBox3d &bbox)
- : _remote(remote), _min(min), _max(max), _numTimeSteps(numsteps),
+ PViewDataRemote(onelab::localNetworkClient *remote, double min, double max,
+ int numsteps, double time, SBoundingBox3d &bbox)
+ : _remote(remote), _min(min), _max(max), _numTimeSteps(numsteps),
_time(time), _bbox(bbox) {}
~PViewDataRemote(){}
bool finalize(bool computeMinMax=true, const std::string &interpolationScheme="")
@@ -34,14 +34,14 @@ class PViewDataRemote : public PViewData {
return true;
}
int getNumTimeSteps(){ return _numTimeSteps; }
- double getMin(int step=-1, bool onlyVisible=false, int forceNumComponents=0,
+ double getMin(int step=-1, bool onlyVisible=false, int forceNumComponents=0,
int componentMap[9]=0){ return _min; }
double getMax(int step=-1, bool onlyVisible=false, int forceNumComponents=0,
int componentMap[9]=0){ return _max; }
SBoundingBox3d getBoundingBox(int step=-1){ return _bbox; }
double getTime(int step){ return _time; }
// need to return != 0 for "empty" tests
- int getNumElements(int step=-1, int ent=-1){ return -1; }
+ int getNumElements(int step=-1, int ent=-1){ return -1; }
void setMin(double min){ _min = min; }
void setMax(double max){ _max = max; }
void setBoundingBox(SBoundingBox3d &bbox){ _bbox = bbox; }
--
GitLab