diff --git a/src/meshlab/savemaskexporter.cpp b/src/meshlab/savemaskexporter.cpp index 50601e28e..cad37c22b 100644 --- a/src/meshlab/savemaskexporter.cpp +++ b/src/meshlab/savemaskexporter.cpp @@ -25,6 +25,9 @@ History $Log$ + Revision 1.6 2006/01/30 14:27:29 fmazzant + update GetMaskCapability of PLY,OFF and STL. + Revision 1.5 2006/01/30 14:02:04 fmazzant bug-fix @@ -127,47 +130,47 @@ int SaveMaskExporterDialog::GetNewMask() void SaveMaskExporterDialog::SetMaskCapability() { //vert - ui.check_iom_vertquality->setDisabled( ((capability & MeshModel::IOM_VERTQUALITY)==0) /*| ((m->mask & MeshModel::IOM_VERTQUALITY)==0)*/ ); - ui.check_iom_vertquality->setChecked ( ((capability & MeshModel::IOM_VERTQUALITY)!=0) /*& ((m->mask & MeshModel::IOM_VERTQUALITY)!=0)*/); + ui.check_iom_vertquality->setDisabled( ((capability & MeshModel::IOM_VERTQUALITY)==0) | ((m->mask & MeshModel::IOM_VERTQUALITY)==0) ); + ui.check_iom_vertquality->setChecked ( ((capability & MeshModel::IOM_VERTQUALITY)!=0) & ((m->mask & MeshModel::IOM_VERTQUALITY)!=0)); - ui.check_iom_vertflags->setDisabled( ((capability & MeshModel::IOM_VERTFLAGS)==0) /*| ((m->mask & MeshModel::IOM_VERTFLAGS)==0)*/ ); - ui.check_iom_vertflags->setChecked ( ((capability & MeshModel::IOM_VERTFLAGS)!=0) /*& ((m->mask & MeshModel::IOM_VERTFLAGS)!=0)*/ ); + ui.check_iom_vertflags->setDisabled( ((capability & MeshModel::IOM_VERTFLAGS)==0) | ((m->mask & MeshModel::IOM_VERTFLAGS)==0)); + ui.check_iom_vertflags->setChecked ( ((capability & MeshModel::IOM_VERTFLAGS)!=0) & ((m->mask & MeshModel::IOM_VERTFLAGS)!=0) ); - ui.check_iom_vertcolor->setDisabled( ((capability & MeshModel::IOM_VERTCOLOR)==0) /*| ((m->mask & MeshModel::IOM_VERTCOLOR)==0) */); - ui.check_iom_vertcolor->setChecked ( ((capability & MeshModel::IOM_VERTCOLOR)!=0) /*& ((m->mask & MeshModel::IOM_VERTCOLOR)!=0)*/ ); + ui.check_iom_vertcolor->setDisabled( ((capability & MeshModel::IOM_VERTCOLOR)==0) | ((m->mask & MeshModel::IOM_VERTCOLOR)==0) ); + ui.check_iom_vertcolor->setChecked ( ((capability & MeshModel::IOM_VERTCOLOR)!=0) & ((m->mask & MeshModel::IOM_VERTCOLOR)!=0) ); - ui.check_iom_verttexcoord->setDisabled( ((capability & MeshModel::IOM_VERTTEXCOORD)==0) /*| ((m->mask & MeshModel::IOM_VERTTEXCOORD)==0)*/ ); - ui.check_iom_verttexcoord->setChecked ( ((capability & MeshModel::IOM_VERTTEXCOORD)!=0) /*& ((m->mask & MeshModel::IOM_VERTTEXCOORD)!=0) */); + ui.check_iom_verttexcoord->setDisabled( ((capability & MeshModel::IOM_VERTTEXCOORD)==0) | ((m->mask & MeshModel::IOM_VERTTEXCOORD)==0) ); + ui.check_iom_verttexcoord->setChecked ( ((capability & MeshModel::IOM_VERTTEXCOORD)!=0) & ((m->mask & MeshModel::IOM_VERTTEXCOORD)!=0) ); - ui.check_iom_vertnormal->setDisabled( ((capability & MeshModel::IOM_VERTNORMAL)==0) /*| ((m->mask & MeshModel::IOM_VERTNORMAL)==0)*/ ); - ui.check_iom_vertnormal->setChecked ( ((capability & MeshModel::IOM_VERTNORMAL)!=0) /*& ((m->mask & MeshModel::IOM_VERTNORMAL)!=0)*/ ); + ui.check_iom_vertnormal->setDisabled( ((capability & MeshModel::IOM_VERTNORMAL)==0) | ((m->mask & MeshModel::IOM_VERTNORMAL)==0) ); + ui.check_iom_vertnormal->setChecked ( ((capability & MeshModel::IOM_VERTNORMAL)!=0) & ((m->mask & MeshModel::IOM_VERTNORMAL)!=0) ); //face - ui.check_iom_facequality->setDisabled( ((capability & MeshModel::IOM_FACEQUALITY)==0) /*| ((m->mask & MeshModel::IOM_FACEQUALITY)==0)*/); - ui.check_iom_facequality->setChecked ( ((capability & MeshModel::IOM_FACEQUALITY)!=0) /*& ((m->mask & MeshModel::IOM_FACEQUALITY)!=0)*/); + ui.check_iom_facequality->setDisabled( ((capability & MeshModel::IOM_FACEQUALITY)==0) | ((m->mask & MeshModel::IOM_FACEQUALITY)==0)); + ui.check_iom_facequality->setChecked ( ((capability & MeshModel::IOM_FACEQUALITY)!=0) & ((m->mask & MeshModel::IOM_FACEQUALITY)!=0)); - ui.check_iom_faceflags->setDisabled( ((capability & MeshModel::IOM_FACEFLAGS)==0) /*| ((m->mask & MeshModel::IOM_FACEFLAGS)==0) */); - ui.check_iom_faceflags->setChecked ( ((capability & MeshModel::IOM_FACEFLAGS)!=0) /*& ((m->mask & MeshModel::IOM_FACEFLAGS)!=0) */); + ui.check_iom_faceflags->setDisabled( ((capability & MeshModel::IOM_FACEFLAGS)==0) | ((m->mask & MeshModel::IOM_FACEFLAGS)==0) ); + ui.check_iom_faceflags->setChecked ( ((capability & MeshModel::IOM_FACEFLAGS)!=0) & ((m->mask & MeshModel::IOM_FACEFLAGS)!=0) ); - ui.check_iom_facecolor->setDisabled( ((capability & MeshModel::IOM_FACECOLOR)==0) /*| ((m->mask & MeshModel::IOM_FACECOLOR)==0) */); - ui.check_iom_facecolor->setChecked ( ((capability & MeshModel::IOM_FACECOLOR)!=0) /*& ((m->mask & MeshModel::IOM_FACECOLOR)!=0) */); + ui.check_iom_facecolor->setDisabled( ((capability & MeshModel::IOM_FACECOLOR)==0) | ((m->mask & MeshModel::IOM_FACECOLOR)==0) ); + ui.check_iom_facecolor->setChecked ( ((capability & MeshModel::IOM_FACECOLOR)!=0) & ((m->mask & MeshModel::IOM_FACECOLOR)!=0) ); - ui.check_iom_facenormal->setDisabled( ((capability & MeshModel::IOM_FACENORMAL)==0) /*| ((m->mask & MeshModel::IOM_FACENORMAL)==0) */); - ui.check_iom_facenormal->setChecked ( ((capability & MeshModel::IOM_FACENORMAL)!=0) /*& ((m->mask & MeshModel::IOM_FACENORMAL)!=0) */); + ui.check_iom_facenormal->setDisabled( ((capability & MeshModel::IOM_FACENORMAL)==0) | ((m->mask & MeshModel::IOM_FACENORMAL)==0) ); + ui.check_iom_facenormal->setChecked ( ((capability & MeshModel::IOM_FACENORMAL)!=0) & ((m->mask & MeshModel::IOM_FACENORMAL)!=0) ); //wedg - ui.check_iom_wedgcolor->setDisabled( ((capability & MeshModel::IOM_WEDGCOLOR)==0) /*| ((m->mask & MeshModel::IOM_WEDGCOLOR)==0) */); - ui.check_iom_wedgcolor->setChecked ( ((capability & MeshModel::IOM_WEDGCOLOR)!=0) /*& ((m->mask & MeshModel::IOM_WEDGCOLOR)!=0) */); + ui.check_iom_wedgcolor->setDisabled( ((capability & MeshModel::IOM_WEDGCOLOR)==0) | ((m->mask & MeshModel::IOM_WEDGCOLOR)==0) ); + ui.check_iom_wedgcolor->setChecked ( ((capability & MeshModel::IOM_WEDGCOLOR)!=0) & ((m->mask & MeshModel::IOM_WEDGCOLOR)!=0) ); - ui.check_iom_wedgtexcoord->setDisabled( ((capability & MeshModel::IOM_WEDGTEXCOORD)==0) /*| ((m->mask & MeshModel::IOM_WEDGTEXCOORD)==0) */); - ui.check_iom_wedgtexcoord->setChecked ( ((capability & MeshModel::IOM_WEDGTEXCOORD)!=0) /*& ((m->mask & MeshModel::IOM_WEDGTEXCOORD)!=0) */); + ui.check_iom_wedgtexcoord->setDisabled( ((capability & MeshModel::IOM_WEDGTEXCOORD)==0) | ((m->mask & MeshModel::IOM_WEDGTEXCOORD)==0) ); + ui.check_iom_wedgtexcoord->setChecked ( ((capability & MeshModel::IOM_WEDGTEXCOORD)!=0) & ((m->mask & MeshModel::IOM_WEDGTEXCOORD)!=0) ); - ui.check_iom_wedgnormal->setDisabled( ((capability & MeshModel::IOM_WEDGNORMAL)==0) /*| ((m->mask & MeshModel::IOM_WEDGNORMAL)==0) */); - ui.check_iom_wedgnormal->setChecked ( ((capability & MeshModel::IOM_WEDGNORMAL)!=0) /*& ((m->mask & MeshModel::IOM_WEDGNORMAL)!=0) */); + ui.check_iom_wedgnormal->setDisabled( ((capability & MeshModel::IOM_WEDGNORMAL)==0) | ((m->mask & MeshModel::IOM_WEDGNORMAL)==0) ); + ui.check_iom_wedgnormal->setChecked ( ((capability & MeshModel::IOM_WEDGNORMAL)!=0) & ((m->mask & MeshModel::IOM_WEDGNORMAL)!=0) ); //camera - ui.check_iom_camera->setDisabled( ((capability & MeshModel::IOM_CAMERA)==0) /*| ((m->mask & MeshModel::IOM_CAMERA)==0) */); - ui.check_iom_camera->setChecked ( ((capability & MeshModel::IOM_CAMERA)!=0) /*& ((m->mask & MeshModel::IOM_CAMERA)!=0) */); + ui.check_iom_camera->setDisabled( ((capability & MeshModel::IOM_CAMERA)==0) | ((m->mask & MeshModel::IOM_CAMERA)==0) ); + ui.check_iom_camera->setChecked ( ((capability & MeshModel::IOM_CAMERA)!=0) & ((m->mask & MeshModel::IOM_CAMERA)!=0) ); if(capability == 0) diff --git a/src/meshlabplugins/meshio/meshio.cpp b/src/meshlabplugins/meshio/meshio.cpp index 6bdc1e3d0..9fc55a0c9 100644 --- a/src/meshlabplugins/meshio/meshio.cpp +++ b/src/meshlabplugins/meshio/meshio.cpp @@ -24,6 +24,9 @@ History $Log$ + Revision 1.73 2006/01/30 14:27:30 fmazzant + update GetMaskCapability of PLY,OFF and STL. + Revision 1.72 2006/01/30 06:36:21 buzzelli added a dialog used to select type of data being imported @@ -367,9 +370,9 @@ QList ExtraMeshIOPlugin::exportFormats() const int ExtraMeshIOPlugin::GetExportMaskCapability(QString &format) const { if(format.toUpper() == tr("OBJ")){return vcg::tri::io::ExporterOBJ::GetExportMaskCapability();} - if(format.toUpper() == tr("PLY")){return MeshModel::IOM_ALL;} - if(format.toUpper() == tr("OFF")){return MeshModel::IOM_ALL;} - if(format.toUpper() == tr("STL")){return MeshModel::IOM_ALL;} + if(format.toUpper() == tr("PLY")){return vcg::tri::io::ExporterPLY::GetExportMaskCapability();} + if(format.toUpper() == tr("OFF")){return vcg::tri::io::ExporterOFF::GetExportMaskCapability();} + if(format.toUpper() == tr("STL")){return vcg::tri::io::ExporterSTL::GetExportMaskCapability();} if(format.toUpper() == tr("3DS")){return vcg::tri::io::Exporter3DS::GetExportMaskCapability();} return 0; }