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

Solved the hideous bug of slow xml parsing on mac. replaced all the xmlparser stuff with old school DOM traversal...

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2014-02-07 17:27:07 +00:00
parent 4b0506a61f
commit c7f4b987a1
2 changed files with 781 additions and 618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/pluginmanager.cpp
View File

@ -85,16 +85,16 @@ void PluginManager::loadPlugins(RichParameterSet& defaultGlobal)
QString absfilepath = pluginsDir.absoluteFilePath(fileName);
QFileInfo fin(absfilepath);
if (fin.suffix() == "xml")
{
try
{
loadXMLPlugin(fileName);
}
catch (MeshLabXMLParsingException& e)
{
qDebug() << e.what();
}
}
{
try
{
loadXMLPlugin(fileName);
}
catch (MeshLabXMLParsingException& e)
{
qDebug() << e.what();
}
}
else
{
QPluginLoader loader(absfilepath);
@ -141,8 +141,8 @@ void PluginManager::loadPlugins(RichParameterSet& defaultGlobal)
editActionList.push_back(editAction);
}
}
else
qDebug() << loader.errorString();
else
qDebug() << loader.errorString();
}
}
knownIOFormats();
@ -296,7 +296,7 @@ void PluginManager::loadXMLPlugin( const QString& fileName )
{
xmlpluginfo << pluginfo;
fc.xmlInfo = xmlpluginfo[xmlpluginfo.size() - 1];
QStringList fn = fc.xmlInfo->filterNames();
// QStringList fn = fc.xmlInfo->filterNames();
QObject* par = NULL;
if (pluginsDir.exists(dllfile))
{
@ -417,10 +417,10 @@ QString PluginManager::pluginNameSpace()
QString PluginManager::osIndependentPluginName( const QString& plname )
{
QFileInfo fi(plname);
QString res = fi.baseName();
QString pref = DLLFileNamePreamble();
return res.remove(0,pref.size());
QFileInfo fi(plname);
QString res = fi.baseName();
QString pref = DLLFileNamePreamble();
return res.remove(0,pref.size());
}
//QString PluginManager::getLocalPluginDirPath()

1365
src/common/xmlfilterinfo.cpp
View File

File diff suppressed because it is too large Load Diff