Some style cleanup.

2013-12-21 23:47:59 -05:00
parent 5c74625a97
commit f1de981804
16 changed files with 951 additions and 326 deletions
@@ -20,3 +20,105 @@

 #include "ColorNode.h"

+
+namespace glabels
+{
+
+	ColorNode::ColorNode()
+		: mFieldFlag(false), mColor(QColor::fromRgba(0x00000000)), mKey("")
+	{
+	}
+
+
+	ColorNode::ColorNode( bool fieldFlag, const QColor& color, const QString& key )
+		: mFieldFlag(fieldFlag), mColor(color), mKey(key)
+	{
+	}
+
+
+	ColorNode::ColorNode( const QColor& color )
+		: mFieldFlag(false), mColor(color), mKey("")
+	{
+	}
+
+
+	ColorNode::ColorNode( const QString& key )
+		: mFieldFlag(true), mColor(QColor::fromRgba(0x00000000)), mKey(key)
+	{
+	}
+
+
+	bool ColorNode::operator==( const ColorNode& cn )
+	{
+		return ( (mFieldFlag == cn.mFieldFlag) &&
+			 (mColor     == cn.mColor)     &&
+			 (mKey       == cn.mKey) );
+	}
+
+
+	bool ColorNode::operator!=( const ColorNode& cn )
+	{
+		return ( (mFieldFlag != cn.mFieldFlag) ||
+			 (mColor     != cn.mColor)     ||
+			 (mKey       != cn.mKey) );
+	}
+
+
+#if TODO
+	QColor ColorNode::expand( MergeRecord? record )
+	{
+		if ( fieldFlag )
+		{
+			if ( record == null )
+			{
+				return QColor.fromRgba(0x00000000);
+			}
+			else
+			{
+				string? text = record.evalKey( key );
+				if ( text != null )
+				{
+					Gdk.Color gdkColor = Gdk.Color();
+					if ( Gdk.Color.parse( text, out gdkColor ) )
+					{
+						Color color = Color.from_gdkColor( gdkColor );
+						return color;
+					}
+					else
+					{
+						return Color.fromRgba(0x00000000);
+					}
+				}
+				else
+				{
+					return Color.fromRgba(0x00000000);
+				}
+			}
+		}
+		else
+		{
+			return color;
+		}
+	}
+#endif
+
+
+	bool ColorNode::fieldFlag( void ) const
+	{
+		return mFieldFlag;
+	}
+		
+
+	const QColor& ColorNode::color( void ) const
+	{
+		return mColor;
+	}
+		
+
+	const QString& ColorNode::key( void ) const
+	{
+		return mKey;
+	}
+		
+}
+