Removed unused code. Resolved warnings for mac

preferencesAboutTextFull
ivan.ilyin 13 years ago
parent 6140939038
commit 144b8bd029
  1. 72
      src/adaptors/UBCFFSubsetAdaptor.cpp

@ -35,41 +35,41 @@
//tag names definition //tag names definition
//use them everiwhere! //use them everiwhere!
static char* tElement = "element"; static QString tElement = "element";
static char* tEllipse = "ellipse"; static QString tEllipse = "ellipse";
static char* tIwb = "iwb"; static QString tIwb = "iwb";
static char* tMeta = "meta"; static QString tMeta = "meta";
static char* tPage = "page"; static QString tPage = "page";
static char* tPageset = "pageset"; static QString tPageset = "pageset";
static char* tPolygon = "polygon"; static QString tPolygon = "polygon";
static char* tRect = "rect"; static QString tRect = "rect";
static char* tSvg = "svg"; static QString tSvg = "svg";
static char* tText = "text"; static QString tText = "text";
static char* tTextarea = "textarea"; static QString tTextarea = "textarea";
static char* tTspan = "tspan"; static QString tTspan = "tspan";
static char* tBreak = "tbreak"; static QString tBreak = "tbreak";
//attribute names definition //attribute names definition
static char* aFill = "fill"; static QString aFill = "fill";
static char* aFillopacity = "fill-opacity"; static QString aFillopacity = "fill-opacity";
static char* aX = "x"; static QString aX = "x";
static char* aY = "y"; static QString aY = "y";
static char* aWidth = "width"; static QString aWidth = "width";
static char* aHeight = "height"; static QString aHeight = "height";
static char* aStroke = "stroke"; static QString aStroke = "stroke";
static char* aStrokewidth = "stroke-width"; static QString aStrokewidth = "stroke-width";
static char* aCx = "cx"; static QString aCx = "cx";
static char* aCy = "cy"; static QString aCy = "cy";
static char* aRx = "rx"; static QString aRx = "rx";
static char* aRy = "ry"; static QString aRy = "ry";
static char* aTransform = "transform"; static QString aTransform = "transform";
static char* aViewbox = "viewbox"; static QString aViewbox = "viewbox";
static char* aFontSize = "font-size"; static QString aFontSize = "font-size";
static char* aFontfamily = "font-family"; static QString aFontfamily = "font-family";
static char* aFontstretch = "font-stretch"; static QString aFontstretch = "font-stretch";
static char* aFontstyle = "font-style"; static QString aFontstyle = "font-style";
static char* aFontweight = "font-weight"; static QString aFontweight = "font-weight";
static char* aTextalign = "text-align"; static QString aTextalign = "text-align";
UBCFFSubsetAdaptor::UBCFFSubsetAdaptor() UBCFFSubsetAdaptor::UBCFFSubsetAdaptor()
@ -333,7 +333,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvg()
void UBCFFSubsetAdaptor::UBCFFSubsetReader::repositionSvgItem(UBGraphicsSvgItem *item, qreal width, qreal height, qreal x, qreal y, bool useTransform, QTransform &transform) void UBCFFSubsetAdaptor::UBCFFSubsetReader::repositionSvgItem(UBGraphicsSvgItem *item, qreal width, qreal height, qreal x, qreal y, bool useTransform, QTransform &transform)
{ {
QTransform curTrans = item->transform(); QTransform curTrans = item->transform();
qWarning() << QString().sprintf("Item current transform = %f 0 0 %f %f %f, position %f, %f, size %f, %f", curTrans.m11(), curTrans.m22(), curTrans.dx(), curTrans.dy(), item->x(), item->y()); qWarning() << QString().sprintf("Item current transform = %f 0 0 %f %f %f, position %f, %f", curTrans.m11(), curTrans.m22(), curTrans.dx(), curTrans.dy(), item->x(), item->y());
//check if rect is rotated //check if rect is rotated
//rotate svg item itself //rotate svg item itself
QRectF itemBounds = item->boundingRect(); QRectF itemBounds = item->boundingRect();
@ -505,8 +505,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseTextArea()
parseTextAttributes(fontSize, fontColor, fontFamily, fontStretch, italic, fontWeight, textAlign, fontTransform); parseTextAttributes(fontSize, fontColor, fontFamily, fontStretch, italic, fontWeight, textAlign, fontTransform);
QSvgGenerator *generator = createSvgGenerator(width, height); QSvgGenerator *generator = createSvgGenerator(width, height);
qreal hScale = 1;//mCurrentSceneRect.width() / mViewBox.width();
qreal vScale = 1;//mCurrentSceneRect.height() / mViewBox.height();
QPainter painter; QPainter painter;
painter.begin(generator); painter.begin(generator);
painter.setFont(QFont(fontFamily, fontSize, fontWeight, italic)); painter.setFont(QFont(fontFamily, fontSize, fontWeight, italic));
@ -685,9 +683,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseText()
if (text.trimmed().length() == 0) if (text.trimmed().length() == 0)
continue; continue;
//get bounding rect to obtain desired text height //get bounding rect to obtain desired text height
qreal lWidth = metrics.width(text);
lastDrawnTextBoundingRect = metrics.boundingRect(QRectF(), textAlign, text); lastDrawnTextBoundingRect = metrics.boundingRect(QRectF(), textAlign, text);
/*lastDrawnTextBoundingRect = QRectF(curX, curY, metrics.width(text), curHeight);*/
QString log = QString().sprintf(" at rect %f, %f, %f, %f. Bounding rect is %f, %f, %f, %f", 0.0, curY, width, height - curY, lastDrawnTextBoundingRect.x(), lastDrawnTextBoundingRect.y(), lastDrawnTextBoundingRect.width(), lastDrawnTextBoundingRect.height()); QString log = QString().sprintf(" at rect %f, %f, %f, %f. Bounding rect is %f, %f, %f, %f", 0.0, curY, width, height - curY, lastDrawnTextBoundingRect.x(), lastDrawnTextBoundingRect.y(), lastDrawnTextBoundingRect.width(), lastDrawnTextBoundingRect.height());
qWarning() << "Text " << text << log; qWarning() << "Text " << text << log;
textFonts.append(textFont); textFonts.append(textFont);

Loading…
Cancel
Save