Construct objects in XmlLabelParser atomically.

glabels/LabelModelBarcodeObject.cpp

@@ -79,6 +79,45 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelBarcodeObject::LabelModelBarcodeObject( const Distance&     x0,
+	                                                  const Distance&     y0,
+	                                                  const Distance&     w,
+	                                                  const Distance&     h,
+	                                                  const BarcodeStyle& bcStyle,
+	                                                  bool                bcTextFlag,
+	                                                  bool                bcChecksumFlag,
+	                                                  QString             bcData,
+	                                                  const ColorNode&    bcColorNode,
+	                                                  const QMatrix&      matrix )
+	: LabelModelObject( x0, y0, w, h, matrix )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		mBcStyle        = bcStyle;
+		mBcTextFlag     = bcTextFlag;
+		mBcChecksumFlag = bcChecksumFlag;
+		mBcData         = bcData;
+		mBcColorNode    = bcColorNode;
+
+		mEditorBarcode = nullptr;
+		mEditorDefaultBarcode = nullptr;
+
+		update(); // Initialize cached editor layouts
+	}
+	
+
 	///
 	/// Copy constructor
 	///

glabels/LabelModelBarcodeObject.h

@@ -44,7 +44,20 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	public:
 		LabelModelBarcodeObject();
+
+		LabelModelBarcodeObject( const Distance&     x0,
+		                         const Distance&     y0,
+		                         const Distance&     w,
+		                         const Distance&     h,
+		                         const BarcodeStyle& bcStyle,
+		                         bool                bcTextFlag,
+		                         bool                bcChecksumFlag,
+		                         QString             bcData,
+		                         const ColorNode&    bcColorNode,
+		                         const QMatrix&      matrix = QMatrix() );
+
 		LabelModelBarcodeObject( const LabelModelBarcodeObject* object );
+
 		~LabelModelBarcodeObject() override;
 
 

glabels/LabelModelBoxObject.cpp

@@ -45,6 +45,31 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelBoxObject::LabelModelBoxObject( const Distance&  x0,
+	                                          const Distance&  y0,
+	                                          const Distance&  w,
+	                                          const Distance&  h,
+	                                          const Distance&  lineWidth,
+	                                          const ColorNode& lineColorNode,
+	                                          const ColorNode& fillColorNode,
+	                                          const QMatrix&   matrix,
+	                                          bool             shadowState,
+	                                          const Distance&  shadowX,
+	                                          const Distance&  shadowY,
+	                                          double           shadowOpacity,
+	                                          const ColorNode& shadowColorNode )
+	: LabelModelShapeObject( x0, y0, w, h,
+	                         lineWidth, lineColorNode, fillColorNode,
+	                         matrix,
+	                         shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		// empty
+	}
+
+
 	///
 	/// Copy constructor
 	///

glabels/LabelModelBoxObject.h

@@ -40,7 +40,23 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	public:
 		LabelModelBoxObject();
+
+		LabelModelBoxObject( const Distance&  x0,
+		                     const Distance&  y0,
+		                     const Distance&  w,
+		                     const Distance&  h,
+		                     const Distance&  lineWidth,
+		                     const ColorNode& lineColorNode,
+		                     const ColorNode& fillColorNode,
+		                     const QMatrix&   matrix = QMatrix(),
+		                     bool             shadowState = false,
+		                     const Distance&  shadowX = 0,
+		                     const Distance&  shadowY = 0,
+		                     double           shadowOpacity = 1.0,
+		                     const ColorNode& shadowColorNode = ColorNode() );
+
 		LabelModelBoxObject( const LabelModelBoxObject* object );
+		
 		~LabelModelBoxObject() override;
 
 	

glabels/LabelModelEllipseObject.cpp

@@ -45,6 +45,31 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelEllipseObject::LabelModelEllipseObject( const Distance&  x0,
+	                                                  const Distance&  y0,
+	                                                  const Distance&  w,
+	                                                  const Distance&  h,
+	                                                  const Distance&  lineWidth,
+	                                                  const ColorNode& lineColorNode,
+	                                                  const ColorNode& fillColorNode,
+	                                                  const QMatrix&   matrix,
+	                                                  bool             shadowState,
+	                                                  const Distance&  shadowX,
+	                                                  const Distance&  shadowY,
+	                                                  double           shadowOpacity,
+	                                                  const ColorNode& shadowColorNode )
+	: LabelModelShapeObject( x0, y0, w, h,
+	                         lineWidth, lineColorNode, fillColorNode,
+	                         matrix,
+	                         shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		// empty
+	}
+
+
 	///
 	/// Copy constructor
 	///

glabels/LabelModelEllipseObject.h

@@ -40,7 +40,23 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	public:
 		LabelModelEllipseObject();
+
+		LabelModelEllipseObject( const Distance&  x0,
+		                         const Distance&  y0,
+		                         const Distance&  w,
+		                         const Distance&  h,
+		                         const Distance&  lineWidth,
+		                         const ColorNode& lineColorNode,
+		                         const ColorNode& fillColorNode,
+		                         const QMatrix&   matrix = QMatrix(),
+		                         bool             shadowState = false,
+		                         const Distance&  shadowX = 0,
+		                         const Distance&  shadowY = 0,
+		                         double           shadowOpacity = 1.0,
+		                         const ColorNode& shadowColorNode = ColorNode() );
+
 		LabelModelEllipseObject( const LabelModelEllipseObject* object );
+
 		~LabelModelEllipseObject() override;
 
 	

glabels/LabelModelImageObject.cpp

@@ -61,6 +61,130 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelImageObject::LabelModelImageObject( const Distance&  x0,
+	                                              const Distance&  y0,
+	                                              const Distance&  w,
+	                                              const Distance&  h,
+	                                              const TextNode&  filenameNode,
+	                                              const QMatrix&   matrix,
+	                                              bool             shadowState,
+	                                              const Distance&  shadowX,
+	                                              const Distance&  shadowY,
+	                                              double           shadowOpacity,
+	                                              const ColorNode& shadowColorNode )
+	: LabelModelObject( x0, y0, w, h,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		if ( smDefaultImage == nullptr )
+		{
+			smDefaultImage = new QImage( ":images/checkerboard.png" );
+		}
+
+		mFilenameNode = filenameNode;
+
+		mImage = nullptr;
+		mSvgRenderer = nullptr;
+	}
+
+	
+	///
+	/// Constructor
+	///
+	LabelModelImageObject::LabelModelImageObject( const Distance&  x0,
+	                                              const Distance&  y0,
+	                                              const Distance&  w,
+	                                              const Distance&  h,
+	                                              const QString&   filename,
+	                                              const QImage&    image,
+	                                              const QMatrix&   matrix,
+	                                              bool             shadowState,
+	                                              const Distance&  shadowX,
+	                                              const Distance&  shadowY,
+	                                              double           shadowOpacity,
+	                                              const ColorNode& shadowColorNode )
+	: LabelModelObject( x0, y0, w, h,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		if ( smDefaultImage == nullptr )
+		{
+			smDefaultImage = new QImage( ":images/checkerboard.png" );
+		}
+
+		mImage = new QImage(image);
+		mFilenameNode = TextNode( false, filename );
+		mSvgRenderer = nullptr;
+	}
+
+
+	///
+	/// Constructor
+	///
+	LabelModelImageObject::LabelModelImageObject( const Distance&   x0,
+	                                              const Distance&   y0,
+	                                              const Distance&   w,
+	                                              const Distance&   h,
+	                                              const QString&    filename,
+	                                              const QByteArray& svg,
+	                                              const QMatrix&    matrix,
+	                                              bool              shadowState,
+	                                              const Distance&   shadowX,
+	                                              const Distance&   shadowY,
+	                                              double            shadowOpacity,
+	                                              const ColorNode&  shadowColorNode )
+	: LabelModelObject( x0, y0, w, h,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		if ( smDefaultImage == nullptr )
+		{
+			smDefaultImage = new QImage( ":images/checkerboard.png" );
+		}
+
+		mSvg = svg;
+		mSvgRenderer = new QSvgRenderer( mSvg );
+		mFilenameNode = TextNode( false, filename );
+		mImage = nullptr;
+	}
+
+
 	///
 	/// Copy constructor
 	///

glabels/LabelModelImageObject.h

@@ -42,7 +42,47 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	public:
 		LabelModelImageObject();
+
+		LabelModelImageObject( const Distance&  x0,
+		                       const Distance&  y0,
+		                       const Distance&  w,
+		                       const Distance&  h,
+		                       const TextNode&  filenameNode,
+		                       const QMatrix&   matrix = QMatrix(),
+		                       bool             shadowState = false,
+		                       const Distance&  shadowX = 0,
+		                       const Distance&  shadowY = 0,
+		                       double           shadowOpacity = 1.0,
+		                       const ColorNode& shadowColorNode = ColorNode() );
+
+		LabelModelImageObject( const Distance&  x0,
+		                       const Distance&  y0,
+		                       const Distance&  w,
+		                       const Distance&  h,
+		                       const QString&   filename,
+		                       const QImage&    image,
+		                       const QMatrix&   matrix = QMatrix(),
+		                       bool             shadowState = false,
+		                       const Distance&  shadowX = 0,
+		                       const Distance&  shadowY = 0,
+		                       double           shadowOpacity = 1.0,
+		                       const ColorNode& shadowColorNode = ColorNode() );
+
+		LabelModelImageObject( const Distance&   x0,
+		                       const Distance&   y0,
+		                       const Distance&   w,
+		                       const Distance&   h,
+		                       const QString&    filename,
+		                       const QByteArray& svg,
+		                       const QMatrix&    matrix = QMatrix(),
+		                       bool              shadowState = false,
+		                       const Distance&   shadowX = 0,
+		                       const Distance&   shadowY = 0,
+		                       double            shadowOpacity = 1.0,
+		                       const ColorNode&  shadowColorNode = ColorNode() );
+
 		LabelModelImageObject( const LabelModelImageObject* object );
+		
 		~LabelModelImageObject() override;
 
 

glabels/LabelModelLineObject.cpp

@@ -51,6 +51,41 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelLineObject::LabelModelLineObject( const Distance&  x0,
+	                                            const Distance&  y0,
+	                                            const Distance&  dx,
+	                                            const Distance&  dy,
+	                                            const Distance&  lineWidth,
+	                                            const ColorNode& lineColorNode,
+	                                            const QMatrix&   matrix,
+	                                            bool             shadowState,
+	                                            const Distance&  shadowX,
+	                                            const Distance&  shadowY,
+	                                            double           shadowOpacity,
+	                                            const ColorNode& shadowColorNode )
+	: LabelModelObject( x0, y0, dx, dy,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		mLineWidth       = lineWidth;
+		mLineColorNode   = lineColorNode;
+	}
+
+	
 	///
 	/// Copy constructor
 	///

glabels/LabelModelLineObject.h

@@ -40,7 +40,22 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	public:
 		LabelModelLineObject();
+
+		LabelModelLineObject( const Distance&  x0,
+		                      const Distance&  y0,
+		                      const Distance&  w,
+		                      const Distance&  h,
+		                      const Distance&  lineWidth,
+		                      const ColorNode& lineColorNode,
+		                      const QMatrix&   matrix = QMatrix(),
+		                      bool             shadowState = false,
+		                      const Distance&  shadowX = 0,
+		                      const Distance&  shadowY = 0,
+		                      double           shadowOpacity = 1.0,
+		                      const ColorNode& shadowColorNode = ColorNode() );
+
 		LabelModelLineObject( const LabelModelLineObject* object );
+		
 		~LabelModelLineObject() override;
 
 

glabels/LabelModelObject.cpp

@@ -64,6 +64,40 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelObject::LabelModelObject( const Distance&  x0,
+	                                    const Distance&  y0,
+	                                    const Distance&  w,
+	                                    const Distance&  h,
+	                                    const QMatrix&   matrix,
+	                                    bool             shadowState,
+	                                    const Distance&  shadowX,
+	                                    const Distance&  shadowY,
+	                                    double           shadowOpacity,
+	                                    const ColorNode& shadowColorNode ) : QObject(nullptr)
+	{
+		mId = msNextId++;
+
+		mX0 = x0;
+		mY0 = y0;
+		mW  = w;
+		mH  = h;
+		mMatrix = matrix;
+
+		mShadowState     = shadowState;
+		mShadowX         = shadowX;
+		mShadowY         = shadowY;
+		mShadowColorNode = shadowColorNode;
+		mShadowOpacity   = shadowOpacity;
+
+		mSelectedFlag = false;
+
+		mOutline = nullptr;
+	}
+	
+		
 	///
 	/// Copy constructor
 	///

glabels/LabelModelObject.h

@@ -57,7 +57,20 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	protected:
 		LabelModelObject();
+		
+		LabelModelObject( const Distance&  x0,
+		                  const Distance&  y0,
+		                  const Distance&  w,
+		                  const Distance&  h,
+		                  const QMatrix&   matrix = QMatrix(),
+		                  bool             shadowState = false,
+		                  const Distance&  shadowX = 0,
+		                  const Distance&  shadowY = 0,
+		                  double           shadowOpacity = 1.0,
+		                  const ColorNode& shadowColorNode = ColorNode() );
+		
 		LabelModelObject( const LabelModelObject* object );
+		
 	public:
 		~LabelModelObject() override;
 

glabels/LabelModelShapeObject.cpp

@@ -49,6 +49,43 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelShapeObject::LabelModelShapeObject( const Distance&  x0,
+	                                              const Distance&  y0,
+	                                              const Distance&  w,
+	                                              const Distance&  h,
+	                                              const Distance&  lineWidth,
+	                                              const ColorNode& lineColorNode,
+	                                              const ColorNode& fillColorNode,
+	                                              const QMatrix&   matrix,
+	                                              bool             shadowState,
+	                                              const Distance&  shadowX,
+	                                              const Distance&  shadowY,
+	                                              double           shadowOpacity,
+	                                              const ColorNode& shadowColorNode )
+	: LabelModelObject( x0, y0, w, h,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		mLineWidth       = lineWidth;
+		mLineColorNode   = lineColorNode;
+		mFillColorNode   = fillColorNode;
+	}
+
+	
 	///
 	/// Copy constructor
 	///

glabels/LabelModelShapeObject.h

@@ -40,6 +40,21 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	protected:
 		LabelModelShapeObject();
+
+		LabelModelShapeObject( const Distance&  x0,
+		                       const Distance&  y0,
+		                       const Distance&  w,
+		                       const Distance&  h,
+		                       const Distance&  lineWidth,
+		                       const ColorNode& lineColorNode,
+		                       const ColorNode& fillColorNode,
+		                       const QMatrix&   matrix,
+		                       bool             shadowState,
+		                       const Distance&  shadowX,
+		                       const Distance&  shadowY,
+		                       double           shadowOpacity,
+		                       const ColorNode& shadowColorNode );
+
 		LabelModelShapeObject( const LabelModelShapeObject* object );
 	public:
 		~LabelModelShapeObject() override;

glabels/LabelModelTextObject.cpp

@@ -71,6 +71,57 @@ namespace glabels
 	}
 
 
+	///
+	/// Constructor
+	///
+	LabelModelTextObject::LabelModelTextObject( const Distance&  x0,
+	                                            const Distance&  y0,
+	                                            const Distance&  w,
+	                                            const Distance&  h,
+	                                            const QString&   text,
+	                                            const QString&   fontFamily,
+	                                            double           fontSize,
+	                                            QFont::Weight    fontWeight,
+	                                            bool             fontItalicFlag,
+	                                            bool             fontUnderlineFlag,
+	                                            ColorNode        textColorNode,
+	                                            Qt::Alignment    textHAlign,
+	                                            Qt::Alignment    textVAlign,
+	                                            double           textLineSpacing,
+	                                            const QMatrix&   matrix,
+	                                            bool             shadowState,
+	                                            const Distance&  shadowX,
+	                                            const Distance&  shadowY,
+	                                            double           shadowOpacity,
+	                                            const ColorNode& shadowColorNode )
+	: LabelModelObject( x0, y0, w, h,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	{
+		mOutline = new Outline( this );
+
+		mHandles << new HandleNorthWest( this );
+		mHandles << new HandleNorth( this );
+		mHandles << new HandleNorthEast( this );
+		mHandles << new HandleEast( this );
+		mHandles << new HandleSouthEast( this );
+		mHandles << new HandleSouth( this );
+		mHandles << new HandleSouthWest( this );
+		mHandles << new HandleWest( this );
+
+		mText              = text;
+		mFontFamily        = fontFamily;
+		mFontSize          = fontSize;
+		mFontWeight        = fontWeight;
+		mFontItalicFlag    = fontItalicFlag;
+		mFontUnderlineFlag = fontUnderlineFlag;
+		mTextColorNode     = textColorNode;
+		mTextHAlign        = textHAlign;
+		mTextVAlign        = textVAlign;
+		mTextLineSpacing   = textLineSpacing;
+	}
+
+	
 	///
 	/// Copy constructor
 	///

glabels/LabelModelTextObject.h

@@ -43,7 +43,30 @@ namespace glabels
 		///////////////////////////////////////////////////////////////
 	public:
 		LabelModelTextObject();
+		
+		LabelModelTextObject( const Distance&  x0,
+		                      const Distance&  y0,
+		                      const Distance&  w,
+		                      const Distance&  h,
+		                      const QString&   text,
+		                      const QString&   fontFamily,
+		                      double           fontSize,
+		                      QFont::Weight    fontWeight,
+		                      bool             fontItalicFlag,
+		                      bool             fontUnderlineFlag,
+		                      ColorNode        textColorNode,
+		                      Qt::Alignment    textHAlign,
+		                      Qt::Alignment    textVAlign,
+		                      double           textLineSpacing,
+		                      const QMatrix&   matrix = QMatrix(),
+		                      bool             shadowState = false,
+		                      const Distance&  shadowX = 0,
+		                      const Distance&  shadowY = 0,
+		                      double           shadowOpacity = 1.0,
+		                      const ColorNode& shadowColorNode = ColorNode() );
+
 		LabelModelTextObject( const LabelModelTextObject* object );
+		
 		~LabelModelTextObject() override;
 
 

glabels/XmlLabelParser.cpp

@@ -335,202 +335,314 @@ namespace glabels
 	LabelModelBoxObject*
 	XmlLabelParser::parseObjectBoxNode( const QDomElement &node )
 	{
-		LabelModelBoxObject* object = new LabelModelBoxObject();
-
-
 		/* position attrs */
-		parsePositionAttrs( node, object );
+		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
 
 		/* size attrs */
-		parseSizeAttrs( node, object );
+		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
 
 		/* line attrs */
-		parseLineAttrs( node, object );
+		Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
+
+		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
+		bool     field_flag = !key.isEmpty();
+		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
+		ColorNode lineColorNode( field_flag, color, key );
 
 		/* fill attrs */
-		parseFillAttrs( node, object );
+		key        = XmlUtil::getStringAttr( node, "fill_color_field", "" );
+		field_flag = !key.isEmpty();
+		color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
+		ColorNode fillColorNode( field_flag, color, key );
         
 		/* affine attrs */
-		parseAffineAttrs( node, object );
+		double a[6];
+		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
 
 		/* shadow attrs */
-		parseShadowAttrs( node, object );
+		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
 
-		return object;
+		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+		field_flag = !key.isEmpty();
+		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+		ColorNode shadowColorNode( field_flag, color, key );
+
+		return new LabelModelBoxObject( x0, y0, w, h,
+		                                lineWidth, lineColorNode,
+		                                fillColorNode,
+		                                QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                                shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
 	LabelModelEllipseObject*
 	XmlLabelParser::parseObjectEllipseNode( const QDomElement &node )
 	{
-		LabelModelEllipseObject* object = new LabelModelEllipseObject();
-
-
 		/* position attrs */
-		parsePositionAttrs( node, object );
+		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
 
 		/* size attrs */
-		parseSizeAttrs( node, object );
+		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
 
 		/* line attrs */
-		parseLineAttrs( node, object );
+		Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
+
+		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
+		bool     field_flag = !key.isEmpty();
+		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
+		ColorNode lineColorNode( field_flag, color, key );
 
 		/* fill attrs */
-		parseFillAttrs( node, object );
+		key        = XmlUtil::getStringAttr( node, "fill_color_field", "" );
+		field_flag = !key.isEmpty();
+		color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
+		ColorNode fillColorNode( field_flag, color, key );
         
 		/* affine attrs */
-		parseAffineAttrs( node, object );
+		double a[6];
+		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
 
 		/* shadow attrs */
-		parseShadowAttrs( node, object );
+		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
 
-		return object;
+		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+		field_flag = !key.isEmpty();
+		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+		ColorNode shadowColorNode( field_flag, color, key );
+
+		return new LabelModelEllipseObject( x0, y0, w, h,
+		                                    lineWidth, lineColorNode,
+		                                    fillColorNode,
+		                                    QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
 	LabelModelLineObject*
 	XmlLabelParser::parseObjectLineNode( const QDomElement &node )
 	{
-		LabelModelLineObject* object = new LabelModelLineObject();
-
-
 		/* position attrs */
-		parsePositionAttrs( node, object );
+		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
 
 		/* size attrs of line */
-		object->setW( XmlUtil::getLengthAttr( node, "dx", 0 ) );
+		Distance dx = XmlUtil::getLengthAttr( node, "dx", 0 );
-		object->setH( XmlUtil::getLengthAttr( node, "dy", 0 ) );
+		Distance dy = XmlUtil::getLengthAttr( node, "dy", 0 );
 
 		/* line attrs */
-		parseLineAttrs( node, object );
+		Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
+
+		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
+		bool     field_flag = !key.isEmpty();
+		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
+		ColorNode lineColorNode( field_flag, color, key );
 
 		/* affine attrs */
-		parseAffineAttrs( node, object );
+		double a[6];
+		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
 
 		/* shadow attrs */
-		parseShadowAttrs( node, object );
+		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
 
-		return object;
+		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+		field_flag = !key.isEmpty();
+		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+		ColorNode shadowColorNode( field_flag, color, key );
+
+		return new LabelModelLineObject( x0, y0, dx, dy,
+		                                 lineWidth, lineColorNode,
+		                                 QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                                 shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
 	LabelModelImageObject*
 	XmlLabelParser::parseObjectImageNode( const QDomElement &node, const DataCache& data )
 	{
-		LabelModelImageObject* object = new LabelModelImageObject();
-
-
 		/* position attrs */
-		parsePositionAttrs( node, object );
+		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
 
 		/* size attrs */
-		parseSizeAttrs( node, object );
+		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
 
 		/* file attrs */
 		QString key        = XmlUtil::getStringAttr( node, "src_field", "" );
 		bool    field_flag = !key.isEmpty();
 		QString filename   = XmlUtil::getStringAttr( node, "src", "" );
+		TextNode filenameNode( field_flag, field_flag ? key : filename );
 
-		if ( field_flag )
+		/* affine attrs */
+		double a[6];
+		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+		/* shadow attrs */
+		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+		key            = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+		field_flag     = !key.isEmpty();
+		uint32_t color = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+		ColorNode shadowColorNode( field_flag, color, key );
+
+		if ( filenameNode.isField() )
 		{
-			object->setFilenameNode( TextNode( true, key ) );
+			return new LabelModelImageObject( x0, y0, w, h,
+			                                  filenameNode,
+			                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+			                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 		}
 		else
 		{
 			if ( data.hasImage( filename ) )
 			{
-				object->setImage( filename, data.getImage( filename ) );
+				return new LabelModelImageObject( x0, y0, w, h,
+				                                  filename, data.getImage( filename ),
+				                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+				                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
 			else if ( data.hasSvg( filename ) )
 			{
-				object->setSvg( filename, data.getSvg( filename ) );
+				return new LabelModelImageObject( x0, y0, w, h,
+				                                  filename, data.getSvg( filename ),
+				                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+				                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
 			else
 			{
 				qWarning() << "Embedded file" << filename << "missing. Trying actual file.";
-				object->setFilenameNode( TextNode( false, filename ) );
+				return new LabelModelImageObject( x0, y0, w, h,
+				                                  filenameNode,
+				                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+				                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
 		}
-        
-		/* affine attrs */
-		parseAffineAttrs( node, object );
-
-		/* shadow attrs */
-		parseShadowAttrs( node, object );
-
-		return object;
 	}
 
 
 	LabelModelBarcodeObject*
 	XmlLabelParser::parseObjectBarcodeNode( const QDomElement &node )
 	{
-		LabelModelBarcodeObject* object = new LabelModelBarcodeObject();
-
-
 		/* position attrs */
-		parsePositionAttrs( node, object );
+		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
 
 		/* size attrs */
-		parseSizeAttrs( node, object );
+		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
 
 		/* barcode attrs */
 		BarcodeStyle bcStyle = BarcodeBackends::style( XmlUtil::getStringAttr( node, "backend", "" ),
 		                                               XmlUtil::getStringAttr( node, "style", "") );
-		object->setBcStyle( bcStyle );
+		bool bcTextFlag = XmlUtil::getBoolAttr( node, "text", true );
-		object->setBcTextFlag( XmlUtil::getBoolAttr( node, "text", true ) );
+		bool bcChecksumFlag = XmlUtil::getBoolAttr( node, "checksum", true );
-		object->setBcChecksumFlag( XmlUtil::getBoolAttr( node, "checksum", true ) );
 
 		QString  key        = XmlUtil::getStringAttr( node, "color_field", "" );
 		bool     field_flag = !key.isEmpty();
 		uint32_t color      = XmlUtil::getUIntAttr( node, "color", 0 );
-		object->setBcColorNode( ColorNode( field_flag, color, key ) );
+		ColorNode bcColorNode( field_flag, color, key );
 
-		object->setBcData( XmlUtil::getStringAttr( node, "data", "" ) );
+		QString bcData = XmlUtil::getStringAttr( node, "data", "" );
 
 		/* affine attrs */
-		parseAffineAttrs( node, object );
+		double a[6];
+		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
 
-		return object;
+		return new LabelModelBarcodeObject( x0, y0, w, h,
+		                                    bcStyle, bcTextFlag, bcChecksumFlag, bcData, bcColorNode,
+		                                    QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ) );
 	}
 
 
 	LabelModelTextObject*
 	XmlLabelParser::parseObjectTextNode( const QDomElement &node )
 	{
-		LabelModelTextObject* object = new LabelModelTextObject();
-
-
 		/* position attrs */
-		parsePositionAttrs( node, object );
+		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
 
 		/* size attrs */
-		parseSizeAttrs( node, object );
+		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
 
 		/* color attr */
 		QString  key        = XmlUtil::getStringAttr( node, "color_field", "" );
 		bool     field_flag = !key.isEmpty();
 		uint32_t color      = XmlUtil::getUIntAttr( node, "color", 0 );
-
+		ColorNode textColorNode( field_flag, color, key );
-		object->setTextColorNode( ColorNode( field_flag, color, key ) );
 
 		/* font attrs */
-		object->setFontFamily( XmlUtil::getStringAttr( node, "font_family", "Sans" ) );
+		QString       fontFamily        = XmlUtil::getStringAttr( node, "font_family", "Sans" );
-		object->setFontSize( XmlUtil::getDoubleAttr( node, "font_size", 10 ) );
+		double        fontSize          = XmlUtil::getDoubleAttr( node, "font_size", 10 );
-		object->setFontWeight( EnumUtil::stringToWeight( XmlUtil::getStringAttr( node, "font_weight", "normal" ) ) );
+		QFont::Weight fontWeight        = EnumUtil::stringToWeight( XmlUtil::getStringAttr( node, "font_weight", "normal" ) );
-		object->setFontItalicFlag( XmlUtil::getBoolAttr( node, "font_italic", false ) );
+		bool          fontItalicFlag    = XmlUtil::getBoolAttr( node, "font_italic", false );
-		object->setFontUnderlineFlag( XmlUtil::getBoolAttr( node, "font_underline", false ) );
+		bool          fontUnderlineFlag = XmlUtil::getBoolAttr( node, "font_underline", false );
 
 		/* text attrs */
-		object->setTextLineSpacing( XmlUtil::getDoubleAttr( node, "line_spacing", 1 ) );
+		double textLineSpacing   = XmlUtil::getDoubleAttr( node, "line_spacing", 1 );
-		object->setTextHAlign( EnumUtil::stringToHAlign( XmlUtil::getStringAttr( node, "align", "left" ) ) );
+		Qt::Alignment textHAlign = EnumUtil::stringToHAlign( XmlUtil::getStringAttr( node, "align", "left" ) );
-		object->setTextVAlign( EnumUtil::stringToVAlign( XmlUtil::getStringAttr( node, "valign", "top" ) ) );
+		Qt::Alignment textVAlign = EnumUtil::stringToVAlign( XmlUtil::getStringAttr( node, "valign", "top" ) );
 
 		/* affine attrs */
-		parseAffineAttrs( node, object );
+		double a[6];
+		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
 
 		/* shadow attrs */
-		parseShadowAttrs( node, object );
+		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+		field_flag = !key.isEmpty();
+		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+		ColorNode shadowColorNode( field_flag, color, key );
 
 		/* deserialize contents. */
 		QTextDocument document;
@@ -554,9 +666,14 @@ namespace glabels
 				qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
 			}
 		}
-		object->setText( document.toPlainText() );
+		QString text = document.toPlainText();
 
-		return object;
+		return new LabelModelTextObject( x0, y0, w, h,
+		                                 text,
+		                                 fontFamily, fontSize, fontWeight, fontItalicFlag, fontUnderlineFlag,
+		                                 textColorNode, textHAlign, textVAlign, textLineSpacing,
+		                                 QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                                 shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
@@ -574,83 +691,6 @@ namespace glabels
 	}
 
 	
-	void
-	XmlLabelParser::parsePositionAttrs( const QDomElement &node, LabelModelObject* object )
-	{
-		object->setX0( XmlUtil::getLengthAttr( node, "x", 0.0 ) );
-		object->setY0( XmlUtil::getLengthAttr( node, "y", 0.0 ) );
-	}
-
-	
-	void
-	XmlLabelParser::parseSizeAttrs( const QDomElement &node, LabelModelObject* object )
-	{
-		object->setW( XmlUtil::getLengthAttr( node, "w", 0 ) );
-		object->setH( XmlUtil::getLengthAttr( node, "h", 0 ) );
-	}
-
-	
-	void
-	XmlLabelParser::parseLineAttrs( const QDomElement &node, LabelModelObject* object )
-	{
-		object->setLineWidth( XmlUtil::getLengthAttr( node, "line_width", 1.0 ) );
-
-		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
-
-		object->setLineColorNode( ColorNode( field_flag, color, key ) );
-	}
-
-	
-	void
-	XmlLabelParser::parseFillAttrs( const QDomElement &node, LabelModelObject* object )
-	{
-		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
-
-		object->setFillColorNode( ColorNode( field_flag, color, key ) );
-	}
-
-
-	void
-	XmlLabelParser::parseAffineAttrs( const QDomElement &node, LabelModelObject* object )
-	{
-		double a[6];
-
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		object->setMatrix( QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ) );
-	}
-
-
-	void
-	XmlLabelParser::parseShadowAttrs( const QDomElement &node, LabelModelObject* object )
-	{
-		object->setShadow( XmlUtil::getBoolAttr( node, "shadow", false ) );
-
-		if ( object->shadow() )
-		{
-			object->setShadowX( XmlUtil::getLengthAttr( node, "shadow_x", 0.0 ) );
-			object->setShadowY( XmlUtil::getLengthAttr( node, "shadow_y", 0.0 ) );
-
-			QString  key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
-			bool     field_flag = !key.isEmpty();
-			uint32_t color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
-
-			object->setShadowColorNode( ColorNode( field_flag, color, key ) );
-
-			object->setShadowOpacity( XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 ) );
-		}
-	}
-
-
 	void
 	XmlLabelParser::parseMergeNode( const QDomElement &node, LabelModel* label )
 	{

glabels/XmlLabelParser.h

@@ -65,12 +65,6 @@ namespace glabels
 		static LabelModelTextObject* parseObjectTextNode( const QDomElement &node );
 		static QString parsePNode( const QDomElement &node );
 		static bool parseRotateAttr( const QDomElement &node );
-		static void parsePositionAttrs( const QDomElement &node, LabelModelObject* object );
-		static void parseSizeAttrs( const QDomElement &node, LabelModelObject* object );
-		static void parseLineAttrs( const QDomElement &node, LabelModelObject* object );
-		static void parseFillAttrs( const QDomElement &node, LabelModelObject* object );
-		static void parseAffineAttrs( const QDomElement &node, LabelModelObject* object );
-		static void parseShadowAttrs( const QDomElement &node, LabelModelObject* object );
 		static void parseMergeNode( const QDomElement &node, LabelModel* label );
 		static void parseDataNode( const QDomElement &node, DataCache& data );
 		static void parsePixdataNode( const QDomElement &node, DataCache& data );

translations/glabels_C.ts

@@ -1115,12 +1115,12 @@
 <context>
     <name>glabels::LabelModelBarcodeObject</name>
     <message>
-        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="385"/>
+        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="424"/>
         <source>No barcode data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="399"/>
+        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="438"/>
         <source>Invalid barcode data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1128,8 +1128,8 @@
 <context>
     <name>glabels::LabelModelTextObject</name>
     <message>
-        <location filename="../glabels/LabelModelTextObject.cpp" line="368"/>
+        <location filename="../glabels/LabelModelTextObject.cpp" line="419"/>
-        <location filename="../glabels/LabelModelTextObject.cpp" line="490"/>
+        <location filename="../glabels/LabelModelTextObject.cpp" line="541"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>