r14862 by fschmid - Fixed Bug #8913: "The Xpos and Ypos parameters of the images are ignored"

[scribus-commit]

Revision: 14862
Author: fschmid
Date: 2010-03-09T20:55:20.791660Z
Commit message: Fixed Bug #8913: "The Xpos and Ypos parameters of the images are ignored"

Changeset: 
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Diffs:
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14861)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14862)
@@ -2048,6 +2048,8 @@
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
 		UndoManager::instance()->setUndoEnabled(false);
+		currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
+		currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		currItem->setImageXYScale(scx, scy);
 		currItem->setImageXYOffset(offsX, offsY);
 		currItem->Pfile     = Relative2Path(obj->attribute("PFILE"), baseDir);
@@ -2089,8 +2091,6 @@
 		currItem->setImageShown(obj->attribute("PICART").toInt());
 /*		currItem->BBoxX = obj->attribute("BBOXX").toDouble();
 		currItem->BBoxH = obj->attribute("BBOXH").toDouble(); */
-		currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
-		currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		currItem->setLineWidth(pw);
 		if (currItem->pixm.imgInfo.layerInfo.count() != 0)
 		{
@@ -2134,6 +2134,8 @@
 		UndoManager::instance()->setUndoEnabled(false);
 		if ((obj->attribute("ANNOTATION", "0").toInt()) && (static_cast<bool>(obj->attribute("ANICON", "0").toInt())))
 		{
+			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
+			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 			currItem->setImageXYScale(scx, scy);
 			currItem->setImageXYOffset(offsX, offsY);
 			currItem->Pfile  = Relative2Path(obj->attribute("PFILE" ,""), baseDir);
@@ -2148,8 +2150,6 @@
 			currItem->setImageShown(obj->attribute("PICART").toInt());
 /*			currItem->BBoxX = obj->attribute("BBOXX").toDouble();
 			currItem->BBoxH = obj->attribute("BBOXH").toDouble(); */
-			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
-			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		}
 		//currItem->convertTo(pt);
 		UndoManager::instance()->setUndoEnabled(true);
@@ -2162,6 +2162,8 @@
 		UndoManager::instance()->setUndoEnabled(false);
 		if ((obj->attribute("ANNOTATION", "0").toInt()) && (static_cast<bool>(obj->attribute("ANICON", "0").toInt())))
 		{
+			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
+			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 			currItem->setImageXYScale(scx, scy);
 			currItem->setImageXYOffset(offsX, offsY);
 			currItem->Pfile  = Relative2Path(obj->attribute("PFILE" ,""), baseDir);
@@ -2176,8 +2178,6 @@
 			currItem->setImageShown(obj->attribute("PICART").toInt());
 /*			currItem->BBoxX = obj->attribute("BBOXX").toDouble();
 			currItem->BBoxH = obj->attribute("BBOXH").toDouble(); */
-			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
-			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		}
 		//currItem->convertTo(pt);
 		UndoManager::instance()->setUndoEnabled(true);
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14861)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14862)
@@ -2098,6 +2098,8 @@
 		UndoManager::instance()->setUndoEnabled(false);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
+		currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
+		currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		currItem->setImageXYScale(scx, scy);
 		currItem->setImageXYOffset(ScCLocale::toDoubleC(obj->attribute("LOCALX")), ScCLocale::toDoubleC(obj->attribute("LOCALY")));
 		if (currItem->asLatexFrame())
@@ -2204,8 +2206,6 @@
 		currItem->setImageShown(obj->attribute("PICART").toInt());
 /*		currItem->BBoxX = ScCLocale::toDoubleC( obj->attribute("BBOXX"));
 		currItem->BBoxH = ScCLocale::toDoubleC( obj->attribute("BBOXH")); */
-		currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
-		currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		currItem->setLineWidth(pw);
 		if (currItem->pixm.imgInfo.layerInfo.count() != 0)
 		{
@@ -2249,6 +2249,8 @@
 		UndoManager::instance()->setUndoEnabled(false);
 		if ((obj->attribute("ANNOTATION", "0").toInt()) && (static_cast<bool>(obj->attribute("ANICON", "0").toInt())))
 		{
+			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
+			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 			currItem->setImageXYScale(scx, scy);
 			currItem->setImageXYOffset(ScCLocale::toDoubleC(obj->attribute("LOCALX")), ScCLocale::toDoubleC(obj->attribute("LOCALY")));
 			currItem->Pfile  = Relative2Path(obj->attribute("PFILE","") , baseDir);
@@ -2263,8 +2265,6 @@
 			currItem->setImageShown(obj->attribute("PICART").toInt());
 /*			currItem->BBoxX = ScCLocale::toDoubleC( obj->attribute("BBOXX"));
 			currItem->BBoxH = ScCLocale::toDoubleC( obj->attribute("BBOXH")); */
-			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
-			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		}
 		UndoManager::instance()->setUndoEnabled(true);
 		//currItem->convertTo(pt);
@@ -2277,6 +2277,8 @@
 		UndoManager::instance()->setUndoEnabled(false);
 		if ((obj->attribute("ANNOTATION", "0").toInt()) && (static_cast<bool>(obj->attribute("ANICON", "0").toInt())))
 		{
+			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
+			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 			currItem->setImageXYScale(scx, scy);
 			currItem->setImageXYOffset(ScCLocale::toDoubleC(obj->attribute("LOCALX")), ScCLocale::toDoubleC(obj->attribute("LOCALY")));
 			currItem->Pfile  = Relative2Path(obj->attribute("PFILE","") , baseDir);
@@ -2291,8 +2293,6 @@
 			currItem->setImageShown(obj->attribute("PICART").toInt());
 /*			currItem->BBoxX = ScCLocale::toDoubleC( obj->attribute("BBOXX"));
 			currItem->BBoxH = ScCLocale::toDoubleC( obj->attribute("BBOXH")); */
-			currItem->ScaleType = obj->attribute("SCALETYPE", "1").toInt();
-			currItem->AspectRatio = obj->attribute("RATIO", "0").toInt();
 		}
 		UndoManager::instance()->setUndoEnabled(true);
 		//currItem->convertTo(pt);