Mercurial > hg > svcore
changeset 77:2beca8ddcdc3
* Add BZipFileDevice to handle bzip2 compress/uncompress without all that
ugly code in MainWindow.cpp
* Remove all that ugly code in MainWindow.cpp and replace with uses of
BZipFileDevice
* Fix layer import/export for SV XML layers
* and a few other minor fixes
| author | Chris Cannam |
|---|---|
| date | Wed, 12 Apr 2006 09:59:40 +0000 |
| parents | af2725b5d6fe |
| children | c983dda79f72 |
| files | base/Layer.cpp base/Model.cpp transform/TransformFactory.cpp |
| diffstat | 3 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/base/Layer.cpp Mon Apr 10 17:22:59 2006 +0000 +++ b/base/Layer.cpp Wed Apr 12 09:59:40 2006 +0000 @@ -70,10 +70,10 @@ s += indent; s += QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n") - .arg(LayerFactory::instance()->getLayerTypeName - (LayerFactory::instance()->getLayerType(this))) + .arg(encodeEntities(LayerFactory::instance()->getLayerTypeName + (LayerFactory::instance()->getLayerType(this)))) .arg(getObjectExportId(this)) - .arg(objectName()) + .arg(encodeEntities(objectName())) .arg(getObjectExportId(getModel())) .arg(extraAttributes);
--- a/base/Model.cpp Mon Apr 10 17:22:59 2006 +0000 +++ b/base/Model.cpp Wed Apr 12 09:59:40 2006 +0000 @@ -40,7 +40,7 @@ s += QString("<model id=\"%1\" name=\"%2\" sampleRate=\"%3\" start=\"%4\" end=\"%5\" %6/>\n") .arg(getObjectExportId(this)) - .arg(objectName()) + .arg(encodeEntities(objectName())) .arg(getSampleRate()) .arg(getStartFrame()) .arg(getEndFrame())
--- a/transform/TransformFactory.cpp Mon Apr 10 17:22:59 2006 +0000 +++ b/transform/TransformFactory.cpp Wed Apr 12 09:59:40 2006 +0000 @@ -423,8 +423,9 @@ getTransformUnits(name), output.toInt()); } else { - std::cerr << "TransformFactory::createTransform: Unknown transform " - << name.toStdString() << std::endl; + std::cerr << "TransformFactory::createTransform: Unknown transform \"" + << name.toStdString() << "\"" << std::endl; + return transform; } if (start && transform) transform->start();