# HG changeset patch # User insilmaril # Date 1177516974 0 # Node ID a551ed6005cc11235ab394ef968ef2424b4aab84 # Parent 0f8879937035d3c587470e968fc6cb51910d870f started doxygen documentation diff -r 0f8879937035 -r a551ed6005cc ornamentedobj.cpp --- a/ornamentedobj.cpp Wed Apr 25 16:02:54 2007 +0000 +++ b/ornamentedobj.cpp Wed Apr 25 16:02:54 2007 +0000 @@ -106,18 +106,23 @@ return heading->getColor(); } -FrameType OrnamentedObj::getFrameType() +FrameObj::FrameType OrnamentedObj::getFrameType() { return frame->getFrameType(); } -void OrnamentedObj::setFrameType(const FrameType &t) +QString OrnamentedObj::getFrameTypeName() +{ + return frame->getFrameTypeName(); +} + +void OrnamentedObj::setFrameType(const FrameObj::FrameType &t) { frame->setFrameType(t); - if (t == NoFrame) - linkpos=LinkBottom; + if (t == FrameObj::NoFrame) + linkpos=LinkableMapObj::Bottom; else - linkpos=LinkMiddle; + linkpos=LinkableMapObj::Middle; calcBBoxSize(); positionBBox(); @@ -127,16 +132,42 @@ void OrnamentedObj::setFrameType(const QString &t) { frame->setFrameType(t); - if (frame->getFrameType() == NoFrame) - linkpos=LinkBottom; + if (frame->getFrameType() == FrameObj::NoFrame) + linkpos=LinkableMapObj::Bottom; else - linkpos=LinkMiddle; + linkpos=LinkableMapObj::Middle; calcBBoxSize(); positionBBox(); requestReposition(); } +void OrnamentedObj::setFramePadding (const int &i) +{ + frame->setPadding (i); + calcBBoxSize(); + positionBBox(); + requestReposition(); +} + +int OrnamentedObj::getFramePadding () +{ + return frame->getPadding(); +} + +void OrnamentedObj::setFrameBorderWidth (const int &i) +{ + frame->setBorderWidth(i); + calcBBoxSize(); + positionBBox(); + requestReposition(); +} + +int OrnamentedObj::getFrameBorderWidth() +{ + return frame->getBorderWidth(); +} + void OrnamentedObj::setFramePenColor(QColor col) { frame->setPenColor (col); @@ -159,7 +190,7 @@ void OrnamentedObj::positionContents() { - double d=frame->getBorder()/2; + double d=frame->getPadding()/2; double x=absPos.x(); double y=absPos.y(); diff -r 0f8879937035 -r a551ed6005cc ornamentedobj.h --- a/ornamentedobj.h Wed Apr 25 16:02:54 2007 +0000 +++ b/ornamentedobj.h Wed Apr 25 16:02:54 2007 +0000 @@ -4,6 +4,19 @@ #include "frameobj.h" #include "linkablemapobj.h" +/*! \brief Adds various ornaments to the class LinkableMapObj + +The ornaments are: + - frame + - note + - references + - URL + -vymLink + - flags + - standard flags + - system flags + */ + class OrnamentedObj:public LinkableMapObj { public: OrnamentedObj (); @@ -13,14 +26,19 @@ virtual void init (); virtual void copy (OrnamentedObj*); - virtual QString getHeading(); // returns the heading + virtual QString getHeading(); //!< returns the heading virtual void setLinkColor(); // sets color according to colorhint, overloaded virtual void setColor(QColor); // set the color of text and link QColor getColor (); // get color of heading - virtual FrameType getFrameType (); - virtual void setFrameType (const FrameType &); + virtual FrameObj::FrameType getFrameType (); + virtual QString getFrameTypeName (); + virtual void setFrameType (const FrameObj::FrameType &); virtual void setFrameType (const QString &); + virtual void setFramePadding (const int &); + virtual int getFramePadding (); + virtual void setFrameBorderWidth(const int &); + virtual int getFrameBorderWidth (); virtual void setFramePenColor (QColor); virtual QColor getFramePenColor (); virtual void setFrameBrushColor (QColor);