From 636860aa4361cc518770fb155638090105110bda Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 24 Oct 2012 07:57:01 +0000
Subject: [PATCH] fix virtual writeMSH
---
Post/PViewData.h | 3 ++-
Post/PViewDataGModel.h | 3 ++-
Post/PViewDataGModelIO.cpp | 3 ++-
Post/PViewDataIO.cpp | 3 ++-
Post/PViewDataList.h | 3 ++-
Post/PViewDataListIO.cpp | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Post/PViewData.h b/Post/PViewData.h
index 4c53049060..50c686e0f7 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -256,7 +256,8 @@ class PViewData {
virtual bool writeTXT(const std::string &fileName);
virtual bool writePOS(const std::string &fileName, bool binary=false, bool parsed=true,
bool append=false);
- virtual bool writeMSH(const std::string &fileName, bool binary=false, bool savemesh=true);
+ virtual bool writeMSH(const std::string &fileName, bool binary=false, bool savemesh=true,
+ bool multipleView=false);
virtual bool writeMED(const std::string &fileName);
virtual bool toVector(std::vector<std::vector<double> > &vec);
virtual bool fromVector(const std::vector<std::vector<double> > &vec);
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index 103ba9259f..8b63c3a2a7 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -241,7 +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);
- bool writeMSH(const std::string &fileName, bool binary=false, bool savemesh=true,bool multipleView=false);
+ virtual bool writeMSH(const std::string &fileName, 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/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 9671c4605a..473bae2f61 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -133,7 +133,8 @@ bool PViewDataGModel::readMSH(const std::string &viewName, const std::string &fi
return true;
}
-bool PViewDataGModel::writeMSH(const std::string &fileName, bool binary, bool savemesh,bool multipleView)
+bool PViewDataGModel::writeMSH(const std::string &fileName, bool binary, bool savemesh,
+ bool multipleView)
{
if(_steps.empty()) return true;
diff --git a/Post/PViewDataIO.cpp b/Post/PViewDataIO.cpp
index 58f5317b72..82c4e4fe3e 100644
--- a/Post/PViewDataIO.cpp
+++ b/Post/PViewDataIO.cpp
@@ -176,7 +176,8 @@ bool PViewData::writePOS(const std::string &fileName, bool binary, bool parsed,
return true;
}
-bool PViewData::writeMSH(const std::string &fileName, bool binary, bool savemesh)
+bool PViewData::writeMSH(const std::string &fileName, bool binary, bool savemesh,
+ bool multipleView)
{
Msg::Error("MSH export not implemented for this view type");
return false;
diff --git a/Post/PViewDataList.h b/Post/PViewDataList.h
index 774068554c..706c77dfce 100644
--- a/Post/PViewDataList.h
+++ b/Post/PViewDataList.h
@@ -125,7 +125,8 @@ class PViewDataList : public PViewData {
bool readPOS(FILE *fp, double version, bool binary);
bool writePOS(const std::string &fileName, bool binary=false, bool parsed=true,
bool append=false);
- virtual bool writeMSH(const std::string &fileName, bool binary=false, bool savemesh=true);
+ virtual bool writeMSH(const std::string &fileName, bool binary=false, bool savemesh=true,
+ bool multipleView=false);
};
#endif
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index e59cd7335b..6c8e35800d 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -525,7 +525,8 @@ static void createElements(std::vector<double> &list, int nbelm, int nbnod,
}
}
-bool PViewDataList::writeMSH(const std::string &fileName, bool binary, bool savemesh)
+bool PViewDataList::writeMSH(const std::string &fileName, bool binary, bool savemesh,
+ bool multipleView)
{
if(_adaptive){
Msg::Warning("Writing adapted dataset (will only export current time step)");
--
GitLab