lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 19:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved io gts file type into baseio and removed a now useless plugin

Browse Source
This commit is contained in:
Paolo Cignoni 2016-11-10 12:31:02 +01:00
parent c179363a42
commit 76e4dce36e
5 changed files with 29 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/meshlab_full.pro
View File

@ -13,7 +13,6 @@ SUBDIRS = common \
meshlabplugins/io_u3d\
meshlabplugins/io_tri\
meshlabplugins/io_x3d \
meshlabplugins/io_gts \
meshlabplugins/io_expe \
meshlabplugins/io_pdb \
plugins_experimental/io_TXT \

30
src/meshlabplugins/io_base/baseio.cpp
View File

@ -29,6 +29,7 @@
#include <wrap/io_trimesh/import_off.h>
#include <wrap/io_trimesh/import_ptx.h>
#include <wrap/io_trimesh/import_vmi.h>
#include <wrap/io_trimesh/import_gts.h>
#include <wrap/io_trimesh/export_ply.h>
#include <wrap/io_trimesh/export_stl.h>
@ -36,6 +37,7 @@
#include <wrap/io_trimesh/export_vrml.h>
#include <wrap/io_trimesh/export_dxf.h>
#include <wrap/io_trimesh/export_vmi.h>
#include <wrap/io_trimesh/export_gts.h>
#include <wrap/io_trimesh/export.h>
using namespace std;
@ -219,6 +221,23 @@ bool BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName,
return false;
}
}
else if (formatName.toUpper() == tr("GTS"))
{
int loadMask;
if (!tri::io::ImporterGTS<CMeshO>::LoadMask(filename.c_str(),loadMask))
return false;
m.Enable(loadMask);
tri::io::ImporterGTS<CMeshO>::Options opt;
opt.flipFaces = true;
int result = tri::io::ImporterGTS<CMeshO>::Open(m.cm, filename.c_str(), mask, opt, cb);
if (result != 0)
{
errorMessage = errorMsgFormat.arg(fileName, vcg::tri::io::ImporterGTS<CMeshO>::ErrorMsg(result));
return false;
}
}
else
{
assert(0); // Unknown File type
@ -331,7 +350,16 @@ bool BaseMeshIOPlugin::save(const QString &formatName,const QString &fileName, M
}
return true;
}
if( formatName.toUpper() == tr("GTS") )
{
int result = vcg::tri::io::ExporterGTS<CMeshO>::Save(m.cm,filename.c_str(),mask);
if(result!=0)
{
errorMessage = errorMsgFormat.arg(fileName, vcg::tri::io::ExporterGTS<CMeshO>::ErrorMsg(result));
return false;
}
return true;
}
assert(0); // unknown format
return false;
}

146
src/meshlabplugins/io_gts/io_gts.cpp
View File

@ -1,146 +0,0 @@
/****************************************************************************
* MeshLab o o *
* An extendible mesh processor o o *
* _ O _ *
* Copyright(C) 2005, 2006 \/)\/ *
* Visual Computing Lab /\/| *
* ISTI - Italian National Research Council | *
* \ *
* All rights reserved. *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
****************************************************************************/
#include <Qt>
#include "io_gts.h"
#include <wrap/io_trimesh/export.h>
#include <wrap/io_trimesh/io_mask.h>
#include <wrap/io_trimesh/import_gts.h>
#include <wrap/io_trimesh/export_gts.h>
#include <QMessageBox>
using namespace std;
using namespace vcg;
// initialize importing parameters
// void GtsIOPlugin::initPreOpenParameter(const QString &formatName, const QString &filename, RichParameterSet &parlst)
// {
// parlst.addBool("pointsonly",false,"Keep only points","Just import points, without triangulation");
// parlst.addBool("flipfaces",false,"Flip all faces","Flip the orientation of all the triangles");
// }
bool GtsIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterSet & /*parlst*/, CallBackPos *cb, QWidget *parent)
{
// initializing mask
mask = 0;
// initializing progress bar status
if (cb != NULL) (*cb)(0, "Loading...");
QString errorMsgFormat = "Error encountered while loading file:\n\"%1\"\n\nError details: %2";
QString error_2MsgFormat = "Error encountered while loading file:\n\"%1\"\n\n File with more than a mesh.\n Load only the first!";
string filename = QFile::encodeName(fileName).constData ();
bool normalsUpdated = false;
if (formatName.toUpper() == tr("GTS"))
{
int loadMask;
if (!vcg::tri::io::ImporterGTS<CMeshO>::LoadMask(filename.c_str(),loadMask))
return false;
m.Enable(loadMask);
vcg::tri::io::ImporterGTS<CMeshO>::Options opt;
opt.flipFaces = true;
int result = vcg::tri::io::ImporterGTS<CMeshO>::Open(m.cm, filename.c_str(), mask, opt, cb);
if (result != 0)
{
QMessageBox::warning(parent, tr("GTS Opening Error"),
errorMsgFormat.arg(fileName, vcg::tri::io::ImporterGTS<CMeshO>::ErrorMsg(result)));
return false;
}
CMeshO::FaceIterator fi = m.cm.face.begin();
for (; fi != m.cm.face.end(); ++fi)
fi->N() = TriangleNormal(*fi).Normalize();
}
vcg::tri::UpdateBounding<CMeshO>::Box(m.cm); // updates bounding box
if (!normalsUpdated)
vcg::tri::UpdateNormal<CMeshO>::PerVertex(m.cm); // updates normals
if (cb != NULL)
(*cb)(99, "Done");
return true;
}
bool GtsIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterSet &, vcg::CallBackPos * /*cb*/, QWidget *parent)
{
QString errorMsgFormat = "Error encountered while exporting file %1:\n%2";
string filename = QFile::encodeName(fileName).constData ();
string ex = formatName.toUtf8().data();
if( formatName.toUpper() == tr("GTS") )
{
int result = vcg::tri::io::ExporterGTS<CMeshO>::Save(m.cm,filename.c_str(),mask);
if(result!=0)
{
QMessageBox::warning(parent, tr("Saving Error"), errorMsgFormat.arg(fileName, vcg::tri::io::ExporterGTS<CMeshO>::ErrorMsg(result)));
return false;
}
return true;
}
assert(0); // unknown format
return false;
}
/*
returns the list of the file's type which can be imported
*/
QList<MeshIOInterface::Format> GtsIOPlugin::importFormats() const
{
QList<Format> formatList;
formatList << Format("GNU Triangulated Surface" ,tr("GTS"));
return formatList;
}
/*
returns the list of the file's type which can be exported
*/
QList<MeshIOInterface::Format> GtsIOPlugin::exportFormats() const
{
QList<Format> formatList;
formatList << Format("GNU Triangulated Surface" ,tr("GTS"));
return formatList;
}
/*
returns the mask on the basis of the file's type.
otherwise it returns 0 if the file format is unknown
*/
void GtsIOPlugin::GetExportMaskCapability(QString &format, int &capability, int &defaultBits) const
{
if(format.toUpper() == tr("GTS")){capability=defaultBits= vcg::tri::io::ExporterGTS<CMeshO>::GetExportMaskCapability();}
return;
}
MESHLAB_PLUGIN_NAME_EXPORTER(GtsIOPlugin)

48
src/meshlabplugins/io_gts/io_gts.h
View File

@ -1,48 +0,0 @@
/****************************************************************************
* MeshLab o o *
* A versatile mesh processing toolbox o o *
* _ O _ *
* Copyright(C) 2005 \/)\/ *
* Visual Computing Lab /\/| *
* ISTI - Italian National Research Council | *
* \ *
* All rights reserved. *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
****************************************************************************/
#ifndef IO_GTS_PLUGIN_H
#define IO_GTS_PLUGIN_H
#include <QObject>
#include <common/interfaces.h>
class GtsIOPlugin : public QObject, public MeshIOInterface
{
Q_OBJECT
MESHLAB_PLUGIN_IID_EXPORTER(MESH_IO_INTERFACE_IID)
Q_INTERFACES(MeshIOInterface)
public:
QList<Format> importFormats() const;
QList<Format> exportFormats() const;
virtual void GetExportMaskCapability(QString &format, int &capability, int &defaultBits) const;
// void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterSet & /*par*/);
bool open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterSet &, vcg::CallBackPos *cb=0, QWidget *parent=0);
bool save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterSet &, vcg::CallBackPos *cb, QWidget *parent);
};
#endif

7
src/meshlabplugins/io_gts/io_gts.pro
View File

@ -1,7 +0,0 @@
include (../../shared.pri)
HEADERS += io_gts.h
SOURCES += io_gts.cpp
TARGET = io_gts