r18032 by craig - Rename pageitem's X/YPos and LocalX/Y to m_xPos/m_yPos and m_imageXOffset/m_imageYOffset, being testing new doxygen single line comment options
scribus-commit
scribus-commit at lists.scribus.net
Tue Jan 1 12:40:56 UTC 2013
Author: craig
Date: Tue Jan 1 12:40:56 2013
New Revision: 18032
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18032
Log:
Rename pageitem's X/YPos and LocalX/Y to m_xPos/m_yPos and m_imageXOffset/m_imageYOffset, being testing new doxygen single line comment options
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/pageitem_imageframe.cpp
trunk/Scribus/scribus/pageitem_latexframe.cpp
trunk/Scribus/scribus/pageitem_line.cpp
trunk/Scribus/scribus/pageitem_noteframe.cpp
trunk/Scribus/scribus/pageitem_textframe.cpp
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Jan 1 12:40:56 2013
@@ -260,16 +260,16 @@
GrColorP2QColor(other.GrColorP2QColor),
GrColorP3QColor(other.GrColorP3QColor),
GrColorP4QColor(other.GrColorP4QColor),
- Xpos(other.Xpos),
- Ypos(other.Ypos),
+ m_xPos(other.m_xPos),
+ m_yPos(other.m_yPos),
Width(other.Width),
Height(other.Height),
m_rotation(other.m_rotation),
m_isSelected(other.m_isSelected),
m_imageXScale(other.m_imageXScale),
m_imageYScale(other.m_imageYScale),
- LocalX(other.LocalX),
- LocalY(other.LocalY),
+ m_imageXOffset(other.m_imageXOffset),
+ m_imageYOffset(other.m_imageYOffset),
m_imageRotation(other.m_imageRotation),
m_isReversed(other.m_isReversed),
m_startArrowIndex(other.m_startArrowIndex),
@@ -394,8 +394,8 @@
QString tmp;
BackBox = 0;
NextBox = 0;
- gXpos = oldXpos = Xpos = x;
- gYpos = oldYpos = Ypos = y;
+ gXpos = oldXpos = m_xPos = x;
+ gYpos = oldYpos = m_yPos = y;
//CB Surely we can remove some of these?
OldB2 = OldB = oldWidth = Width = w;
OldH2 = OldH = oldHeight = Height = h;
@@ -490,8 +490,8 @@
oldLocalScY = m_imageYScale = 1;
OrigW = 0;
OrigH = 0;
- oldLocalX = LocalX = 0;
- oldLocalY = LocalY = 0;
+ oldLocalX = m_imageXOffset = 0;
+ oldLocalY = m_imageYOffset = 0;
m_imageRotation = 0;
BBoxX = 0;
BBoxH = 0;
@@ -854,7 +854,7 @@
void PageItem::setXPos(const double newXPos, bool drawingOnly)
{
- Xpos = newXPos;
+ m_xPos = newXPos;
if (drawingOnly || m_Doc->isLoading())
return;
checkChanges();
@@ -862,7 +862,7 @@
void PageItem::setYPos(const double newYPos, bool drawingOnly)
{
- Ypos = newYPos;
+ m_yPos = newYPos;
if (drawingOnly || m_Doc->isLoading())
return;
checkChanges();
@@ -870,8 +870,8 @@
void PageItem::setXYPos(const double newXPos, const double newYPos, bool drawingOnly)
{
- Xpos = newXPos;
- Ypos = newYPos;
+ m_xPos = newXPos;
+ m_yPos = newYPos;
if (drawingOnly || m_Doc->isLoading())
return;
checkChanges();
@@ -898,12 +898,12 @@
invalid = true;
if (dX!=0.0)
{
- Xpos+=dX;
+ m_xPos+=dX;
gXpos+=dX;
}
if (dY!=0.0)
{
- Ypos+=dY;
+ m_yPos+=dY;
gYpos+=dY;
}
if (drawingOnly || m_Doc->isLoading())
@@ -1017,7 +1017,7 @@
void PageItem::setImageXOffset(const double newImageXOffset)
{
- LocalX=newImageXOffset;
+ m_imageXOffset=newImageXOffset;
if (m_Doc->isLoading())
return;
checkChanges();
@@ -1025,7 +1025,7 @@
void PageItem::setImageYOffset(const double newImageYOffset)
{
- LocalY=newImageYOffset;
+ m_imageYOffset=newImageYOffset;
if (m_Doc->isLoading())
return;
checkChanges();
@@ -1033,8 +1033,8 @@
void PageItem::setImageXYOffset(const double newImageXOffset, const double newImageYOffset)
{
- LocalX=newImageXOffset;
- LocalY=newImageYOffset;
+ m_imageXOffset=newImageXOffset;
+ m_imageYOffset=newImageYOffset;
if (m_Doc->isLoading())
return;
checkChanges();
@@ -1045,9 +1045,9 @@
if (dX==0.0 && dY==0.0)
return;
if (dX != 0.0)
- LocalX += dX;
+ m_imageXOffset += dX;
if (dY != 0.0)
- LocalY += dY;
+ m_imageYOffset += dY;
if (m_Doc->isLoading())
return;
checkChanges();
@@ -1626,7 +1626,7 @@
{
p->save();
if (!isEmbedded)
- p->translate(Xpos, Ypos);
+ p->translate(m_xPos, m_yPos);
p->rotate(m_rotation);
if (m_Doc->layerOutline(LayerID))
{
@@ -1973,7 +1973,7 @@
{
p->save();
if (!isEmbedded)
- p->translate(Xpos, Ypos);
+ p->translate(m_xPos, m_yPos);
p->rotate(m_rotation);
if ((!isEmbedded) && (!m_Doc->RePos))
{
@@ -2095,13 +2095,13 @@
p->save();
double x = embedded->xPos();
double y = embedded->yPos();
- embedded->Xpos = embedded->gXpos;
- embedded->Ypos = (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos;
+ embedded->m_xPos = embedded->gXpos;
+ embedded->m_yPos = (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos;
p->translate((embedded->gXpos * (style.scaleH() / 1000.0)), ( - (embedded->gHeight * (style.scaleV() / 1000.0)) + embedded->gYpos * (style.scaleV() / 1000.0)));
if (style.baselineOffset() != 0)
{
p->translate(0, -embedded->gHeight * (style.baselineOffset() / 1000.0));
- embedded->Ypos -= embedded->gHeight * (style.baselineOffset() / 1000.0);
+ embedded->m_yPos -= embedded->gHeight * (style.baselineOffset() / 1000.0);
}
p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
embedded->Dirty = Dirty;
@@ -2134,8 +2134,8 @@
}
embedded->m_lineWidth = pws * qMin(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
embedded->DrawObj_Post(p);
- embedded->Xpos = x;
- embedded->Ypos = y;
+ embedded->m_xPos = x;
+ embedded->m_yPos = y;
p->restore();
embedded->m_lineWidth = pws;
}
@@ -3407,8 +3407,8 @@
}
QList<QList<meshPoint> > meshGradientArrayOld = meshGradientArray;
PoLine = Coords.copy();
- double oldX = Xpos;
- double oldY = Ypos;
+ double oldX = m_xPos;
+ double oldY = m_yPos;
ClipEdited = true;
FrameType = 3;
FPoint wh = getMaxClipF(&PoLine);
@@ -3418,8 +3418,8 @@
OldH2 = height();
updateClip();
meshGradientArray = meshGradientArrayOld;
- double dx = oldX - Xpos;
- double dy = oldY - Ypos;
+ double dx = oldX - m_xPos;
+ double dy = oldY - m_yPos;
for (int x = 0; x < rows+1; x++)
for (int y = 0; y < cols+1; y++)
meshGradientArray[x][y].moveRel(dx, dy);
@@ -4331,8 +4331,8 @@
{
//if switching from free scaling to frame size
//in undo must be offset and scale saved
- ss->set("OLD_IMAGEXOFFSET", LocalX);
- ss->set("OLD_IMAGEYOFFSET", LocalY);
+ ss->set("OLD_IMAGEXOFFSET", m_imageXOffset);
+ ss->set("OLD_IMAGEYOFFSET", m_imageYOffset);
ss->set("OLD_IMAGEXSCALE", m_imageXScale);
ss->set("OLD_IMAGEYSCALE", m_imageYScale);
}
@@ -4607,13 +4607,13 @@
spreadChanges = (textFlowMode() != TextFlowDisabled );
}
// has the item been moved
- if (force || ((oldXpos != Xpos || oldYpos != Ypos) && shouldCheck()))
+ if (force || ((oldXpos != m_xPos || oldYpos != m_yPos) && shouldCheck()))
{
moveUndoAction();
spreadChanges = (textFlowMode() != TextFlowDisabled );
}
// has the item's image been moved
- if (force || ((oldLocalX != LocalX || oldLocalY != LocalY) && shouldCheck()))
+ if (force || ((oldLocalX != m_imageXOffset || oldLocalY != m_imageYOffset) && shouldCheck()))
changeImageOffsetUndoAction();
// has the item's image been scaled
if (force || ((oldLocalScX != m_imageXScale || oldLocalScY != m_imageYScale) && shouldCheck()))
@@ -4634,7 +4634,7 @@
void PageItem::moveUndoAction()
{
- if (oldXpos == Xpos && oldYpos == Ypos)
+ if (oldXpos == m_xPos && oldYpos == m_yPos)
return;
if (UndoManager::undoEnabled())
{
@@ -4650,15 +4650,15 @@
newp = QString(Um::PageNmbr).arg(m_Doc->FirstPnum + OwnPage);
SimpleState *ss = new SimpleState(Um::Move,
QString(Um::MoveFromTo).arg(oldXpos).arg(oldYpos).arg(oldp).
- arg(Xpos).arg(Ypos).arg(newp), Um::IMove);
+ arg(m_xPos).arg(m_yPos).arg(newp), Um::IMove);
ss->set("OLD_XPOS", oldXpos);
ss->set("OLD_YPOS", oldYpos);
- ss->set("NEW_XPOS", Xpos);
- ss->set("NEW_YPOS", Ypos);
+ ss->set("NEW_XPOS", m_xPos);
+ ss->set("NEW_YPOS", m_yPos);
undoManager->action(this, ss);
}
- oldXpos = Xpos;
- oldYpos = Ypos;
+ oldXpos = m_xPos;
+ oldYpos = m_yPos;
oldOwnPage = OwnPage;
}
@@ -4691,8 +4691,8 @@
{
ss->set("OLD_RXPOS", oldXpos);
ss->set("OLD_RYPOS", oldYpos);
- ss->set("NEW_RXPOS", Xpos);
- ss->set("NEW_RYPOS", Ypos);
+ ss->set("NEW_RXPOS", m_xPos);
+ ss->set("NEW_RYPOS", m_yPos);
}
ss->set("OLD_RROT", oldRot);
ss->set("NEW_RROT", m_rotation);
@@ -4704,8 +4704,8 @@
oldHeight = Height;
if (!isNoteFrame() || !asNoteFrame()->isAutoWelded())
{
- oldXpos = Xpos;
- oldYpos = Ypos;
+ oldXpos = m_xPos;
+ oldYpos = m_yPos;
}
oldOwnPage = OwnPage;
oldRot = m_rotation;
@@ -4726,8 +4726,8 @@
{
ss->set("OLD_RXPOS", oldXpos);
ss->set("OLD_RYPOS", oldYpos);
- ss->set("NEW_RXPOS", Xpos);
- ss->set("NEW_RYPOS", Ypos);
+ ss->set("NEW_RXPOS", m_xPos);
+ ss->set("NEW_RYPOS", m_yPos);
}
if (!isNoteFrame() || !asNoteFrame()->isAutoHeight())
{
@@ -4742,8 +4742,8 @@
undoManager->action(this, ss);
}
oldRot = m_rotation;
- oldXpos = Xpos;
- oldYpos = Ypos;
+ oldXpos = m_xPos;
+ oldYpos = m_yPos;
oldOwnPage = OwnPage;
oldWidth = Width;
oldHeight = Height;
@@ -4751,21 +4751,21 @@
void PageItem::changeImageOffsetUndoAction()
{
- if (oldLocalX == LocalX && oldLocalY == LocalY)
+ if (oldLocalX == m_imageXOffset && oldLocalY == m_imageYOffset)
return;
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::ImageOffset,
- QString(Um::ImageOffsetFromTo).arg(oldLocalX).arg(oldLocalY).arg(LocalX).arg(LocalY), Um::IMove);
+ QString(Um::ImageOffsetFromTo).arg(oldLocalX).arg(oldLocalY).arg(m_imageXOffset).arg(m_imageYOffset), Um::IMove);
ss->set("IMAGE_OFFSET", "image_offset");
ss->set("OLD_IMAGEXOFFSET", oldLocalX);
ss->set("OLD_IMAGEYOFFSET", oldLocalY);
- ss->set("NEW_IMAGEXOFFSET", LocalX);
- ss->set("NEW_IMAGEYOFFSET", LocalY);
+ ss->set("NEW_IMAGEXOFFSET", m_imageXOffset);
+ ss->set("NEW_IMAGEYOFFSET", m_imageYOffset);
undoManager->action(this, ss);
}
- oldLocalX = LocalX;
- oldLocalY = LocalY;
+ oldLocalX = m_imageXOffset;
+ oldLocalY = m_imageYOffset;
}
void PageItem::changeImageScaleUndoAction()
@@ -6444,8 +6444,8 @@
my = -my;
}
m_Doc->MoveItem(mx, my, this, false);
- oldXpos = Xpos;
- oldYpos = Ypos;
+ oldXpos = m_xPos;
+ oldYpos = m_yPos;
oldOwnPage = OwnPage;
}
@@ -6481,8 +6481,8 @@
}
oldWidth = Width;
oldHeight = Height;
- oldXpos = Xpos;
- oldYpos = Ypos;
+ oldXpos = m_xPos;
+ oldYpos = m_yPos;
oldOwnPage = OwnPage;
oldRot = m_rotation;
}
@@ -6504,18 +6504,18 @@
if (isUndo)
{
m_Doc->RotateItem(ort, this);
- m_Doc->MoveItem(ox - Xpos, oy - Ypos, this, false);
+ m_Doc->MoveItem(ox - m_xPos, oy - m_yPos, this, false);
m_Doc->SizeItem(ow, oh, this, false, true, redraw);
}
else
{
m_Doc->RotateItem(rt, this);
- m_Doc->MoveItem(x - Xpos, y - Ypos, this, false);
+ m_Doc->MoveItem(x - m_xPos, y - m_yPos, this, false);
m_Doc->SizeItem(w, h, this, false, true, redraw);
}
oldRot = m_rotation;
- oldXpos = Xpos;
- oldYpos = Ypos;
+ oldXpos = m_xPos;
+ oldYpos = m_yPos;
oldOwnPage = OwnPage;
oldWidth = Width;
oldHeight = Height;
@@ -6739,8 +6739,8 @@
}
else
{
- state->set("OLD_IMAGEXOFFSET", LocalX);
- state->set("OLD_IMAGEYOFFSET", LocalY);
+ state->set("OLD_IMAGEXOFFSET", m_imageXOffset);
+ state->set("OLD_IMAGEYOFFSET", m_imageYOffset);
state->set("OLD_IMAGEXSCALE", m_imageXScale);
state->set("OLD_IMAGEYSCALE", m_imageYScale);
}
@@ -8350,7 +8350,7 @@
void PageItem::getTransform(QTransform& mat) const
{
- mat.translate(Xpos, Ypos);
+ mat.translate(m_xPos, m_yPos);
mat.rotate(m_rotation);
}
@@ -8418,7 +8418,7 @@
}
else
{
- result.translate(Xpos, Ypos);
+ result.translate(m_xPos, m_yPos);
result.rotate(m_rotation);
}
return result;
@@ -8458,10 +8458,10 @@
{
FPointArray pb;
pb.resize(0);
- pb.addPoint(FPoint(Xpos, Ypos));
- pb.addPoint(FPoint(Width, 0.0, Xpos, Ypos, m_rotation, 1.0, 1.0));
- pb.addPoint(FPoint(Width, Height, Xpos, Ypos, m_rotation, 1.0, 1.0));
- pb.addPoint(FPoint( 0.0, Height, Xpos, Ypos, m_rotation, 1.0, 1.0));
+ pb.addPoint(FPoint(m_xPos, m_yPos));
+ pb.addPoint(FPoint(Width, 0.0, m_xPos, m_yPos, m_rotation, 1.0, 1.0));
+ pb.addPoint(FPoint(Width, Height, m_xPos, m_yPos, m_rotation, 1.0, 1.0));
+ pb.addPoint(FPoint( 0.0, Height, m_xPos, m_yPos, m_rotation, 1.0, 1.0));
for (uint pc = 0; pc < 4; ++pc)
{
minx = qMin(minx, pb.point(pc).x());
@@ -8476,17 +8476,17 @@
}
else
{
- *x1 = Xpos;
- *y1 = Ypos;
- *x2 = Xpos + qMax(1.0, qMax(Width, m_lineWidth));
- *y2 = Ypos + qMax(1.0, qMax(Height, m_lineWidth));
+ *x1 = m_xPos;
+ *y1 = m_yPos;
+ *x2 = m_xPos + qMax(1.0, qMax(Width, m_lineWidth));
+ *y2 = m_yPos + qMax(1.0, qMax(Height, m_lineWidth));
}
QRectF totalRect = QRectF(QPointF(*x1, *y1), QPointF(*x2, *y2));
if (m_startArrowIndex != 0)
{
QTransform arrowTrans;
FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
- arrowTrans.translate(Xpos, Ypos);
+ arrowTrans.translate(m_xPos, m_yPos);
arrowTrans.rotate(m_rotation);
if (itemType() == Line)
{
@@ -8541,7 +8541,7 @@
{
QTransform arrowTrans;
FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
- arrowTrans.translate(Xpos, Ypos);
+ arrowTrans.translate(m_xPos, m_yPos);
arrowTrans.rotate(m_rotation);
if (itemType() == Line)
{
@@ -8660,7 +8660,7 @@
{
QTransform arrowTrans;
FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
- arrowTrans.translate(Xpos, Ypos);
+ arrowTrans.translate(m_xPos, m_yPos);
arrowTrans.rotate(m_rotation);
if (itemType() == Line)
{
@@ -8715,7 +8715,7 @@
{
QTransform arrowTrans;
FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
- arrowTrans.translate(Xpos, Ypos);
+ arrowTrans.translate(m_xPos, m_yPos);
arrowTrans.rotate(m_rotation);
if (itemType() == Line)
{
@@ -8768,7 +8768,7 @@
if (isPathText())
{
QTransform clipTrans;
- clipTrans.translate(Xpos, Ypos);
+ clipTrans.translate(m_xPos, m_yPos);
clipTrans.rotate(m_rotation);
totalRect = totalRect.united(QRectF(clipTrans.mapRect(Clip.boundingRect())));
}
@@ -8804,8 +8804,8 @@
}
}
if (isPathText())
- return qMin(Xpos + QRectF(Clip.boundingRect()).x(), Xpos - extraSpace);
- return Xpos - extraSpace;
+ return qMin(m_xPos + QRectF(Clip.boundingRect()).x(), m_xPos - extraSpace);
+ return m_xPos - extraSpace;
}
double PageItem::visualYPos() const
@@ -8834,8 +8834,8 @@
extraSpace = sl.Width / 2.0;
}
if (isPathText())
- return qMin(Ypos + QRectF(Clip.boundingRect()).y(), Ypos - extraSpace);
- return Ypos - extraSpace;
+ return qMin(m_yPos + QRectF(Clip.boundingRect()).y(), m_yPos - extraSpace);
+ return m_yPos - extraSpace;
}
double PageItem::visualWidth() const
@@ -8943,7 +8943,7 @@
{
QTransform p;
QRectF transRect;
- p.translate(Xpos * scale, Ypos*scale);
+ p.translate(m_xPos*scale, m_yPos*scale);
p.scale(scale, scale);
p.rotate(rotation());
transRect = p.mapRect(QRectF(0.0, 0.0, width(), height()));
@@ -9033,8 +9033,8 @@
{
oldLocalScX = m_imageXScale = 72.0 / xres;
oldLocalScY = m_imageYScale = 72.0 / yres;
- oldLocalX = LocalX = 0;
- oldLocalY = LocalY = 0;
+ oldLocalX = m_imageXOffset = 0;
+ oldLocalY = m_imageYOffset = 0;
if ((m_Doc->itemToolPrefs().imageUseEmbeddedPath) && (!pixm.imgInfo.clipPath.isEmpty()))
{
pixm.imgInfo.usedPath = pixm.imgInfo.clipPath;
@@ -9044,7 +9044,7 @@
imageClip = pixm.imgInfo.PDSpathData[clPath].copy();
pixm.imgInfo.usedPath = clPath;
QTransform cl;
- cl.translate(LocalX*m_imageXScale, LocalY*m_imageYScale);
+ cl.translate(m_imageXOffset*m_imageXScale, m_imageYOffset*m_imageYScale);
cl.scale(m_imageXScale, m_imageYScale);
imageClip.map(cl);
}
@@ -9057,7 +9057,7 @@
imageClip = pixm.imgInfo.PDSpathData[clPath].copy();
pixm.imgInfo.usedPath = clPath;
QTransform cl;
- cl.translate(LocalX*m_imageXScale, LocalY*m_imageYScale);
+ cl.translate(m_imageXOffset*m_imageXScale, m_imageYOffset*m_imageYScale);
cl.scale(m_imageXScale, m_imageYScale);
imageClip.map(cl);
}
@@ -9418,8 +9418,8 @@
wL = mm.map(wL);
xs = wL.length() / static_cast<double>(OrigW);
ys = hL.length() / static_cast<double>(OrigH);
- LocalX = -br.x();
- LocalY = -br.y();
+ m_imageXOffset = -br.x();
+ m_imageYOffset = -br.y();
}
if (AspectRatio)
{
@@ -9459,7 +9459,7 @@
{
imageClip = pixm.imgInfo.PDSpathData[pixm.imgInfo.usedPath].copy();
QTransform cl;
- cl.translate(LocalX*m_imageXScale, LocalY*m_imageYScale);
+ cl.translate(m_imageXOffset*m_imageXScale, m_imageYOffset*m_imageYScale);
cl.scale(m_imageXScale, m_imageYScale);
imageClip.map(cl);
}
Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Tue Jan 1 12:40:56 2013
@@ -272,10 +272,7 @@
QRect getRedrawBounding(const double);
void setRedrawBounding();
- /**
- * @brief Update the gradient vectors, moved from the View
- */
- void updateGradientVectors();
+ void updateGradientVectors(); //!< Update the gradient vectors, moved from the View
/**
* @brief Move the image within the frame
* Old ScribusView::MoveItemI
@@ -371,12 +368,10 @@
int firstInFrame() const;
/// returns index of last char displayed in this frame, used to be MaxChars-1
int lastInFrame() const;
- /// tests if a character is displayed by this frame
- bool frameDisplays(int textpos) const;
- /// returns the style at the current charpos
- const ParagraphStyle& currentStyle() const;
- /// returns the style at the current charpos
- ParagraphStyle& changeCurrentStyle();
+
+ bool frameDisplays(int textpos) const; ///< tests if a character is displayed by this fram
+ const ParagraphStyle& currentStyle() const; ///< returns the style at the current charpos
+ ParagraphStyle& changeCurrentStyle(); ///< returns the style at the current charpos
/// returns the style at the current charpos
const CharStyle& currentCharStyle() const;
/// Return current text properties (current char + paragraph properties)
@@ -393,7 +388,7 @@
double gYpos;
double gWidth;
double gHeight;
- int GrType; // used values 6 = linear, 7 = radial, 8 = pattern, 9 = 4 color gradient, 10 = diamond, 11 = mesh gradient
+ int GrType; ///< used values 6 = linear, 7 = radial, 8 = pattern, 9 = 4 color gradient, 10 = diamond, 11 = mesh gradient
double GrStartX;
double GrStartY;
double GrEndX;
@@ -623,11 +618,11 @@
int inlineCharID;
//Position
- double xPos() const { return Xpos; }
- double yPos() const { return Ypos; }
+ double xPos() const { return m_xPos; }
+ double yPos() const { return m_yPos; }
double visualXPos() const;
double visualYPos() const;
- FPoint xyPos() const { return FPoint(Xpos, Ypos); }
+ FPoint xyPos() const { return FPoint(m_xPos, m_yPos); }
void setXPos(const double, bool drawingOnly=false);
void setYPos(const double, bool drawingOnly=false);
void setXYPos(const double, const double, bool drawingOnly=false);
@@ -657,8 +652,8 @@
void setImageXScale(const double);
void setImageYScale(const double);
void setImageXYScale(const double, const double);
- double imageXOffset() const { return LocalX; }
- double imageYOffset() const { return LocalY; }
+ double imageXOffset() const { return m_imageXOffset; }
+ double imageYOffset() const { return m_imageYOffset; }
void setImageXOffset(const double);
void setImageYOffset(const double);
void moveImageXYOffsetBy(const double, const double);
@@ -1629,9 +1624,9 @@
QColor GrColorP4QColor;
/** X position on the page */
- double Xpos;
+ double m_xPos;
/** Y position on the page */
- double Ypos;
+ double m_yPos;
/** Width of the item */
double Width;
/** Height of the item */
@@ -1645,9 +1640,9 @@
/** Scaling Y Factor for images*/
double m_imageYScale;
/** Image X Offset to frame */
- double LocalX;
+ double m_imageXOffset;
/** Image Y Offset to frame */
- double LocalY;
+ double m_imageYOffset;
/** Image rotation in frame */
double m_imageRotation;
/** If the frame is reversed */
Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Tue Jan 1 12:40:56 2013
@@ -155,7 +155,7 @@
p->setupPolygon(&imageClip);
p->setClipPath();
}
- p->translate(LocalX*m_imageXScale, LocalY*m_imageYScale);
+ p->translate(m_imageXOffset*m_imageXScale, m_imageYOffset*m_imageYScale);
p->rotate(m_imageRotation);
double mscalex = 1.0 / m_imageXScale;
double mscaley = 1.0 / m_imageYScale;
@@ -236,8 +236,8 @@
m_imageYScale = 1;
OrigW = 0;
OrigH = 0;
- LocalX = 0;
- LocalY = 0;
+ m_imageXOffset = 0;
+ m_imageYOffset = 0;
setImageFlippedH(false);
setImageFlippedV(false);
EmProfile = "";
Modified: trunk/Scribus/scribus/pageitem_latexframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem_latexframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_latexframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_latexframe.cpp Tue Jan 1 12:40:56 2013
@@ -201,8 +201,8 @@
}
double scaleX = m_imageXScale * xres;
double scaleY = m_imageYScale * yres;
- double offX = LocalX / xres;
- double offY = LocalY / yres;
+ double offX = m_imageXOffset / xres;
+ double offY = m_imageYOffset / yres;
PageItem_ImageFrame::loadImage(imageFile, true, realDpi());
if (PrefsManager::instance()->latexForceDpi())
{
@@ -212,8 +212,8 @@
//Restore parameters, account for dpi changes
m_imageXScale = scaleX / pixm.imgInfo.xres;
m_imageYScale = scaleY / pixm.imgInfo.yres;
- LocalX = offX * pixm.imgInfo.xres;
- LocalY = offY * pixm.imgInfo.yres;
+ m_imageXOffset = offX * pixm.imgInfo.xres;
+ m_imageYOffset = offY * pixm.imgInfo.yres;
//emit imageOffsetScale(LocalScX, LocalScY, LocalX, LocalY);
update();
}
@@ -338,10 +338,10 @@
double lDpi = realDpi()/72.0;
scaleX = m_imageXScale*lDpi;
scaleY = m_imageYScale*lDpi;
- offsetX = LocalX*m_imageXScale;
- offsetY = LocalY*m_imageYScale;
- realW = Width/scaleX - LocalX/lDpi;
- realH = Height/scaleY - LocalY/lDpi;
+ offsetX = m_imageXOffset*m_imageXScale;
+ offsetY = m_imageYOffset*m_imageYScale;
+ realW = Width/scaleX - m_imageXOffset/lDpi;
+ realH = Height/scaleY - m_imageYOffset/lDpi;
if (!tmp.contains("$scribus_noprepost$") && m_usePreamble) {
tmp = config->preamble() + tmp + config->postamble();
}
Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp (original)
+++ trunk/Scribus/scribus/pageitem_line.cpp Tue Jan 1 12:40:56 2013
@@ -160,13 +160,13 @@
QPointF PageItem_Line::startPoint()
{
- return QPointF(Xpos, Ypos);
+ return QPointF(m_xPos, m_yPos);
}
QPointF PageItem_Line::endPoint()
{
double rot = this->rotation();
- double x = Xpos + Width * cos(rot * M_PI / 180.0);
- double y = Ypos + Width * sin(rot * M_PI / 180.0);
+ double x = m_xPos + Width * cos(rot * M_PI / 180.0);
+ double y = m_yPos + Width * sin(rot * M_PI / 180.0);
return QPointF(x, y);
-}
+}
Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp Tue Jan 1 12:40:56 2013
@@ -102,8 +102,8 @@
Height = oldHeight = frameHeight;
oldWidth = Width;
oldRot = m_rotation;
- oldXpos = Xpos;
- Ypos = oldYpos =m_masterFrame->yPos() + m_masterFrame->height();
+ oldXpos = m_xPos;
+ m_yPos = oldYpos =m_masterFrame->yPos() + m_masterFrame->height();
textFlowModeVal = TextFlowUsesFrameShape;
setColumns(1);
@@ -206,7 +206,7 @@
if (frameOverflows())
{
//increase height while text don`t fit in frame
- double maxH = m_Doc->currentPage()->height() - Xpos;
+ double maxH = m_Doc->currentPage()->height() - m_xPos;
while (frameOverflows())
{
oldHeight = Height += 8;
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18032&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Tue Jan 1 12:40:56 2013
@@ -190,7 +190,7 @@
if (Parent != NULL)
canvasToLocalMat.translate(gXpos, gYpos);
else
- canvasToLocalMat.translate(Xpos, Ypos);
+ canvasToLocalMat.translate(m_xPos, m_yPos);
canvasToLocalMat.rotate(m_rotation);
canvasToLocalMat = canvasToLocalMat.inverted(&invertible);
@@ -1940,9 +1940,9 @@
{
if (current.yPos <= lastLineY)
current.yPos = lastLineY +1;
- double by = Ypos;
+ double by = m_yPos;
if (OwnPage != -1)
- by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
+ by = m_yPos - m_Doc->Pages->at(OwnPage)->yOffset();
int ol1 = qRound((by + current.yPos - m_Doc->guidesPrefs().offsetBaselineGrid) * 10000.0);
int ol2 = static_cast<int>(ol1 / m_Doc->guidesPrefs().valueBaselineGrid);
current.yPos = ceil( ol2 / 10000.0 ) * m_Doc->guidesPrefs().valueBaselineGrid + m_Doc->guidesPrefs().offsetBaselineGrid - by;
@@ -1967,9 +1967,9 @@
if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing)
{
current.yPos += m_Doc->guidesPrefs().valueBaselineGrid;
- double by = Ypos;
+ double by = m_yPos;
if (OwnPage != -1)
- by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
+ by = m_yPos - m_Doc->Pages->at(OwnPage)->yOffset();
int ol1 = qRound((by + current.yPos - m_Doc->guidesPrefs().offsetBaselineGrid) * 10000.0);
int ol2 = static_cast<int>(ol1 / m_Doc->guidesPrefs().valueBaselineGrid);
current.yPos = ceil( ol2 / 10000.0 ) * m_Doc->guidesPrefs().valueBaselineGrid + m_Doc->guidesPrefs().offsetBaselineGrid - by;
@@ -2071,9 +2071,9 @@
if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing || FlopBaseline)
{
current.yPos++;
- double by = Ypos;
+ double by = m_yPos;
if (OwnPage != -1)
- by = Ypos - m_Doc->Pages->at(OwnPage)->yOffset();
+ by = m_yPos - m_Doc->Pages->at(OwnPage)->yOffset();
int ol1 = qRound((by + current.yPos - m_Doc->guidesPrefs().offsetBaselineGrid) * 10000.0);
int ol2 = static_cast<int>(ol1 / m_Doc->guidesPrefs().valueBaselineGrid);
current.yPos = ceil( ol2 / 10000.0 ) * m_Doc->guidesPrefs().valueBaselineGrid + m_Doc->guidesPrefs().offsetBaselineGrid - by;
@@ -3095,7 +3095,7 @@
{
// e2 = QRect(qRound(cullingArea.x() / sc + m_Doc->minCanvasCoordinate.x()), qRound(cullingArea.y() / sc + m_Doc->minCanvasCoordinate.y()),
// qRound(cullingArea.width() / sc), qRound(cullingArea.height() / sc));
- pf2.translate(Xpos, Ypos);
+ pf2.translate(m_xPos, m_yPos);
}
pf2.rotate(m_rotation);
@@ -3221,7 +3221,7 @@
p->setupPolygon(&PoLine);
p->setClipPath();
p->scale(m_imageXScale, m_imageYScale);
- p->translate(LocalX*m_imageXScale, LocalY*m_imageYScale);
+ p->translate(m_imageXOffset*m_imageXScale, m_imageYOffset*m_imageYScale);
p->rotate(m_imageRotation);
if (pixm.width() > 0 && pixm.height() > 0)
p->drawImage(pixm.qImagePtr());
@@ -3858,7 +3858,7 @@
return;
p->save();
if (!isEmbedded)
- p->translate(Xpos, Ypos);
+ p->translate(m_xPos, m_yPos);
p->rotate(m_rotation);
if ((!isEmbedded) && (!m_Doc->RePos))
{
More information about the scribus-commit
mailing list