lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-15 00:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed bugs in the format filters list.

Browse Source 
removed some compiler warnings.
This commit is contained in:
Guido Ranzuglia granzuglia 2010-12-31 15:46:13 +00:00
parent de48de86c9
commit 6cde2faba9
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/meshlabdocumentxml.cpp
View File

@ -67,7 +67,7 @@ bool MeshDocumentFromXML(MeshDocument &md, QString filename)
//return true;
filen=mesh.attributes().namedItem("filename").nodeValue();
label=mesh.attributes().namedItem("label").nodeValue();
MeshModel* mm = md.addNewMesh(filen,label);
/*MeshModel* mm = */md.addNewMesh(filen,label);
QDomNode tr=mesh.firstChild();
if(!tr.isNull() && QString::compare(tr.nodeName(),"MLMatrix44")==0)

41
src/common/pluginmanager.cpp
View File

@ -204,39 +204,34 @@ QString PluginManager::getPluginDirPath()
void PluginManager::knownIOFormats()
{
//currentFormats[IMPORT] currentFormats[EXPORT]
QVector< QList<MeshIOInterface::Format> > currentFormats(2);
QString allKnownFormatsFilter = QObject::tr("All known formats (");
QVector<MeshIOInterface*>::iterator itIOPlugin = meshIOPlug.begin();
for (int i = 0; itIOPlugin != meshIOPlug.end(); ++itIOPlugin, ++i) // cycle among loaded IO plugins
for(int inpOut = 0;inpOut < 2;++inpOut)
{
MeshIOInterface* pMeshIOPlugin = *itIOPlugin;
currentFormats[IMPORT].append(pMeshIOPlugin->importFormats());
currentFormats[EXPORT].append(pMeshIOPlugin->exportFormats());
for(int inpOut = 0;inpOut < 2;++inpOut)
QStringList* formatFilters = NULL;
QString allKnownFormatsFilter = QObject::tr("All known formats (");
for(QVector<MeshIOInterface*>::iterator itIOPlugin = meshIOPlug.begin();itIOPlugin != meshIOPlug.end();++itIOPlugin)
{
MeshIOInterface* pMeshIOPlugin = *itIOPlugin;
QList<MeshIOInterface::Format> format;
QMap<QString,MeshIOInterface*>* map = NULL;
QStringList* filt = NULL;
if (inpOut == int(IMPORT))
if(inpOut== int(IMPORT))
{
map = &allKnowInputFormats;
filt = &inpFilters;
formatFilters = &inpFilters;
format = pMeshIOPlugin->importFormats();
}
else
{
map = &allKnowOutputFormats;
filt = &outFilters;
formatFilters = &outFilters;
format = pMeshIOPlugin->exportFormats();
}
QList<MeshIOInterface::Format>::iterator itFormat = currentFormats[inpOut].begin();
while(itFormat != currentFormats[inpOut].end())
for(QList<MeshIOInterface::Format>::iterator itf = format.begin();itf != format.end();++itf)
{
MeshIOInterface::Format currentFormat = *itFormat;
MeshIOInterface::Format currentFormat = *itf;
QString currentFilterEntry = currentFormat.description + " (";
//a particular file format could be associated with more than one file extension
QStringListIterator itExtension(currentFormat.extensions);
while (itExtension.hasNext())
{
@ -251,12 +246,12 @@ void PluginManager::knownIOFormats()
currentFilterEntry.append(currentExtension);
}
currentFilterEntry.append(')');
filt->append(currentFilterEntry);
++itFormat;
formatFilters->append(currentFilterEntry);
}
allKnownFormatsFilter.append(')');
filt->push_front(allKnownFormatsFilter);
}
allKnownFormatsFilter.append(')');
formatFilters->push_front(allKnownFormatsFilter);
}
}