From ce951351bd2ee4a4c59cd15230b9b70695c7d8b2 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Wed, 21 Dec 2005 23:28:56 +0000 Subject: [PATCH] code cleaning --- src/meshlabplugins/meshio/meshio.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/meshlabplugins/meshio/meshio.cpp b/src/meshlabplugins/meshio/meshio.cpp index 6f00782a2..e8723f9af 100644 --- a/src/meshlabplugins/meshio/meshio.cpp +++ b/src/meshlabplugins/meshio/meshio.cpp @@ -24,6 +24,9 @@ History $Log$ + Revision 1.33 2005/12/21 23:28:56 buzzelli + code cleaning + Revision 1.32 2005/12/21 14:22:58 buzzelli First steps in STL and OFF files importing @@ -139,11 +142,12 @@ bool ExtraMeshIOPlugin::open(const QString &formatName, QString &fileName,MeshMo if (fileName.isEmpty()) fileName = QFileDialog::getOpenFileName(parent,tr("Open File"),"../sample","Obj files (*.obj)"); + if (!fileName.isEmpty()) { // initializing progress bar status if (cb != NULL) - (*cb)(0, "Starting..."); + (*cb)(0, "Loading..."); // this change of dir is needed for subsequent texture/material loading QString FileNameDir = fileName.left(fileName.lastIndexOf("/")); @@ -154,9 +158,9 @@ bool ExtraMeshIOPlugin::open(const QString &formatName, QString &fileName,MeshMo if(formatName.toUpper() == tr("OBJ")) //if (format == tr("Import OBJ")) { - vcg::tri::io::ObjInfo oi; - vcg::tri::io::ImporterOBJ::LoadMask(filename.c_str(), mask, oi); + vcg::tri::io::ObjInfo oi; oi.cb = cb; + vcg::tri::io::ImporterOBJ::LoadMask(filename.c_str(), mask, oi); if(mask & vcg::ply::PLYMask::PM_WEDGTEXCOORD) {