lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 08:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed unuseful parent parameter for open and save functions

Browse Source
This commit is contained in:
alemuntoni 2021-03-18 14:36:10 +01:00
parent 462641741b
commit 157ccc6ca2
29 changed files with 57 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/plugins/interfaces/iomesh_plugin.h
View File

@ -132,8 +132,7 @@ public:
MeshModel &m, /// The mesh that is filled with the file content
int &mask, /// a bit mask that will be filled reporting what kind of data we have found in the file (per vertex color, texture coords etc)
const RichParameterList & par, /// The parameters that have been set up in the initPreOpenParameter()
vcg::CallBackPos *cb = nullptr, /// standard callback for reporting progress in the loading
QWidget *parent = nullptr) = 0; /// you should not use this...
vcg::CallBackPos *cb = nullptr) = 0; /// standard callback for reporting progress in the loading
virtual void save(
const QString &format, // the extension of the format e.g. "PLY"
@ -141,8 +140,7 @@ public:
MeshModel &m,
const int mask,// a bit mask indicating what kind of the data present in the mesh should be saved (e.g. you could not want to save normals in ply files)
const RichParameterList & par,
vcg::CallBackPos *cb = 0,
QWidget *parent = 0) = 0;
vcg::CallBackPos *cb) = 0;
void wrongOpenFormat(const QString& format)
{

4
src/meshlab/mainwindow_RunTime.cpp
View File

@ -2217,7 +2217,7 @@ bool MainWindow::loadMesh(const QString& fileName, IOMeshPlugin *pCurrentIOPlugi
pCurrentIOPlugin->setLog(&meshDoc()->Log);
try {
pCurrentIOPlugin->open(extension, fileNameSansDir, *mm ,mask,*prePar,QCallBack,this /*gla*/);
pCurrentIOPlugin->open(extension, fileNameSansDir, *mm ,mask,*prePar,QCallBack);
}
catch(const MLException& e) {
QMessageBox::warning(
@ -2669,7 +2669,7 @@ bool MainWindow::exportMesh(QString fileName,MeshModel* mod,const bool saveAllPo
QElapsedTimer tt; tt.start();
qb->reset();
try {
pCurrentIOPlugin->save(extension, fileName, *mod ,mask,savePar,QCallBack,this);
pCurrentIOPlugin->save(extension, fileName, *mod ,mask,savePar,QCallBack);
GLA()->Logf(GLLogStream::SYSTEM, "Saved Mesh %s in %i msec", qUtf8Printable(fileName), tt.elapsed());
mod->setFileName(fileName);
QSettings settings;

5
src/meshlabplugins/filter_ssynth/filter_ssynth.cpp
View File

@ -183,8 +183,7 @@ void FilterSSynth::open(
MeshModel &m,
int& mask,
const RichParameterList & par,
CallBackPos *cb,
QWidget *parent)
CallBackPos *cb)
{
if (formatName.toUpper() == tr("ES")){
this->seed=par.getInt("seed");
@ -218,7 +217,7 @@ void FilterSSynth::open(
}
}
void FilterSSynth::save(const QString &formatName, const QString &/*fileName*/, MeshModel &/*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos */*cb*/, QWidget */*parent*/)
void FilterSSynth::save(const QString &formatName, const QString &/*fileName*/, MeshModel &/*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos */*cb*/)
{
wrongSaveFormat(formatName);
}

4
src/meshlabplugins/filter_ssynth/filter_ssynth.h
View File

@ -60,8 +60,8 @@ class FilterSSynth : public QObject, public IOMeshPlugin, public FilterPlugin{
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void initPreOpenParameter(const QString &formatName, RichParameterList &parlst);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb);
FilterPlugin::FilterArity filterArity(const QAction *) const {return NONE;}
private:
QString ssynth(QString grammar,int maxdepth,int seed,vcg::CallBackPos *cb);

6
src/meshlabplugins/io_3ds/meshio.cpp
View File

@ -90,8 +90,7 @@ void ExtraMeshIOPlugin::open(
MeshModel &m,
int& mask,
const RichParameterList& params,
CallBackPos *cb,
QWidget*)
CallBackPos *cb)
{
// initializing mask
mask = 0;
@ -250,8 +249,7 @@ void ExtraMeshIOPlugin::save(
MeshModel &m,
const int mask,
const RichParameterList &,
vcg::CallBackPos *cb,
QWidget *)
vcg::CallBackPos *cb)
{
QString errorMsgFormat = "Error encountered while exporting file %1:\n%2";
string filename = QFile::encodeName(fileName).constData ();

6
src/meshlabplugins/io_3ds/meshio.h
View File

@ -53,8 +53,7 @@ public:
MeshModel &m,
int& mask,
const RichParameterList &params,
vcg::CallBackPos *cb=0,
QWidget* parent=0);
vcg::CallBackPos *cb=0);
void save(
const QString &formatName,
@ -62,8 +61,7 @@ public:
MeshModel &m,
const int mask,
const RichParameterList &,
vcg::CallBackPos *cb=0,
QWidget *parent= 0);
vcg::CallBackPos *cb=0);
};
#endif

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

@ -85,7 +85,7 @@ void BaseMeshIOPlugin::initPreOpenParameter(const QString &formatName, RichParam
}
}
void BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget * /*parent*/)
void BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb)
{
//bool normalsUpdated = false;
QString errorMsgFormat = "Error encountered while loading file:\n\"%1\"\n\nError details: %2";
@ -286,7 +286,7 @@ void BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName,
if (cb != NULL) (*cb)(99, "Done");
}
void BaseMeshIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, CallBackPos *cb, QWidget * /*parent*/)
void BaseMeshIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, CallBackPos *cb)
{
QString errorMsgFormat = "Error encountered while exportering file %1:\n%2";
string filename = QFile::encodeName(fileName).constData();

4
src/meshlabplugins/io_base/baseio.h
View File

@ -43,8 +43,8 @@ public:
void exportMaskCapability(const QString& format, int &capability, int &defaultBits) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb = 0, QWidget *parent = 0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb = 0, QWidget *parent = 0);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb);
//void initOpenParameter(const QString &format, MeshModel &/*m*/, RichParameterSet & par);
//void applyOpenParameter(const QString &format, MeshModel &m, const RichParameterSet &par);
void initPreOpenParameter(const QString &formatName, RichParameterList &parlst);

4
src/meshlabplugins/io_bre/io_bre.cpp
View File

@ -131,7 +131,7 @@ void BreMeshIOPlugin::initPreOpenParameter(const QString &formatName, RichParame
}
void BreMeshIOPlugin::open(const QString &/*formatName*/, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget * /*parent*/)
void BreMeshIOPlugin::open(const QString &/*formatName*/, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb)
{
// initializing progress bar status
if (cb != NULL)
@ -146,7 +146,7 @@ void BreMeshIOPlugin::open(const QString &/*formatName*/, const QString &fileNam
}
}
void BreMeshIOPlugin::save(const QString & formatName,const QString & /*fileName*/, MeshModel &, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos *, QWidget * /*parent*/)
void BreMeshIOPlugin::save(const QString & formatName,const QString & /*fileName*/, MeshModel &, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos *)
{
wrongSaveFormat(formatName);
}

4
src/meshlabplugins/io_bre/io_bre.h
View File

@ -166,8 +166,8 @@ public:
void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent= 0);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb);
virtual void initOpenParameter(const QString &format, MeshModel &/*m*/, RichParameterList & par);
virtual void applyOpenParameter(const QString &format, MeshModel &m, const RichParameterList &par);
void initPreOpenParameter(const QString &formatName, RichParameterList &parlst);

4
src/meshlabplugins/io_collada/io_collada.cpp
View File

@ -101,7 +101,7 @@
using namespace std;
using namespace vcg;
void ColladaIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget * /*parent*/)
void ColladaIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb)
{
// initializing mask
mask = 0;
@ -150,7 +150,7 @@ void ColladaIOPlugin::open(const QString &formatName, const QString &fileName, M
}
}
void ColladaIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/, QWidget * /*parent*/)
void ColladaIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/)
{
if (formatName.toUpper() == tr("DAE")){
QString errorMsgFormat = "Error encountered while exportering file %1:\n%2";

4
src/meshlabplugins/io_collada/io_collada.h
View File

@ -62,8 +62,8 @@ class ColladaIOPlugin : public QObject, public IOMeshPlugin
std::list<FileFormat> exportFormats() const;
void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &par, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent= 0);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &par, vcg::CallBackPos *cb);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb);
};
#endif

4
src/meshlabplugins/io_ctm/io_ctm.cpp
View File

@ -36,7 +36,7 @@
using namespace vcg;
void IOMPlugin::open(const QString & formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & /*par*/, CallBackPos *cb, QWidget * /*parent*/)
void IOMPlugin::open(const QString & formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & /*par*/, CallBackPos *cb)
{
if (formatName.toUpper() == tr("CTM")){
QString errorMsgFormat = "Error encountered while loading file:\n\"%1\"\n\nError details: %2";
@ -51,7 +51,7 @@ void IOMPlugin::open(const QString & formatName, const QString &fileName, MeshMo
}
}
void IOMPlugin::save(const QString & formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos * /*cb*/, QWidget *parent)
void IOMPlugin::save(const QString & formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos * /*cb*/)
{
if (formatName.toUpper() == tr("CTM")){
bool lossLessFlag = par.getBool("LossLess");

4
src/meshlabplugins/io_ctm/io_ctm.h
View File

@ -48,8 +48,8 @@ public:
void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void initSaveParameter(const QString &/*format*/, MeshModel &/*m*/, RichParameterList & /*par*/);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos *cb, QWidget *parent);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos *cb);
};

4
src/meshlabplugins/io_expe/io_expe.cpp
View File

@ -38,7 +38,7 @@ using namespace vcg;
void ExpeIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & /*parlst*/, CallBackPos *cb, QWidget*/*parent*/)
void ExpeIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & /*parlst*/, CallBackPos *cb)
{
// initializing mask
mask = 0;
@ -102,7 +102,7 @@ void ExpeIOPlugin::open(const QString &formatName, const QString &fileName, Mesh
(*cb)(99, "Done");
}
void ExpeIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/, QWidget *parent)
void ExpeIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/)
{
QString errorMsgFormat = "Error encountered while exporting file %1:\n%2";
string filename = QFile::encodeName(fileName).constData ();

4
src/meshlabplugins/io_expe/io_expe.h
View File

@ -44,8 +44,8 @@ public:
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
// void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterSet & /*par*/);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb);
};
#endif

7
src/meshlabplugins/io_json/io_json.cpp
View File

@ -45,17 +45,14 @@ QString JSONIOPlugin::pluginName() const
return "IOJson";
}
void JSONIOPlugin::open(const QString & formatName, const QString &, MeshModel &, int &, const RichParameterList &, vcg::CallBackPos *, QWidget * /*parent*/)
void JSONIOPlugin::open(const QString & formatName, const QString &, MeshModel &, int &, const RichParameterList &, vcg::CallBackPos *)
{
wrongOpenFormat(formatName);
}
void JSONIOPlugin::save(const QString & formatName,const QString & fileName, MeshModel & m, const int mask, const RichParameterList & par, vcg::CallBackPos * cb, QWidget * parent)
void JSONIOPlugin::save(const QString & formatName,const QString & fileName, MeshModel & m, const int mask, const RichParameterList &, vcg::CallBackPos *)
{
if (formatName.toUpper() == tr("JSON")){
(void)par;
(void)cb;
(void)parent;
vcg::tri::Allocator<CMeshO>::CompactVertexVector(m.cm);
vcg::tri::Allocator<CMeshO>::CompactFaceVector(m.cm);

4
src/meshlabplugins/io_json/io_json.h
View File

@ -44,8 +44,8 @@ public:
void exportMaskCapability(const QString & format, int & capability, int & defaultBits) const;
void open(const QString & formatName, const QString & fileName, MeshModel & m, int & mask, const RichParameterList & par, vcg::CallBackPos * cb = 0, QWidget * parent = 0);
void save(const QString & formatName, const QString & fileName, MeshModel & m, const int mask, const RichParameterList & par, vcg::CallBackPos * cb = 0, QWidget * parent = 0);
void open(const QString & formatName, const QString & fileName, MeshModel & m, int & mask, const RichParameterList & par, vcg::CallBackPos * cb = 0);
void save(const QString & formatName, const QString & fileName, MeshModel & m, const int mask, const RichParameterList & par, vcg::CallBackPos * cb = 0);
};
#endif // JSONIOPLUGIN_H

4
src/meshlabplugins/io_pdb/io_pdb.cpp
View File

@ -64,7 +64,7 @@ void PDBIOPlugin::initPreOpenParameter(const QString &formatName, RichParameterL
}
}
void PDBIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget * /*parent*/)
void PDBIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb)
{
//bool normalsUpdated = false;
@ -93,7 +93,7 @@ void PDBIOPlugin::open(const QString &formatName, const QString &fileName, MeshM
}
}
void PDBIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos * /*cb*/, QWidget * /*parent*/)
void PDBIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos * /*cb*/)
{
wrongSaveFormat(formatName);
}

4
src/meshlabplugins/io_pdb/io_pdb.h
View File

@ -42,8 +42,8 @@ public:
void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent= 0);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb=0);
virtual void initOpenParameter(const QString &format, MeshModel &/*m*/, RichParameterList & par);
virtual void applyOpenParameter(const QString &format, MeshModel &m, const RichParameterList &par);
void initPreOpenParameter(const QString &formatName, RichParameterList &parlst);

4
src/meshlabplugins/io_tri/io_tri.cpp
View File

@ -44,7 +44,7 @@ void TriIOPlugin::initPreOpenParameter(const QString &format, RichParameterList
}
}
void TriIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget *)
void TriIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb)
{
if(formatName.toUpper() == tr("TRI"))
{
@ -70,7 +70,7 @@ void TriIOPlugin::open(const QString &formatName, const QString &fileName, MeshM
}
}
void TriIOPlugin::save(const QString& formatName, const QString &, MeshModel &, const int, const RichParameterList &, vcg::CallBackPos *, QWidget *)
void TriIOPlugin::save(const QString& formatName, const QString &, MeshModel &, const int, const RichParameterList &, vcg::CallBackPos *)
{
wrongSaveFormat(formatName);
}

4
src/meshlabplugins/io_tri/io_tri.h
View File

@ -48,8 +48,8 @@ public:
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
virtual void initPreOpenParameter(const QString &/*format*/, RichParameterList & /*par*/);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb);
};
#endif

4
src/meshlabplugins/io_txt/io_txt.cpp
View File

@ -59,7 +59,7 @@ void TxtIOPlugin::initPreOpenParameter(const QString &format, RichParameterList
}
}
void TxtIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos * /*cb*/, QWidget * /*parent*/)
void TxtIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos * /*cb*/)
{
if(formatName.toUpper() == tr("TXT")) {
int rowToSkip = parlst.getInt("rowToSkip");
@ -85,7 +85,7 @@ void TxtIOPlugin::open(const QString &formatName, const QString &fileName, MeshM
}
}
void TxtIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos * /*cb*/, QWidget * /*parent*/)
void TxtIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos * /*cb*/)
{
wrongSaveFormat(formatName);
}

4
src/meshlabplugins/io_txt/io_txt.h
View File

@ -42,8 +42,8 @@ public:
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
virtual void initPreOpenParameter(const QString &/*format*/, RichParameterList & /*par*/);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb);
};
#endif

6
src/meshlabplugins/io_u3d/io_u3d.cpp
View File

@ -50,8 +50,7 @@ void U3DIOPlugin::open(
MeshModel &,
int&,
const RichParameterList &,
CallBackPos *,
QWidget *)
CallBackPos *)
{
wrongOpenFormat(format);
}
@ -62,8 +61,7 @@ void U3DIOPlugin::save(
MeshModel &m,
const int mask,
const RichParameterList & par,
vcg::CallBackPos *,
QWidget *)
vcg::CallBackPos *)
{
vcg::tri::Allocator<CMeshO>::CompactVertexVector(m.cm);
vcg::tri::Allocator<CMeshO>::CompactFaceVector(m.cm);

4
src/meshlabplugins/io_u3d/io_u3d.h
View File

@ -48,8 +48,8 @@ public:
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent= 0);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb=0);
void initSaveParameter(const QString &format, MeshModel &/*m*/, RichParameterList &par);

4
src/meshlabplugins/io_x3d/io_x3d.cpp
View File

@ -31,7 +31,7 @@
using namespace std;
using namespace vcg;
void IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget */*parent*/)
void IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb)
{
// initializing mask
mask = 0;
@ -120,7 +120,7 @@ void IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshM
}
void IoX3DPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *)
void IoX3DPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb)
{
QString errorMsgFormat = "Error encountered while exportering file:\n%1\n\nError details: %2";
string filename = QFile::encodeName(fileName).constData ();

4
src/meshlabplugins/io_x3d/io_x3d.h
View File

@ -51,8 +51,8 @@ public:
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent);
void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0);
void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb);
};
#endif

2
src/meshlabserver/mainserver.cpp
View File

@ -262,7 +262,7 @@ public:
int defbits = 0;
pCurrentIOPlugin->exportMaskCapability(extension,formatmask,defbits);
try {
pCurrentIOPlugin->save(extension, fileName, *mm ,mask & formatmask, savePar);
pCurrentIOPlugin->save(extension, fileName, *mm ,mask & formatmask, savePar, nullptr);
QDir::setCurrent(curDir.absolutePath());
return true;
}