diff --git a/src/common/interfaces/iomesh_plugin_interface.h b/src/common/interfaces/iomesh_plugin_interface.h index 8f611c1ea..f87baf032 100644 --- a/src/common/interfaces/iomesh_plugin_interface.h +++ b/src/common/interfaces/iomesh_plugin_interface.h @@ -37,8 +37,8 @@ public: IOMeshPluginInterface() : PluginInterface() { } virtual ~IOMeshPluginInterface() {} - virtual QList importFormats() const = 0; - virtual QList exportFormats() const = 0; + virtual QList importFormats() const = 0; + virtual QList exportFormats() const = 0; // This function is called to initialize the list of additional parameters that a OPENING filter could require // it is called by the framework BEFORE the actual mesh loading to perform to determine how parse the input file diff --git a/src/common/pluginmanager.cpp b/src/common/pluginmanager.cpp index c86c6c4b3..c98a66d5b 100644 --- a/src/common/pluginmanager.cpp +++ b/src/common/pluginmanager.cpp @@ -281,7 +281,7 @@ void PluginManager::knownIOFormats() for (QVector::iterator itIOPlugin = meshIOPlug.begin(); itIOPlugin != meshIOPlug.end(); ++itIOPlugin) { IOMeshPluginInterface* pMeshIOPlugin = *itIOPlugin; - QList format; + QList format; QMap* map = NULL; if (inpOut == int(IMPORT)) { @@ -295,9 +295,9 @@ void PluginManager::knownIOFormats() formatFilters = &outFilters; format = pMeshIOPlugin->exportFormats(); } - for (QList::iterator itf = format.begin(); itf != format.end(); ++itf) + for (QList::iterator itf = format.begin(); itf != format.end(); ++itf) { - IOMeshPluginInterface::Format currentFormat = *itf; + FileFormat currentFormat = *itf; QString currentFilterEntry = currentFormat.description + " ("; diff --git a/src/common/utilities/file_format.h b/src/common/utilities/file_format.h index e25e704dd..e8d053a55 100644 --- a/src/common/utilities/file_format.h +++ b/src/common/utilities/file_format.h @@ -26,10 +26,10 @@ #include -class Format +class FileFormat { public: - Format(QString description, QString ex) : description(description), extensions(ex){} + FileFormat(QString description, QString ex) : description(description), extensions(ex){} QString description; QStringList extensions; }; diff --git a/src/meshlab/plugindialog.cpp b/src/meshlab/plugindialog.cpp index a88eca6d4..a6e440876 100644 --- a/src/meshlab/plugindialog.cpp +++ b/src/meshlab/plugindialog.cpp @@ -119,13 +119,13 @@ void PluginDialog::populateTreeWidget(const QString &path,const QStringList &fil if (iMeshIO){ nPlugins++; QStringList Templist; - for(const IOMeshPluginInterface::Format& f: iMeshIO->importFormats()){ + for(const FileFormat& f: iMeshIO->importFormats()){ QString formats; for(const QString& s : f.extensions) formats+="Importer_"+s+" "; Templist.push_back(formats); } - for(const IOMeshPluginInterface::Format& f: iMeshIO->exportFormats()){ + for(const FileFormat& f: iMeshIO->exportFormats()){ QString formats; for(const QString& s: f.extensions) formats+="Exporter_"+s+" "; @@ -201,13 +201,13 @@ void PluginDialog::displayInfo(QTreeWidgetItem* item,int /* ncolumn*/) if (plugin) { IOMeshPluginInterface *iMeshIO = qobject_cast(plugin); if (iMeshIO){ - for(const IOMeshPluginInterface::Format& f: iMeshIO->importFormats()){ + for(const FileFormat& f: iMeshIO->importFormats()){ QString formats; for(const QString& s: f.extensions) formats+="Importer_"+s+" "; if (actionName==formats) labelInfo->setText(f.description); } - for(const IOMeshPluginInterface::Format& f: iMeshIO->exportFormats()){ + for(const FileFormat& f: iMeshIO->exportFormats()){ QString formats; for(const QString& s: f.extensions) formats+="Exporter_"+s+" "; diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp b/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp index 32a2a8d49..557acd0d5 100644 --- a/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp +++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp @@ -157,16 +157,16 @@ FilterPluginInterface::FilterClass FilterSSynth::getClass(const QAction */*filte return FilterPluginInterface::MeshCreation; } -QList FilterSSynth::importFormats() const +QList FilterSSynth::importFormats() const { - QList formats; - formats<< IOMeshPluginInterface::Format("Eisen Script File", tr("ES")); + QList formats; + formats<< FileFormat("Eisen Script File", tr("ES")); return formats; } -QList FilterSSynth::exportFormats() const +QList FilterSSynth::exportFormats() const { - QList formats; + QList formats; return formats ; } diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.h b/src/meshlabplugins/filter_ssynth/filter_ssynth.h index a8aae012f..e41958d69 100644 --- a/src/meshlabplugins/filter_ssynth/filter_ssynth.h +++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.h @@ -50,8 +50,8 @@ public: void setAttributes(CMeshO::VertexIterator &vi, CMeshO &m); static void openX3D(const QString &fileName, MeshModel &m, int& mask, vcg::CallBackPos *cb, QWidget *parent=0); virtual int postCondition(const QAction* filter) const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; virtual void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; void initPreOpenParameter(const QString &formatName, const QString &filename, RichParameterList &parlst); diff --git a/src/meshlabplugins/io_3ds/meshio.cpp b/src/meshlabplugins/io_3ds/meshio.cpp index 96a310d8c..4eeba33f4 100644 --- a/src/meshlabplugins/io_3ds/meshio.cpp +++ b/src/meshlabplugins/io_3ds/meshio.cpp @@ -53,168 +53,168 @@ using namespace vcg; bool ExtraMeshIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget *parent) { // initializing mask - mask = 0; + 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!"; - + //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 (); - //string filename = fileName.toUtf8().data(); - + //string filename = fileName.toUtf8().data(); + if (formatName.toUpper() == tr("3DS")) { vcg::tri::io::_3dsInfo info; info.cb = cb; Lib3dsFile *file = NULL; - - - file = lib3ds_file_load(filename.c_str()); - if (!file) - { - int result = vcg::tri::io::Importer3DS::E_CANTOPEN; - QMessageBox::warning(parent, tr("3DS Opening Error"), errorMsgFormat.arg(fileName, vcg::tri::io::Importer3DS::ErrorMsg(result))); - return false; - } - - // No nodes? Fabricate nodes to display all the meshes. - if( !file->nodes && file->meshes) - { - Lib3dsMesh *mesh; - Lib3dsNode *node; - - for (mesh = file->meshes; mesh != NULL; mesh = mesh->next) - { - node = lib3ds_node_new_object(); - strcpy(node->name, mesh->name); - node->parent_id = LIB3DS_NO_PARENT; - lib3ds_file_insert_node(file, node); - } - } - - if( !file->nodes) - return false; - - lib3ds_file_eval(file, 0); - - bool singleLayer = true; - if ( file->nodes->next) - { - if ( QMessageBox::question(parent, tr("3DS Import Option"), - tr("File with more than a mesh.\n\nDo you want to import each mesh as a separate layer?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes ) - singleLayer = false; - } - - if (!singleLayer) - { - Lib3dsNode *p; - mask = 0; - int i=1; - for (p=file->nodes; p!=0; p=p->next, ++i) - { - bool normalsUpdated = false; - - MeshModel &mm = *m.parent->addNewMesh(qUtf8Printable(fileName), QString(p->name), false); - if (cb != NULL) (*cb)(i, (QString("Loading Mesh ")+QString(p->name)).toStdString().c_str()); - - vcg::tri::io::Importer3DS::LoadMask(file, p, info); - mm.Enable(info.mask); - - int result = vcg::tri::io::Importer3DS::Load(mm.cm, file, p, info); - if (result != vcg::tri::io::Importer3DS::E_NOERROR) - { - QMessageBox::warning(parent, tr("3DS Opening Error"), errorMsgFormat.arg(fileName, vcg::tri::io::Importer3DS::ErrorMsg(result))); - continue; - } - - if(info.mask & vcg::tri::io::Mask::IOM_WEDGNORMAL) - normalsUpdated = true; - - mask |= info.mask; - - // verify if texture files are present - QString missingTextureFilesMsg = "The following texture files were not found:\n"; - bool someTextureNotFound = false; - for ( unsigned textureIdx = 0; textureIdx < mm.cm.textures.size(); ++textureIdx) - { - FILE* pFile = fopen (mm.cm.textures[textureIdx].c_str(), "r"); - if (pFile == NULL) - { - missingTextureFilesMsg.append("\n"); - missingTextureFilesMsg.append(mm.cm.textures[textureIdx].c_str()); - someTextureNotFound = true; - } - fclose (pFile); - } - if (someTextureNotFound) - QMessageBox::warning(parent, tr("Missing texture files"), missingTextureFilesMsg); - - vcg::tri::UpdateBounding::Box(mm.cm); // updates bounding box - if (!normalsUpdated) - vcg::tri::UpdateNormal::PerVertex(mm.cm); // updates normals - } - } - else - { - bool normalsUpdated = false; - - vcg::tri::io::Importer3DS::LoadMask(file, 0, info); - m.Enable(info.mask); - int result = vcg::tri::io::Importer3DS::Load(m.cm, file, 0, info); - if (result != vcg::tri::io::Importer3DS::E_NOERROR) + + file = lib3ds_file_load(filename.c_str()); + if (!file) { - QMessageBox::warning(parent, tr("3DS Opening Error"), errorMsgFormat.arg(fileName, vcg::tri::io::Importer3DS::ErrorMsg(result))); - lib3ds_file_free(file); + int result = vcg::tri::io::Importer3DS::E_CANTOPEN; + errorMessage = errorMsgFormat.arg(fileName, vcg::tri::io::Importer3DS::ErrorMsg(result)); return false; } - - if(info.mask & vcg::tri::io::Mask::IOM_WEDGNORMAL) - normalsUpdated = true; - - mask = info.mask; - - - // verify if texture files are present - QString missingTextureFilesMsg = "The following texture files were not found:\n"; - bool someTextureNotFound = false; - for ( unsigned textureIdx = 0; textureIdx < m.cm.textures.size(); ++textureIdx) - { - FILE* pFile = fopen (m.cm.textures[textureIdx].c_str(), "r"); - if (pFile == NULL) + + // No nodes? Fabricate nodes to display all the meshes. + if( !file->nodes && file->meshes) { - missingTextureFilesMsg.append("\n"); - missingTextureFilesMsg.append(m.cm.textures[textureIdx].c_str()); - someTextureNotFound = true; + Lib3dsMesh *mesh; + Lib3dsNode *node; + + for (mesh = file->meshes; mesh != NULL; mesh = mesh->next) + { + node = lib3ds_node_new_object(); + strcpy(node->name, mesh->name); + node->parent_id = LIB3DS_NO_PARENT; + lib3ds_file_insert_node(file, node); + } } - fclose (pFile); + + if( !file->nodes) + return false; + + lib3ds_file_eval(file, 0); + + bool singleLayer = true; + if ( file->nodes->next) + { + if ( QMessageBox::question(parent, tr("3DS Import Option"), + tr("File with more than a mesh.\n\nDo you want to import each mesh as a separate layer?"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes ) + singleLayer = false; + } + + if (!singleLayer) + { + Lib3dsNode *p; + mask = 0; + int i=1; + for (p=file->nodes; p!=0; p=p->next, ++i) + { + bool normalsUpdated = false; + + MeshModel &mm = *m.parent->addNewMesh(qUtf8Printable(fileName), QString(p->name), false); + if (cb != NULL) (*cb)(i, (QString("Loading Mesh ")+QString(p->name)).toStdString().c_str()); + + vcg::tri::io::Importer3DS::LoadMask(file, p, info); + mm.Enable(info.mask); + + int result = vcg::tri::io::Importer3DS::Load(mm.cm, file, p, info); + if (result != vcg::tri::io::Importer3DS::E_NOERROR) + { + QMessageBox::warning(parent, tr("3DS Opening Error"), errorMsgFormat.arg(fileName, vcg::tri::io::Importer3DS::ErrorMsg(result))); + continue; + } + + if(info.mask & vcg::tri::io::Mask::IOM_WEDGNORMAL) + normalsUpdated = true; + + mask |= info.mask; + + // verify if texture files are present + QString missingTextureFilesMsg = "The following texture files were not found:\n"; + bool someTextureNotFound = false; + for ( unsigned textureIdx = 0; textureIdx < mm.cm.textures.size(); ++textureIdx) + { + FILE* pFile = fopen (mm.cm.textures[textureIdx].c_str(), "r"); + if (pFile == NULL) + { + missingTextureFilesMsg.append("\n"); + missingTextureFilesMsg.append(mm.cm.textures[textureIdx].c_str()); + someTextureNotFound = true; + } + fclose (pFile); + } + if (someTextureNotFound) + QMessageBox::warning(parent, tr("Missing texture files"), missingTextureFilesMsg); + + vcg::tri::UpdateBounding::Box(mm.cm); // updates bounding box + if (!normalsUpdated) + vcg::tri::UpdateNormal::PerVertex(mm.cm); // updates normals + } + } + else + { + bool normalsUpdated = false; + + vcg::tri::io::Importer3DS::LoadMask(file, 0, info); + m.Enable(info.mask); + + int result = vcg::tri::io::Importer3DS::Load(m.cm, file, 0, info); + if (result != vcg::tri::io::Importer3DS::E_NOERROR) + { + QMessageBox::warning(parent, tr("3DS Opening Error"), errorMsgFormat.arg(fileName, vcg::tri::io::Importer3DS::ErrorMsg(result))); + lib3ds_file_free(file); + return false; + } + + if(info.mask & vcg::tri::io::Mask::IOM_WEDGNORMAL) + normalsUpdated = true; + + mask = info.mask; + + + // verify if texture files are present + QString missingTextureFilesMsg = "The following texture files were not found:\n"; + bool someTextureNotFound = false; + for ( unsigned textureIdx = 0; textureIdx < m.cm.textures.size(); ++textureIdx) + { + FILE* pFile = fopen (m.cm.textures[textureIdx].c_str(), "r"); + if (pFile == NULL) + { + missingTextureFilesMsg.append("\n"); + missingTextureFilesMsg.append(m.cm.textures[textureIdx].c_str()); + someTextureNotFound = true; + } + fclose (pFile); + } + if (someTextureNotFound) + QMessageBox::warning(parent, tr("Missing texture files"), missingTextureFilesMsg); + + vcg::tri::UpdateBounding::Box(m.cm); // updates bounding box + if (!normalsUpdated) + vcg::tri::UpdateNormal::PerVertex(m.cm); // updates normals + } + + if (cb != NULL) (*cb)(99, "Done"); + + // freeing memory + lib3ds_file_free(file); + + return true; } - if (someTextureNotFound) - QMessageBox::warning(parent, tr("Missing texture files"), missingTextureFilesMsg); - - vcg::tri::UpdateBounding::Box(m.cm); // updates bounding box - if (!normalsUpdated) - vcg::tri::UpdateNormal::PerVertex(m.cm); // updates normals - } - - if (cb != NULL) (*cb)(99, "Done"); - - // freeing memory - lib3ds_file_free(file); - - return true; -} - return false; + return false; } bool ExtraMeshIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent) { QString errorMsgFormat = "Error encountered while exporting file %1:\n%2"; string filename = QFile::encodeName(fileName).constData (); - //string filename = fileName.toUtf8().data(); + //string filename = fileName.toUtf8().data(); string ex = formatName.toUtf8().data(); if(formatName.toUpper() == tr("3DS")) @@ -228,27 +228,27 @@ bool ExtraMeshIOPlugin::save(const QString &formatName, const QString &fileName, return true; } else - assert(0); // unknown format - return false; + assert(0); // unknown format + return false; } /* returns the list of the file's type which can be imported */ -QList ExtraMeshIOPlugin::importFormats() const +QList ExtraMeshIOPlugin::importFormats() const { - QList formatList; - formatList << Format("3D-Studio File Format" ,tr("3DS")); + QList formatList; + formatList << FileFormat("3D-Studio File Format" ,tr("3DS")); return formatList; } /* returns the list of the file's type which can be exported */ -QList ExtraMeshIOPlugin::exportFormats() const +QList ExtraMeshIOPlugin::exportFormats() const { - QList formatList; - formatList << Format("3D-Studio File Format" ,tr("3DS")); + QList formatList; + formatList << FileFormat("3D-Studio File Format" ,tr("3DS")); return formatList; } diff --git a/src/meshlabplugins/io_3ds/meshio.h b/src/meshlabplugins/io_3ds/meshio.h index 7586ce89b..9fe0e66fe 100644 --- a/src/meshlabplugins/io_3ds/meshio.h +++ b/src/meshlabplugins/io_3ds/meshio.h @@ -39,8 +39,8 @@ class ExtraMeshIOPlugin : public QObject, public IOMeshPluginInterface public: - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; QString pluginName() const; void GetExportMaskCapability(const QString& format, int &capability, int &defaultBits) const; diff --git a/src/meshlabplugins/io_base/baseio.cpp b/src/meshlabplugins/io_base/baseio.cpp index 892372b50..a080dcebb 100644 --- a/src/meshlabplugins/io_base/baseio.cpp +++ b/src/meshlabplugins/io_base/baseio.cpp @@ -432,17 +432,17 @@ QString BaseMeshIOPlugin::pluginName() const /* returns the list of the file's type which can be imported */ -QList BaseMeshIOPlugin::importFormats() const +QList BaseMeshIOPlugin::importFormats() const { - QList formatList; - formatList << Format("Stanford Polygon File Format", tr("PLY")); - formatList << Format("STL File Format", tr("STL")); - formatList << Format("Alias Wavefront Object", tr("OBJ")); - formatList << Format("Quad Object", tr("QOBJ")); - formatList << Format("Object File Format", tr("OFF")); - formatList << Format("PTX File Format", tr("PTX")); - formatList << Format("VCG Dump File Format", tr("VMI")); - formatList << Format("FBX Autodesk Interchange Format", tr("FBX")); + QList formatList; + formatList << FileFormat("Stanford Polygon File Format", tr("PLY")); + formatList << FileFormat("STL File Format", tr("STL")); + formatList << FileFormat("Alias Wavefront Object", tr("OBJ")); + formatList << FileFormat("Quad Object", tr("QOBJ")); + formatList << FileFormat("Object File Format", tr("OFF")); + formatList << FileFormat("PTX File Format", tr("PTX")); + formatList << FileFormat("VCG Dump File Format", tr("VMI")); + formatList << FileFormat("FBX Autodesk Interchange Format", tr("FBX")); return formatList; } @@ -450,15 +450,15 @@ QList BaseMeshIOPlugin::importFormats() const /* returns the list of the file's type which can be exported */ -QList BaseMeshIOPlugin::exportFormats() const +QList BaseMeshIOPlugin::exportFormats() const { - QList formatList; - formatList << Format("Stanford Polygon File Format", tr("PLY")); - formatList << Format("STL File Format", tr("STL")); - formatList << Format("Alias Wavefront Object", tr("OBJ")); - formatList << Format("Object File Format", tr("OFF")); - formatList << Format("VRML File Format", tr("WRL")); - formatList << Format("DXF File Format", tr("DXF")); + QList formatList; + formatList << FileFormat("Stanford Polygon File Format", tr("PLY")); + formatList << FileFormat("STL File Format", tr("STL")); + formatList << FileFormat("Alias Wavefront Object", tr("OBJ")); + formatList << FileFormat("Object File Format", tr("OFF")); + formatList << FileFormat("VRML File Format", tr("WRL")); + formatList << FileFormat("DXF File Format", tr("DXF")); return formatList; } diff --git a/src/meshlabplugins/io_base/baseio.h b/src/meshlabplugins/io_base/baseio.h index 0c605679a..2a4d19dab 100644 --- a/src/meshlabplugins/io_base/baseio.h +++ b/src/meshlabplugins/io_base/baseio.h @@ -38,8 +38,8 @@ public: BaseMeshIOPlugin() : IOMeshPluginInterface() {} QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; void GetExportMaskCapability(const QString& format, int &capability, int &defaultBits) const; diff --git a/src/meshlabplugins/io_bre/io_bre.cpp b/src/meshlabplugins/io_bre/io_bre.cpp index 3b7e0c143..a7cfbd153 100644 --- a/src/meshlabplugins/io_bre/io_bre.cpp +++ b/src/meshlabplugins/io_bre/io_bre.cpp @@ -160,10 +160,10 @@ QString BreMeshIOPlugin::pluginName() const return "IOBRE"; } -QList BreMeshIOPlugin::importFormats() const +QList BreMeshIOPlugin::importFormats() const { - QList formatList; - formatList << Format("Breuckmann File Format" , tr("BRE")); + QList formatList; + formatList << FileFormat("Breuckmann File Format" , tr("BRE")); return formatList; } @@ -171,9 +171,9 @@ QList BreMeshIOPlugin::importFormats() const /* returns the list of the file's type which can be exported */ -QList BreMeshIOPlugin::exportFormats() const +QList BreMeshIOPlugin::exportFormats() const { - QList formatList; + QList formatList; //formatList << Format("Breuckmann File Format" , tr("BRE")); return formatList; } diff --git a/src/meshlabplugins/io_bre/io_bre.h b/src/meshlabplugins/io_bre/io_bre.h index 891e54125..01c96b26c 100644 --- a/src/meshlabplugins/io_bre/io_bre.h +++ b/src/meshlabplugins/io_bre/io_bre.h @@ -161,8 +161,8 @@ public: BreMeshIOPlugin() : IOMeshPluginInterface() {} QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; diff --git a/src/meshlabplugins/io_collada/io_collada.cpp b/src/meshlabplugins/io_collada/io_collada.cpp index 715335473..29b2684e6 100644 --- a/src/meshlabplugins/io_collada/io_collada.cpp +++ b/src/meshlabplugins/io_collada/io_collada.cpp @@ -219,20 +219,20 @@ QString ColladaIOPlugin::pluginName() const return "IOCollada"; } -QList ColladaIOPlugin::importFormats() const +QList ColladaIOPlugin::importFormats() const { - QList formatList; - formatList << Format("Collada File Format" ,tr("DAE")); + QList formatList; + formatList << FileFormat("Collada File Format" ,tr("DAE")); return formatList; } /* returns the list of the file's type which can be exported */ -QList ColladaIOPlugin::exportFormats() const +QList ColladaIOPlugin::exportFormats() const { - QList formatList; - formatList << Format("Collada File Format" ,tr("DAE")); + QList formatList; + formatList << FileFormat("Collada File Format" ,tr("DAE")); return formatList; } diff --git a/src/meshlabplugins/io_collada/io_collada.h b/src/meshlabplugins/io_collada/io_collada.h index 50780a1a6..46109c271 100644 --- a/src/meshlabplugins/io_collada/io_collada.h +++ b/src/meshlabplugins/io_collada/io_collada.h @@ -58,8 +58,8 @@ class ColladaIOPlugin : public QObject, public IOMeshPluginInterface std::vector _mp; QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterList & /*par*/); diff --git a/src/meshlabplugins/io_ctm/io_ctm.cpp b/src/meshlabplugins/io_ctm/io_ctm.cpp index ff66513fb..d38bebc15 100644 --- a/src/meshlabplugins/io_ctm/io_ctm.cpp +++ b/src/meshlabplugins/io_ctm/io_ctm.cpp @@ -71,20 +71,20 @@ QString IOMPlugin::pluginName() const return "IOCTM"; } -QList IOMPlugin::importFormats() const +QList IOMPlugin::importFormats() const { - QList formatList; - formatList << Format("OpenCTM compressed format" ,tr("CTM")); + QList formatList; + formatList << FileFormat("OpenCTM compressed format" ,tr("CTM")); return formatList; } /* returns the list of the file's type which can be exported */ -QList IOMPlugin::exportFormats() const +QList IOMPlugin::exportFormats() const { - QList formatList; - formatList << Format("OpenCTM compressed format" ,tr("CTM")); + QList formatList; + formatList << FileFormat("OpenCTM compressed format" ,tr("CTM")); return formatList; } diff --git a/src/meshlabplugins/io_ctm/io_ctm.h b/src/meshlabplugins/io_ctm/io_ctm.h index 282761505..d0781fcd3 100644 --- a/src/meshlabplugins/io_ctm/io_ctm.h +++ b/src/meshlabplugins/io_ctm/io_ctm.h @@ -44,8 +44,8 @@ class IOMPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; virtual void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; void initSaveParameter(const QString &/*format*/, MeshModel &/*m*/, RichParameterList & /*par*/); diff --git a/src/meshlabplugins/io_expe/io_expe.cpp b/src/meshlabplugins/io_expe/io_expe.cpp index ae9782532..262b63a2d 100644 --- a/src/meshlabplugins/io_expe/io_expe.cpp +++ b/src/meshlabplugins/io_expe/io_expe.cpp @@ -40,73 +40,70 @@ using namespace vcg; -bool ExpeIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & /*parlst*/, CallBackPos *cb, QWidget *parent) +bool ExpeIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & /*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 useXYZ=false; + bool useXYZ=false; if ( (formatName.toLower() == tr("pts")) || (formatName.toLower() == tr("apts")) ) - { - int loadMask; - if (!vcg::tri::io::ImporterExpePTS::LoadMask(filename.c_str(),loadMask)) - { - useXYZ=true; - if (!vcg::tri::io::ImporterXYZ::LoadMask(filename.c_str(),loadMask)) - return false; - } - m.Enable(loadMask); - int result; - if(useXYZ) { - result = vcg::tri::io::ImporterXYZ::Open(m.cm, filename.c_str(), mask, cb); - if (result != 0) - { - QMessageBox::warning(parent, tr("PTX Point Set Opening Error"), - errorMsgFormat.arg(fileName, vcg::tri::io::ImporterXYZ::ErrorMsg(result))); - return false; - } - } - else - { - result = vcg::tri::io::ImporterExpePTS::Open(m.cm, filename.c_str(), mask, cb); - if (result != 0) - { - QMessageBox::warning(parent, tr("Expe Point Set Opening Error"), - errorMsgFormat.arg(fileName, vcg::tri::io::ImporterExpePTS::ErrorMsg(result))); - return false; - } - } - - } - else if (formatName.toLower() == tr("xyz")) - { - int loadMask; - if (!vcg::tri::io::ImporterXYZ::LoadMask(filename.c_str(),loadMask)) - return false; - m.Enable(loadMask); - - - int result = vcg::tri::io::ImporterXYZ::Open(m.cm, filename.c_str(), mask, cb); - if (result != 0) - { - QMessageBox::warning(parent, tr("XYZ Opening Error"), - errorMsgFormat.arg(fileName, vcg::tri::io::ImporterXYZ::ErrorMsg(result))); - return false; - } - } - + { + int loadMask; + if (!vcg::tri::io::ImporterExpePTS::LoadMask(filename.c_str(),loadMask)) + { + useXYZ=true; + if (!vcg::tri::io::ImporterXYZ::LoadMask(filename.c_str(),loadMask)) + return false; + } + m.Enable(loadMask); + int result; + if(useXYZ) { + result = vcg::tri::io::ImporterXYZ::Open(m.cm, filename.c_str(), mask, cb); + if (result != 0) + { + errorMessage = errorMsgFormat.arg(fileName, vcg::tri::io::ImporterXYZ::ErrorMsg(result)); + return false; + } + } + else + { + result = vcg::tri::io::ImporterExpePTS::Open(m.cm, filename.c_str(), mask, cb); + if (result != 0) + { + errorMessage = errorMsgFormat.arg(fileName, vcg::tri::io::ImporterExpePTS::ErrorMsg(result)); + return false; + } + } + + } + else if (formatName.toLower() == tr("xyz")) + { + int loadMask; + if (!vcg::tri::io::ImporterXYZ::LoadMask(filename.c_str(),loadMask)) + return false; + m.Enable(loadMask); + + + int result = vcg::tri::io::ImporterXYZ::Open(m.cm, filename.c_str(), mask, cb); + if (result != 0) + { + errorMessage = errorMsgFormat.arg(fileName, vcg::tri::io::ImporterXYZ::ErrorMsg(result)); + return false; + } + } + vcg::tri::UpdateBounding::Box(m.cm); // updates bounding box - + if (cb != NULL) (*cb)(99, "Done"); - + return true; } @@ -115,29 +112,29 @@ bool ExpeIOPlugin::save(const QString &formatName, const QString &fileName, Mesh 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::Save(m.cm,filename.c_str(),mask); -// if(result!=0) -// { -// QMessageBox::warning(parent, tr("Saving Error"), errorMsgFormat.arg(fileName, vcg::tri::io::ExporterGTS::ErrorMsg(result))); -// return false; -// } -// return true; -// } - - if(formatName.toLower() == tr("xyz")) - { - int result = vcg::tri::io::ExporterXYZ::Save(m.cm,filename.c_str(),mask); - if(result!=0) - { - QMessageBox::warning(parent, tr("Saving Error"), errorMsgFormat.arg(fileName, vcg::tri::io::ExporterXYZ::ErrorMsg(result))); - return false; - } - return true; - } - + + // if( formatName.toUpper() == tr("GTS") ) + // { + // int result = vcg::tri::io::ExporterGTS::Save(m.cm,filename.c_str(),mask); + // if(result!=0) + // { + // QMessageBox::warning(parent, tr("Saving Error"), errorMsgFormat.arg(fileName, vcg::tri::io::ExporterGTS::ErrorMsg(result))); + // return false; + // } + // return true; + // } + + if(formatName.toLower() == tr("xyz")) + { + int result = vcg::tri::io::ExporterXYZ::Save(m.cm,filename.c_str(),mask); + if(result!=0) + { + QMessageBox::warning(parent, tr("Saving Error"), errorMsgFormat.arg(fileName, vcg::tri::io::ExporterXYZ::ErrorMsg(result))); + return false; + } + return true; + } + assert(0); // unknown format return false; } @@ -150,24 +147,24 @@ QString ExpeIOPlugin::pluginName() const return "IOExpe"; } -QList ExpeIOPlugin::importFormats() const +QList ExpeIOPlugin::importFormats() const { - QList formatList; - formatList << Format("Expe's point set (binary)" ,tr("pts")); - formatList << Format("Expe's point set (ascii)" ,tr("apts")); - formatList << Format("XYZ Point Cloud (with or without normal)" ,tr("xyz")); + QList formatList; + formatList << FileFormat("Expe's point set (binary)" ,tr("pts")); + formatList << FileFormat("Expe's point set (ascii)" ,tr("apts")); + formatList << FileFormat("XYZ Point Cloud (with or without normal)" ,tr("xyz")); return formatList; } /* returns the list of the file's type which can be exported */ -QList ExpeIOPlugin::exportFormats() const +QList ExpeIOPlugin::exportFormats() const { - QList formatList; -// formatList << Format("Expe's point set (binary)" ,tr("pts")); -// formatList << Format("Expe's point set (ascii)" ,tr("apts")); - formatList << Format("XYZ Point Cloud (with or without normal)" ,tr("xyz")); + QList formatList; + // formatList << Format("Expe's point set (binary)" ,tr("pts")); + // formatList << Format("Expe's point set (ascii)" ,tr("apts")); + formatList << FileFormat("XYZ Point Cloud (with or without normal)" ,tr("xyz")); return formatList; } @@ -177,9 +174,9 @@ QList ExpeIOPlugin::exportFormats() const */ void ExpeIOPlugin::GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const { -// if(format.toLower() == tr("apts")){capability=defaultBits= vcg::tri::io::ExporterExpeAPTS::GetExportMaskCapability();} -// if(format.toLower() == tr("pts")){capability=defaultBits= vcg::tri::io::ExporterExpePTS::GetExportMaskCapability();} - if(format.toLower() == tr("xyz")){capability=defaultBits= vcg::tri::io::ExporterXYZ::GetExportMaskCapability();} + // if(format.toLower() == tr("apts")){capability=defaultBits= vcg::tri::io::ExporterExpeAPTS::GetExportMaskCapability();} + // if(format.toLower() == tr("pts")){capability=defaultBits= vcg::tri::io::ExporterExpePTS::GetExportMaskCapability();} + if(format.toLower() == tr("xyz")){capability=defaultBits= vcg::tri::io::ExporterXYZ::GetExportMaskCapability();} return; } diff --git a/src/meshlabplugins/io_expe/io_expe.h b/src/meshlabplugins/io_expe/io_expe.h index 42722e229..b7257d944 100644 --- a/src/meshlabplugins/io_expe/io_expe.h +++ b/src/meshlabplugins/io_expe/io_expe.h @@ -39,8 +39,8 @@ class ExpeIOPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; virtual void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; // void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterSet & /*par*/); diff --git a/src/meshlabplugins/io_json/io_json.cpp b/src/meshlabplugins/io_json/io_json.cpp index bbf6710fd..67e16fd6d 100644 --- a/src/meshlabplugins/io_json/io_json.cpp +++ b/src/meshlabplugins/io_json/io_json.cpp @@ -45,7 +45,7 @@ QString JSONIOPlugin::pluginName() const return "IOJson"; } -bool JSONIOPlugin::open(const QString & formatName, const QString & fileName, MeshModel & m, int & mask, const RichParameterList & parlst, vcg::CallBackPos * cb, QWidget * parent) +bool JSONIOPlugin::open(const QString & formatName, const QString & fileName, MeshModel & m, int & mask, const RichParameterList & parlst, vcg::CallBackPos * cb, QWidget * /*parent*/) { (void)formatName; (void)fileName; @@ -53,7 +53,6 @@ bool JSONIOPlugin::open(const QString & formatName, const QString & fileName, Me (void)mask; (void)parlst; (void)cb; - (void)parent; return false; } @@ -426,9 +425,9 @@ bool JSONIOPlugin::save(const QString & formatName,const QString & fileName, Mes /* returns the list of the file's type which can be imported */ -QList JSONIOPlugin::importFormats(void) const +QList JSONIOPlugin::importFormats(void) const { - QList formatList; + QList formatList; //formatList << Format("JavaScript JSON", tr("JSON")); return formatList; } @@ -436,10 +435,10 @@ QList JSONIOPlugin::importFormats(void) const /* returns the list of the file's type which can be exported */ -QList JSONIOPlugin::exportFormats(void) const +QList JSONIOPlugin::exportFormats(void) const { - QList formatList; - formatList << Format("JavaScript JSON", tr("JSON")); + QList formatList; + formatList << FileFormat("JavaScript JSON", tr("JSON")); return formatList; } diff --git a/src/meshlabplugins/io_json/io_json.h b/src/meshlabplugins/io_json/io_json.h index 86d0bcfe4..bb3acef63 100644 --- a/src/meshlabplugins/io_json/io_json.h +++ b/src/meshlabplugins/io_json/io_json.h @@ -39,8 +39,8 @@ public: QString pluginName() const; - QList importFormats(void) const; - QList exportFormats(void) const; + QList importFormats(void) const; + QList exportFormats(void) const; void GetExportMaskCapability(const QString & format, int & capability, int & defaultBits) const; diff --git a/src/meshlabplugins/io_pdb/io_pdb.cpp b/src/meshlabplugins/io_pdb/io_pdb.cpp index 4e26ddc82..e130396b2 100644 --- a/src/meshlabplugins/io_pdb/io_pdb.cpp +++ b/src/meshlabplugins/io_pdb/io_pdb.cpp @@ -148,10 +148,10 @@ QString PDBIOPlugin::pluginName() const return "IOPDB"; } -QList PDBIOPlugin::importFormats() const +QList PDBIOPlugin::importFormats() const { - QList formatList; - formatList << Format("Protein Data Bank" , tr("PDB")); + QList formatList; + formatList << FileFormat("Protein Data Bank" , tr("PDB")); return formatList; } @@ -159,9 +159,9 @@ QList PDBIOPlugin::importFormats() const /* returns the list of the file's type which can be exported */ -QList PDBIOPlugin::exportFormats() const +QList PDBIOPlugin::exportFormats() const { - QList formatList; + QList formatList; // formatList << Format("Stanford Polygon File Format" , tr("PLY")); return formatList; diff --git a/src/meshlabplugins/io_pdb/io_pdb.h b/src/meshlabplugins/io_pdb/io_pdb.h index fc1a05176..95277ea56 100644 --- a/src/meshlabplugins/io_pdb/io_pdb.h +++ b/src/meshlabplugins/io_pdb/io_pdb.h @@ -37,8 +37,8 @@ class PDBIOPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; diff --git a/src/meshlabplugins/io_tri/io_tri.cpp b/src/meshlabplugins/io_tri/io_tri.cpp index ac7452a4f..4acbc04b9 100755 --- a/src/meshlabplugins/io_tri/io_tri.cpp +++ b/src/meshlabplugins/io_tri/io_tri.cpp @@ -87,21 +87,21 @@ QString TriIOPlugin::pluginName() const return "IOTRI"; } -QList TriIOPlugin::importFormats() const +QList TriIOPlugin::importFormats() const { - QList formatList; + QList formatList; formatList - << Format("TRI (photogrammetric reconstructions)", tr("TRI")) - << Format("ASC (ascii triplets of points)", tr("ASC")); + << FileFormat("TRI (photogrammetric reconstructions)", tr("TRI")) + << FileFormat("ASC (ascii triplets of points)", tr("ASC")); return formatList; } /* returns the list of the file's type which can be exported */ -QList TriIOPlugin::exportFormats() const +QList TriIOPlugin::exportFormats() const { - QList formatList; + QList formatList; return formatList; } diff --git a/src/meshlabplugins/io_tri/io_tri.h b/src/meshlabplugins/io_tri/io_tri.h index 4bc0ffdb0..f57d96099 100755 --- a/src/meshlabplugins/io_tri/io_tri.h +++ b/src/meshlabplugins/io_tri/io_tri.h @@ -43,8 +43,8 @@ class TriIOPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; virtual void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; virtual void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterList & /*par*/); diff --git a/src/meshlabplugins/io_txt/io_txt.cpp b/src/meshlabplugins/io_txt/io_txt.cpp index 102fbf6b7..b63dba328 100755 --- a/src/meshlabplugins/io_txt/io_txt.cpp +++ b/src/meshlabplugins/io_txt/io_txt.cpp @@ -103,10 +103,10 @@ QString TxtIOPlugin::pluginName() const return "IOTXT"; } -QList TxtIOPlugin::importFormats() const +QList TxtIOPlugin::importFormats() const { - QList formatList; - formatList << Format("TXT (Generic ASCII point list)", tr("TXT")); + QList formatList; + formatList << FileFormat("TXT (Generic ASCII point list)", tr("TXT")); return formatList; } @@ -114,9 +114,9 @@ QList TxtIOPlugin::importFormats() const /* returns the list of the file's type which can be exported */ -QList TxtIOPlugin::exportFormats() const +QList TxtIOPlugin::exportFormats() const { - QList formatList; + QList formatList; return formatList; } @@ -126,7 +126,7 @@ QList TxtIOPlugin::exportFormats() const */ void TxtIOPlugin::GetExportMaskCapability(const QString & /*format*/, int &capability, int &defaultBits) const { - capability=defaultBits=0; + capability=defaultBits=0; return; } diff --git a/src/meshlabplugins/io_txt/io_txt.h b/src/meshlabplugins/io_txt/io_txt.h index 66635736d..17a302515 100755 --- a/src/meshlabplugins/io_txt/io_txt.h +++ b/src/meshlabplugins/io_txt/io_txt.h @@ -37,8 +37,8 @@ class TxtIOPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; virtual void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const; virtual void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterList & /*par*/); diff --git a/src/meshlabplugins/io_u3d/io_u3d.cpp b/src/meshlabplugins/io_u3d/io_u3d.cpp index 47f392c54..e35cdbde4 100644 --- a/src/meshlabplugins/io_u3d/io_u3d.cpp +++ b/src/meshlabplugins/io_u3d/io_u3d.cpp @@ -146,20 +146,20 @@ QString U3DIOPlugin::pluginName() const return "IOU3D"; } -QList U3DIOPlugin::importFormats() const +QList U3DIOPlugin::importFormats() const { - QList formatList; + QList formatList; return formatList; } /* returns the list of the file's type which can be exported */ -QList U3DIOPlugin::exportFormats() const +QList U3DIOPlugin::exportFormats() const { - QList formatList; - formatList << Format("U3D File Format" ,tr("U3D")); - formatList << Format("IDTF File Format" ,tr("IDTF")); + QList formatList; + formatList << FileFormat("U3D File Format" ,tr("U3D")); + formatList << FileFormat("IDTF File Format" ,tr("IDTF")); return formatList; } diff --git a/src/meshlabplugins/io_u3d/io_u3d.h b/src/meshlabplugins/io_u3d/io_u3d.h index d6b86312c..899910c0d 100644 --- a/src/meshlabplugins/io_u3d/io_u3d.h +++ b/src/meshlabplugins/io_u3d/io_u3d.h @@ -41,8 +41,8 @@ class U3DIOPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; U3DIOPlugin(); diff --git a/src/meshlabplugins/io_x3d/io_x3d.cpp b/src/meshlabplugins/io_x3d/io_x3d.cpp index 01f2a97d2..12a6b9d9f 100644 --- a/src/meshlabplugins/io_x3d/io_x3d.cpp +++ b/src/meshlabplugins/io_x3d/io_x3d.cpp @@ -35,7 +35,7 @@ using namespace std; using namespace vcg; -bool IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget *parent) +bool IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget */*parent*/) { // initializing mask mask = 0; @@ -56,7 +56,7 @@ bool IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshM result = vcg::tri::io::ImporterX3D::LoadMaskVrml(filename.c_str(), info); if ( result != vcg::tri::io::ImporterX3D::E_NOERROR) { - QMessageBox::critical(parent, tr("X3D Opening Error"), errorMsgFormat.arg(fileName, info->filenameStack[info->filenameStack.size()-1], vcg::tri::io::ImporterX3D::ErrorMsg(result))); + errorMessage = errorMsgFormat.arg(fileName, info->filenameStack[info->filenameStack.size()-1], vcg::tri::io::ImporterX3D::ErrorMsg(result)); delete info; return false; } @@ -78,14 +78,14 @@ bool IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshM QString fileError = info->filenameStack[info->filenameStack.size()-1]; QString lineError; lineError.setNum(info->lineNumberError); - QMessageBox::critical(parent, tr("X3D Opening Error"), errorMsgFormat.arg(fileName, fileError, lineError, vcg::tri::io::ImporterX3D::ErrorMsg(result))); + errorMessage = errorMsgFormat.arg(fileName, fileError, lineError, vcg::tri::io::ImporterX3D::ErrorMsg(result)); delete info; return false; } if (m.cm.vert.size() == 0) { errorMsgFormat = "Error encountered while loading file:\n\"%1\"\n\nError details: File without a geometry"; - QMessageBox::critical(parent, tr("X3D Opening Error"), errorMsgFormat.arg(fileName)); + errorMessage = errorMsgFormat.arg(fileName); delete info; return false; } @@ -113,7 +113,7 @@ bool IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshM if (someTextureNotFound) - QMessageBox::warning(parent, tr("Missing texture files"), missingTextureFilesMsg); + errorMessage = missingTextureFilesMsg; vcg::tri::UpdateBounding::Box(m.cm); // updates bounding box if (!normalsUpdated) @@ -155,22 +155,22 @@ QString IoX3DPlugin::pluginName() const return "IOX3D"; } -QList IoX3DPlugin::importFormats() const +QList IoX3DPlugin::importFormats() const { - QList formatList; - formatList << Format("X3D File Format - XML encoding", tr("X3D")); - formatList << Format("X3D File Format - VRML encoding", tr("X3DV")); - formatList << Format("VRML 2.0 File Format", tr("WRL")); + QList formatList; + formatList << FileFormat("X3D File Format - XML encoding", tr("X3D")); + formatList << FileFormat("X3D File Format - VRML encoding", tr("X3DV")); + formatList << FileFormat("VRML 2.0 File Format", tr("WRL")); return formatList; } /* returns the list of the file's type which can be exported */ -QList IoX3DPlugin::exportFormats() const +QList IoX3DPlugin::exportFormats() const { - QList formatList; - formatList << Format("X3D File Format", tr("X3D")); + QList formatList; + formatList << FileFormat("X3D File Format", tr("X3D")); return formatList; } diff --git a/src/meshlabplugins/io_x3d/io_x3d.h b/src/meshlabplugins/io_x3d/io_x3d.h index 22be972b9..d90012f9d 100644 --- a/src/meshlabplugins/io_x3d/io_x3d.h +++ b/src/meshlabplugins/io_x3d/io_x3d.h @@ -46,8 +46,8 @@ class IoX3DPlugin : public QObject, public IOMeshPluginInterface public: QString pluginName() const; - QList importFormats() const; - QList exportFormats() const; + QList importFormats() const; + QList exportFormats() const; virtual void GetExportMaskCapability(const QString &format, int &capability, int &defaultBits) const;