Commit 973e1df2 authored by Ivan Ilin's avatar Ivan Ilin

CFF import fixes

parent 0e7ba267
This diff is collapsed.
...@@ -65,6 +65,7 @@ private: ...@@ -65,6 +65,7 @@ private:
qreal mVBTransFactor; qreal mVBTransFactor;
QPointF mViewBoxCenter; QPointF mViewBoxCenter;
QSize mSize; QSize mSize;
QPointF mShiftVector;
private: private:
QDomDocument mDOMdoc; QDomDocument mDOMdoc;
...@@ -85,6 +86,8 @@ private: ...@@ -85,6 +86,8 @@ private:
bool parseIwbMeta(const QDomElement &element); bool parseIwbMeta(const QDomElement &element);
bool parseSvg(const QDomElement &svgSection); bool parseSvg(const QDomElement &svgSection);
inline bool parseGSection(const QDomElement &element);
inline bool parseSvgSwitchSection(const QDomElement &element);
inline bool parseSvgRect(const QDomElement &element); inline bool parseSvgRect(const QDomElement &element);
inline bool parseSvgEllipse(const QDomElement &element); inline bool parseSvgEllipse(const QDomElement &element);
inline bool parseSvgPolygon(const QDomElement &element); inline bool parseSvgPolygon(const QDomElement &element);
...@@ -123,9 +126,9 @@ private: ...@@ -123,9 +126,9 @@ private:
// helper methods // helper methods
void repositionSvgItem(QGraphicsItem *item, qreal width, qreal height, void repositionSvgItem(QGraphicsItem *item, qreal width, qreal height,
qreal x, qreal y, qreal x, qreal y,
bool useTransform, QTransform &transform); QTransform &transform);
QColor colorFromString(const QString& clrString); QColor colorFromString(const QString& clrString);
QTransform transformFromString(const QString trString); QTransform transformFromString(const QString trString, QGraphicsItem *item = 0);
bool getViewBoxDimenstions(const QString& viewBox); bool getViewBoxDimenstions(const QString& viewBox);
QSvgGenerator* createSvgGenerator(qreal width, qreal height); QSvgGenerator* createSvgGenerator(qreal width, qreal height);
bool getTempFileName(); bool getTempFileName();
......
...@@ -366,7 +366,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() ...@@ -366,7 +366,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
// introduced in UB 4.0 // introduced in UB 4.0
QStringRef svgViewBox = mXmlReader.attributes().value(nsSvg, "viewBox"); QStringRef svgViewBox = mXmlReader.attributes().value("viewBox");
if (!svgViewBox.isNull()) if (!svgViewBox.isNull())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment