From 5b65f069ddb62ff4f28aad821b4f32ea5d631b3b Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 6 Jan 2017 02:51:44 -0500 Subject: [PATCH] Reconcile style differences between TextNode and ColorNode classes. --- glabels/ColorButton.cpp | 8 +++--- glabels/ColorNode.cpp | 52 +++++++++++++++++++--------------- glabels/ColorNode.h | 23 +++++++-------- glabels/ColorPaletteDialog.cpp | 10 +++---- glabels/TextNode.cpp | 24 ++++++++++++++-- glabels/TextNode.h | 10 ++++--- glabels/XmlLabelCreator.cpp | 14 ++++----- 7 files changed, 83 insertions(+), 58 deletions(-) diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp index c4ecee2..6525ccd 100644 --- a/glabels/ColorButton.cpp +++ b/glabels/ColorButton.cpp @@ -67,7 +67,7 @@ void ColorButton::setColorNode( ColorNode colorNode ) mColorNode = colorNode; - if ( colorNode.fieldFlag() ) + if ( colorNode.isField() ) { setIcon( QIcon() ); setText( QString("${%1}").arg( colorNode.key() ) ); @@ -86,7 +86,7 @@ void ColorButton::setColor( QColor color ) { mIsDefault = false; - mColorNode.setFieldFlag( false ); + mColorNode.setField( false ); mColorNode.setColor( color ); mColorNode.setKey( "" ); @@ -99,7 +99,7 @@ void ColorButton::setToDefault() { mIsDefault = true; - mColorNode.setFieldFlag( false ); + mColorNode.setField( false ); mColorNode.setColor( mDefaultColor ); mColorNode.setKey( "" ); @@ -158,7 +158,7 @@ void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault ) mColorNode = colorNode; mIsDefault = isDefault; - if ( colorNode.fieldFlag() ) + if ( colorNode.isField() ) { setIcon( QIcon() ); setText( QString("${%1}").arg( colorNode.key() ) ); diff --git a/glabels/ColorNode.cpp b/glabels/ColorNode.cpp index e25b9fc..c9288f2 100644 --- a/glabels/ColorNode.cpp +++ b/glabels/ColorNode.cpp @@ -1,6 +1,6 @@ /* ColorNode.cpp * - * Copyright (C) 2013-2016 Jim Evins + * Copyright (C) 2017 Jim Evins * * This file is part of gLabels-qt. * @@ -27,7 +27,7 @@ /// Default Constructor /// ColorNode::ColorNode() - : mFieldFlag(false), mColor(QColor::fromRgba(0x00000000)), mKey("") + : mIsField(false), mColor(QColor::fromRgba(0x00000000)), mKey("") { } @@ -35,8 +35,8 @@ ColorNode::ColorNode() /// /// Constructor From Data /// -ColorNode::ColorNode( bool fieldFlag, const QColor& color, const QString& key ) - : mFieldFlag(fieldFlag), mColor(color), mKey(key) +ColorNode::ColorNode( bool isField, const QColor& color, const QString& key ) + : mIsField(isField), mColor(color), mKey(key) { } @@ -44,8 +44,8 @@ ColorNode::ColorNode( bool fieldFlag, const QColor& color, const QString& key ) /// /// Constructor From Data /// -ColorNode::ColorNode( bool fieldFlag, uint32_t rgba, const QString& key ) - : mFieldFlag(fieldFlag), mKey(key) +ColorNode::ColorNode( bool isField, uint32_t rgba, const QString& key ) + : mIsField(isField), mKey(key) { mColor = QColor( (rgba >> 24) & 0xFF, (rgba >> 16) & 0xFF, @@ -58,7 +58,7 @@ ColorNode::ColorNode( bool fieldFlag, uint32_t rgba, const QString& key ) /// Constructor From Color /// ColorNode::ColorNode( const QColor& color ) - : mFieldFlag(false), mColor(color), mKey("") + : mIsField(false), mColor(color), mKey("") { } @@ -67,7 +67,7 @@ ColorNode::ColorNode( const QColor& color ) /// Constructor From Key /// ColorNode::ColorNode( const QString& key ) - : mFieldFlag(true), mColor(QColor::fromRgba(0x00000000)), mKey(key) + : mIsField(true), mColor(QColor::fromRgba(0x00000000)), mKey(key) { } @@ -77,9 +77,9 @@ ColorNode::ColorNode( const QString& key ) /// bool ColorNode::operator==( const ColorNode& cn ) { - return ( (mFieldFlag == cn.mFieldFlag) && - (mColor == cn.mColor) && - (mKey == cn.mKey) ); + return ( (mIsField == cn.mIsField) && + (mColor == cn.mColor) && + (mKey == cn.mKey) ); } @@ -88,34 +88,34 @@ bool ColorNode::operator==( const ColorNode& cn ) /// bool ColorNode::operator!=( const ColorNode& cn ) { - return ( (mFieldFlag != cn.mFieldFlag) || - (mColor != cn.mColor) || - (mKey != cn.mKey) ); + return ( (mIsField != cn.mIsField) || + (mColor != cn.mColor) || + (mKey != cn.mKey) ); } /// /// Field Flag Property Getter /// -bool ColorNode::fieldFlag( void ) const +bool ColorNode::isField() const { - return mFieldFlag; + return mIsField; } /// /// Field Flag Property Setter /// -void ColorNode::setFieldFlag( bool fieldFlag ) +void ColorNode::setField( bool isField ) { - mFieldFlag = fieldFlag; + mIsField = isField; } /// /// Color Property Getter /// -const QColor& ColorNode::color( void ) const +const QColor& ColorNode::color() const { return mColor; } @@ -133,7 +133,7 @@ void ColorNode::setColor( const QColor& color ) /// /// Key Property Getter /// -const QString& ColorNode::key( void ) const +const QString& ColorNode::key() const { return mKey; } @@ -148,7 +148,10 @@ void ColorNode::setKey( const QString& key ) } -uint32_t ColorNode::rgba( void ) const +/// +/// Get color encoded as an RGBA 32-bit number +/// +uint32_t ColorNode::rgba() const { uint32_t c = mColor.red() << 24 | @@ -159,10 +162,13 @@ uint32_t ColorNode::rgba( void ) const return c; } - + +/// +/// Get color, expand if necessary +/// QColor ColorNode::color( merge::Record* record ) const { - if ( mFieldFlag ) + if ( mIsField ) { if ( record == 0 ) { diff --git a/glabels/ColorNode.h b/glabels/ColorNode.h index ae34077..a1ac3aa 100644 --- a/glabels/ColorNode.h +++ b/glabels/ColorNode.h @@ -1,6 +1,6 @@ /* ColorNode.h * - * Copyright (C) 2013-2016 Jim Evins + * Copyright (C) 2017 Jim Evins * * This file is part of gLabels-qt. * @@ -23,7 +23,7 @@ #include #include -#include +#include #include "Merge/Record.h" @@ -39,9 +39,9 @@ struct ColorNode public: ColorNode(); - ColorNode( bool fieldFlag, const QColor& color, const QString& key ); + ColorNode( bool isField, const QColor& color, const QString& key ); - ColorNode( bool fieldFlag, uint32_t rgba, const QString& key ); + ColorNode( bool isField, uint32_t rgba, const QString& key ); ColorNode( const QColor& color ); @@ -64,30 +64,29 @@ public: // // Field Flag Property // - bool fieldFlag( void ) const; - void setFieldFlag( bool fieldFlag ); + bool isField() const; + void setField( bool isField ); // // Color Property // - const QColor& color( void ) const; + const QColor& color() const; void setColor( const QColor& color ); // // Key Property // - const QString& key( void ) const; + const QString& key() const; void setKey( const QString& key ); - ///////////////////////////////// - // Methods + // Misc. Methods ///////////////////////////////// public: - uint32_t rgba( void ) const; + uint32_t rgba() const; QColor color( merge::Record* record ) const; @@ -95,7 +94,7 @@ public: // Private Data ///////////////////////////////// private: - bool mFieldFlag; + bool mIsField; QColor mColor; QString mKey; diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp index 4a23003..fd10620 100644 --- a/glabels/ColorPaletteDialog.cpp +++ b/glabels/ColorPaletteDialog.cpp @@ -213,7 +213,7 @@ void ColorPaletteDialog::clearKeys() void ColorPaletteDialog::onDefaultItemActivated() { - mColorNode.setFieldFlag( false ); + mColorNode.setField( false ); mColorNode.setColor( mDefaultColor ); mColorNode.setKey( "" ); @@ -224,7 +224,7 @@ void ColorPaletteDialog::onDefaultItemActivated() void ColorPaletteDialog::onPaletteItemActivated( int id ) { - mColorNode.setFieldFlag( false ); + mColorNode.setField( false ); mColorNode.setColor( QColor( mColorTable[id].colorSpec ) ); mColorNode.setKey( "" ); @@ -235,7 +235,7 @@ void ColorPaletteDialog::onPaletteItemActivated( int id ) void ColorPaletteDialog::onHistoryItemActivated( int id ) { - mColorNode.setFieldFlag( false ); + mColorNode.setField( false ); mColorNode.setColor( mColorHistory->getColors()[id] ); mColorNode.setKey( "" ); @@ -253,7 +253,7 @@ void ColorPaletteDialog::onCustomColorItemActivated() { ColorNode newColorNode; - newColorNode.setFieldFlag( false ); + newColorNode.setField( false ); newColorNode.setColor( dlg.currentColor() ); newColorNode.setKey( "" ); @@ -300,7 +300,7 @@ void ColorPaletteDialog::onComboIndexChanged( int index ) { if ( index != 0 ) { - mColorNode.setFieldFlag( true ); + mColorNode.setField( true ); mColorNode.setColor( QColor("#eeeeec") ); mColorNode.setKey( mKeys[index-1] ); diff --git a/glabels/TextNode.cpp b/glabels/TextNode.cpp index 6787f93..6a43c6b 100644 --- a/glabels/TextNode.cpp +++ b/glabels/TextNode.cpp @@ -1,6 +1,6 @@ /* TextNode.cpp * - * Copyright (C) 2013 Jim Evins + * Copyright (C) 2017 Jim Evins * * This file is part of gLabels-qt. * @@ -62,21 +62,39 @@ bool TextNode::operator!=( const TextNode& other ) /// /// isField? Property Getter /// -bool TextNode::isField( void ) const +bool TextNode::isField() const { return mIsField; } +/// +/// isField Flag Property Setter +/// +void TextNode::setField( bool isField ) +{ + mIsField = isField; +} + + /// /// Data Property Getter /// -const QString& TextNode::data( void ) const +const QString& TextNode::data() const { return mData; } +/// +/// Data Property Setter +/// +void TextNode::setData( const QString& data ) +{ + mData = data; +} + + /// /// Get text, expand if necessary /// diff --git a/glabels/TextNode.h b/glabels/TextNode.h index 6f0b372..e302f8f 100644 --- a/glabels/TextNode.h +++ b/glabels/TextNode.h @@ -1,6 +1,6 @@ /* TextNode.h * - * Copyright (C) 2013 Jim Evins + * Copyright (C) 2017 Jim Evins * * This file is part of gLabels-qt. * @@ -56,16 +56,18 @@ public: // // is field? Property // - bool isField( void ) const; + bool isField() const; + void setField( bool isField ); // // Data Property // - const QString& data( void ) const; + const QString& data() const; + void setData( const QString& data ); ///////////////////////////////// - // Methods + // Misc. Methods ///////////////////////////////// QString text( merge::Record* record ) const; bool isEmptyField( merge::Record* record ) const; diff --git a/glabels/XmlLabelCreator.cpp b/glabels/XmlLabelCreator.cpp index c54cefd..21a8836 100644 --- a/glabels/XmlLabelCreator.cpp +++ b/glabels/XmlLabelCreator.cpp @@ -176,7 +176,7 @@ XmlLabelCreator::createObjectBoxNode( QDomElement &parent, const LabelModelBoxOb /* line attrs */ glabels::XmlUtil::setLengthAttr( node, "line_width", object->lineWidth() ); - if ( object->lineColorNode().fieldFlag() ) + if ( object->lineColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "line_color_field", object->lineColorNode().key() ); } @@ -186,7 +186,7 @@ XmlLabelCreator::createObjectBoxNode( QDomElement &parent, const LabelModelBoxOb } /* fill attrs */ - if ( object->fillColorNode().fieldFlag() ) + if ( object->fillColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "fill_color_field", object->fillColorNode().key() ); } @@ -220,7 +220,7 @@ XmlLabelCreator::createObjectEllipseNode( QDomElement &parent, const LabelModelE /* line attrs */ glabels::XmlUtil::setLengthAttr( node, "line_width", object->lineWidth() ); - if ( object->lineColorNode().fieldFlag() ) + if ( object->lineColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "line_color_field", object->lineColorNode().key() ); } @@ -230,7 +230,7 @@ XmlLabelCreator::createObjectEllipseNode( QDomElement &parent, const LabelModelE } /* fill attrs */ - if ( object->fillColorNode().fieldFlag() ) + if ( object->fillColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "fill_color_field", object->fillColorNode().key() ); } @@ -264,7 +264,7 @@ XmlLabelCreator::createObjectLineNode( QDomElement &parent, const LabelModelLine /* line attrs */ glabels::XmlUtil::setLengthAttr( node, "line_width", object->lineWidth() ); - if ( object->lineColorNode().fieldFlag() ) + if ( object->lineColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "line_color_field", object->lineColorNode().key() ); } @@ -338,7 +338,7 @@ XmlLabelCreator::createObjectTextNode( QDomElement &parent, const LabelModelText glabels::XmlUtil::setLengthAttr( node, "h", object->h() ); /* color attr */ - if ( object->textColorNode().fieldFlag() ) + if ( object->textColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "color_field", object->textColorNode().key() ); } @@ -410,7 +410,7 @@ XmlLabelCreator::createShadowAttrs( QDomElement &node, const LabelModelObject* o glabels::XmlUtil::setLengthAttr( node, "shadow_x", object->shadowX() ); glabels::XmlUtil::setLengthAttr( node, "shadow_y", object->shadowY() ); - if ( object->fillColorNode().fieldFlag() ) + if ( object->fillColorNode().isField() ) { glabels::XmlUtil::setStringAttr( node, "shadow_color_field", object->shadowColorNode().key() ); }