Commit ac3072a9 authored by Mike Kremer's avatar Mike Kremer
Browse files

Fixed compile issues with new OVM signatures.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14478 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d6d52763
......@@ -64,7 +64,6 @@ loadOptions_(0),
saveOptions_(0),
typeCheck_(0),
loadCompMode_(0),
loadCorrectOrder_(0),
loadTopCheck_(0),
saveCompMode_(0) {
......@@ -85,11 +84,9 @@ void FileOpenVolumeMeshPlugin::initializePlugin() {
typeCheck_->addItem("Hexahedral Mesh");
typeCheck_->setCurrentIndex(0);
loadCompMode_ = new QCheckBox("Load PolyVolMesh format");
loadCorrectOrder_= new QCheckBox("Correct face ordering");
loadTopCheck_ = new QCheckBox("Perform topology checks");
llayout->addWidget(typeCheck_);
llayout->addWidget(loadCompMode_);
llayout->addWidget(loadCorrectOrder_);
llayout->addWidget(loadTopCheck_);
loadOptions_->setLayout(llayout);
......@@ -140,11 +137,6 @@ int FileOpenVolumeMeshPlugin::loadObject(QString _filename) {
compatibility_mode = loadCompMode_->isChecked();
}
bool correct_face_order = false;
if(!OpenFlipper::Options::nogui()) {
correct_face_order = loadCorrectOrder_->isChecked();
}
bool topology_checks = true;
if(!OpenFlipper::Options::nogui()) {
topology_checks = loadTopCheck_->isChecked();
......@@ -169,7 +161,7 @@ int FileOpenVolumeMeshPlugin::loadObject(QString _filename) {
if(compatibility_mode) {
loadMesh((const char*) _filename.toAscii(), *(obj->mesh()), compatibility_mode,
topology_checks, correct_face_order);
topology_checks);
} else {
if(!fileManager_.readFile(_filename.toStdString(), *(obj->mesh()),
......@@ -202,7 +194,7 @@ int FileOpenVolumeMeshPlugin::loadObject(QString _filename) {
if(compatibility_mode) {
loadMesh((const char*) _filename.toAscii(), *(obj->mesh()), compatibility_mode,
topology_checks, correct_face_order);
topology_checks);
} else {
if(!fileManager_.readFile(_filename.toStdString(), *(obj->mesh()),
......
......@@ -137,7 +137,7 @@ public slots:
private:
template <typename MeshT>
void loadMesh(const char* _filename, MeshT& _mesh, bool _comp, bool _topCheck, bool _correctOrder);
void loadMesh(const char* _filename, MeshT& _mesh, bool _comp, bool _topCheck);
template <typename MeshT>
void saveMesh(const char* _filename, MeshT& _mesh, bool _comp);
......@@ -150,7 +150,6 @@ private:
QComboBox* typeCheck_;
QCheckBox* loadCompMode_;
QCheckBox* loadCorrectOrder_;
QCheckBox* loadTopCheck_;
QCheckBox* saveCompMode_;
......
......@@ -47,7 +47,7 @@
//----------------------------------------------------------------------------
template <typename MeshT>
void FileOpenVolumeMeshPlugin::loadMesh(const char* _filename, MeshT& _mesh, bool _comp, bool _topCheck, bool _correctOrder) {
void FileOpenVolumeMeshPlugin::loadMesh(const char* _filename, MeshT& _mesh, bool _comp, bool _topCheck) {
// found edges in file
bool edges_in_file = false;
......@@ -220,7 +220,7 @@ void FileOpenVolumeMeshPlugin::loadMesh(const char* _filename, MeshT& _mesh, boo
hm = dynamic_cast<HexahedralMesh*>(&_mesh);
if(hm) {
hm->add_cell(hfhandles, _topCheck, _correctOrder);
hm->add_cell(hfhandles, _topCheck);
} else {
_mesh.add_cell(hfhandles, _topCheck);
}
......@@ -249,7 +249,7 @@ void FileOpenVolumeMeshPlugin::loadMesh(const char* _filename, MeshT& _mesh, boo
hm = dynamic_cast<HexahedralMesh*>(&_mesh);
if(hm) {
hm->add_cell(hfs, _topCheck, _correctOrder);
hm->add_cell(hfs, _topCheck);
} else {
_mesh.add_cell(hfs, _topCheck);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment