diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index 85602fff1..71cb4a89e 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.58 2006/01/19 11:21:12 fmazzant +deleted old savemaskobj & old MaskObj + Revision 1.57 2006/01/17 13:47:45 fmazzant update interface meshio : formats -> importFormats() & exportFormts @@ -107,7 +110,7 @@ Added copyright info #include #include "meshmodel.h" #include "glarea.h" -#include "../meshlabplugins/meshio/savemaskdialog.h" +//#include "../meshlabplugins/meshio/savemaskdialog.h" #define MAXRECENTFILES 4 @@ -126,7 +129,7 @@ public: MainWindow(); static bool QCallBack(const int pos, const char * str); const QString appName() const {return tr("MeshLab v0.6"); } - MaskObj maskobj; + // MaskObj maskobj; private slots: diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 5b582598d..52acfce6b 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.40 2006/01/19 11:21:12 fmazzant +deleted old savemaskobj & old MaskObj + Revision 1.39 2006/01/17 09:20:02 fmazzant deleted Ob&j saving options... menu @@ -325,7 +328,7 @@ QProgressDialog *MainWindow::qb; MainWindow::MainWindow() { - maskobj = MaskObj(); + //maskobj = MaskObj(); workspace = new QWorkspace(this); setCentralWidget(workspace); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 47d714b27..760f5d6af 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.72 2006/01/19 11:21:12 fmazzant +deleted old savemaskobj & old MaskObj + Revision 1.71 2006/01/17 23:46:36 cignoni Moved some include from meshmodel.h to here @@ -926,9 +929,9 @@ void MainWindow::setCustomize() void MainWindow::setSaveMaskObj() { - SaveMaskDialog objdialog(&maskobj,new QWidget()); + /*SaveMaskDialog objdialog(&maskobj,new QWidget()); objdialog.ReadMask(); - objdialog.exec(); + objdialog.exec();*/ } void MainWindow::renderBbox() { GLA()->setDrawMode(GLW::DMBox ); } diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index af5ad8405..171185d47 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -6,8 +6,6 @@ HEADERS = interfaces.h \ plugindialog.h \ customDialog.h \ saveSnapshotDialog.h \ - ../meshlabplugins/meshio/savemaskdialog.h\ - ../meshlabplugins/meshio/maskobj.h\ ../../../sf/wrap/gui/trackball.h\ ../../../sf/wrap/gui/trackmode.h\ ../../../sf/wrap/gl/trimesh.h @@ -20,8 +18,6 @@ SOURCES = main.cpp \ plugindialog.cpp \ customDialog.cpp \ saveSnapshotDialog.cpp \ - ../meshlabplugins/meshio/savemaskdialog.cpp\ - ../meshlabplugins/meshio/maskobj.cpp\ ../../../sf/wrap/ply/plylib.cpp\ ../../../sf/wrap/gui/trackball.cpp\ ../../../sf/wrap/gui/trackmode.cpp diff --git a/src/meshlabplugins/meshio/maskobj.cpp b/src/meshlabplugins/meshio/maskobj.cpp index 9750c18bb..d38a9daaa 100644 --- a/src/meshlabplugins/meshio/maskobj.cpp +++ b/src/meshlabplugins/meshio/maskobj.cpp @@ -24,6 +24,9 @@ History $Log$ + Revision 1.6 2006/01/19 11:21:14 fmazzant + deleted old savemaskobj & old MaskObj + Revision 1.5 2006/01/10 16:52:19 fmazzant update ply::PlyMask -> io::Mask @@ -43,31 +46,31 @@ *****************************************************************************/ -#include "maskobj.h" -#include - -MaskObj::MaskObj() -{ - this->isfirst=true; - - this->faces = true; - this->vertexs = true; - - this->binary = false; - this->colorV = false; - this->colorF = false; - this->normal = false; - this->texture = false; -} - -int MaskObj::MaskObjToInt() -{ - int mask=0; - if(faces) {mask |= vcg::tri::io::Mask::IOM_FACEQUALITY;} - if(vertexs) {mask |= vcg::tri::io::Mask::IOM_VERTQUALITY;} - if(colorV) {mask |= vcg::tri::io::Mask::IOM_VERTCOLOR;} - if(colorF) {mask |= vcg::tri::io::Mask::IOM_FACECOLOR;} - if(normal) {mask |= vcg::tri::io::Mask::IOM_VERTNORMAL;} - if(texture) {mask |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD;} - return mask; -} \ No newline at end of file +//#include "maskobj.h" +//#include +// +//MaskObj::MaskObj() +//{ +// this->isfirst=true; +// +// this->faces = true; +// this->vertexs = true; +// +// this->binary = false; +// this->colorV = false; +// this->colorF = false; +// this->normal = false; +// this->texture = false; +//} +// +//int MaskObj::MaskObjToInt() +//{ +// int mask=0; +// if(faces) {mask |= vcg::tri::io::Mask::IOM_FACEQUALITY;} +// if(vertexs) {mask |= vcg::tri::io::Mask::IOM_VERTQUALITY;} +// if(colorV) {mask |= vcg::tri::io::Mask::IOM_VERTCOLOR;} +// if(colorF) {mask |= vcg::tri::io::Mask::IOM_FACECOLOR;} +// if(normal) {mask |= vcg::tri::io::Mask::IOM_VERTNORMAL;} +// if(texture) {mask |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD;} +// return mask; +//} \ No newline at end of file diff --git a/src/meshlabplugins/meshio/maskobj.h b/src/meshlabplugins/meshio/maskobj.h index 98ace12ae..0bb6783fc 100644 --- a/src/meshlabplugins/meshio/maskobj.h +++ b/src/meshlabplugins/meshio/maskobj.h @@ -24,6 +24,9 @@ History $Log$ + Revision 1.3 2006/01/19 11:21:14 fmazzant + deleted old savemaskobj & old MaskObj + Revision 1.2 2005/12/13 14:02:50 fmazzant added the rescue of the materials of the obj @@ -33,19 +36,19 @@ *****************************************************************************/ -class MaskObj -{ -public: - MaskObj(); - - int MaskObjToInt(); - - bool isfirst; - bool vertexs; - bool faces; - bool texture; - bool normal; - bool binary; - bool colorV; - bool colorF; -}; \ No newline at end of file +//class MaskObj +//{ +//public: +// MaskObj(); +// +// int MaskObjToInt(); +// +// bool isfirst; +// bool vertexs; +// bool faces; +// bool texture; +// bool normal; +// bool binary; +// bool colorV; +// bool colorF; +//}; \ No newline at end of file diff --git a/src/meshlabplugins/meshio/meshio.cpp b/src/meshlabplugins/meshio/meshio.cpp index 491cecc20..f0412dcfe 100644 --- a/src/meshlabplugins/meshio/meshio.cpp +++ b/src/meshlabplugins/meshio/meshio.cpp @@ -24,6 +24,9 @@ History $Log$ + Revision 1.54 2006/01/19 11:21:14 fmazzant + deleted old savemaskobj & old MaskObj + Revision 1.53 2006/01/19 09:36:28 fmazzant cleaned up history log @@ -45,7 +48,7 @@ #include #include "meshio.h" -#include "savemaskdialog.h" +//#include "savemaskdialog.h" #include "savemaskexporter.h" // temporaneamente prendo la versione corrente dalla cartella test diff --git a/src/meshlabplugins/meshio/meshio.pro b/src/meshlabplugins/meshio/meshio.pro index 99dfd62d2..d5d713924 100644 --- a/src/meshlabplugins/meshio/meshio.pro +++ b/src/meshlabplugins/meshio/meshio.pro @@ -1,9 +1,9 @@ TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include ../../../../code/lib/lib3ds-1.2.0 -HEADERS = meshio.h savemaskdialog.h maskobj.h savemaskexporter.h changetexturename.h ../../../../sf/wrap/ply/plylib.h -SOURCES = meshio.cpp savemaskdialog.cpp maskobj.cpp savemaskexporter.cpp changetexturename.cpp ../../../../sf/wrap/ply/plylib.cpp -FORMS = ui/savemask.ui ui/savemaskexporter.ui ui/renametexture.ui +HEADERS = meshio.h savemaskexporter.h changetexturename.h ../../../../sf/wrap/ply/plylib.h +SOURCES = meshio.cpp savemaskexporter.cpp changetexturename.cpp ../../../../sf/wrap/ply/plylib.cpp +FORMS = ui/savemaskexporter.ui ui/renametexture.ui TARGET = meshio DESTDIR = ../../meshlab/plugins