Georeferencer plugin: enable creation of nonrectangular pixels in linear transformation

mhugent · mhugent · commit 246ed7716c45 · 2007-04-14T08:47:10.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6884 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/georeferencer/qgsleastsquares.cpp b/src/plugins/georeferencer/qgsleastsquares.cpp
@@ -11,7 +11,7 @@
 
 void QgsLeastSquares::linear(std::vector<QgsPoint> mapCoords, 
 			     std::vector<QgsPoint> pixelCoords,
-			     QgsPoint& origin, double& pixelSize) {
+			     QgsPoint& origin, double& pixelXSize, double& pixelYSize) {
   int n = mapCoords.size();
   if (n < 2) {
     throw std::domain_error(QObject::tr("Fit to a linear transform requires at "
@@ -43,7 +43,8 @@ void QgsLeastSquares::linear(std::vector<QgsPoint> mapCoords,
   
   origin.setX(aX);
   origin.setY(aY);
-  pixelSize = (std::abs(bX) + std::abs(bY)) / 2;
+  pixelXSize = std::abs(bX);
+  pixelYSize = std::abs(bY);
 }
 
   
@@ -150,4 +151,3 @@ void QgsLeastSquares::affine(std::vector<QgsPoint> mapCoords,
   gsl_permutation_free(p);
 
 }
-
diff --git a/src/plugins/georeferencer/qgsleastsquares.h b/src/plugins/georeferencer/qgsleastsquares.h
@@ -12,7 +12,7 @@ class QgsLeastSquares {
  public:
   static void linear(std::vector<QgsPoint> mapCoords, 
 		     std::vector<QgsPoint> pixelCoords,
-		     QgsPoint& origin, double& pixelSize);
+		     QgsPoint& origin, double& pixelXSize, double& pixelYSize);
   
   static void helmert(std::vector<QgsPoint> mapCoords, 
 		      std::vector<QgsPoint> pixelCoords,
diff --git a/src/plugins/georeferencer/qgspointdialog.cpp b/src/plugins/georeferencer/qgspointdialog.cpp
@@ -292,7 +292,8 @@ void QgsPointDialog::on_cmbTransformType_currentIndexChanged(const QString& valu
 bool QgsPointDialog::generateWorldFile()
 {
   QgsPoint origin(0, 0);
-  double pixelSize = 1;
+  double pixelXSize = 1;
+  double pixelYSize = 1;
   double rotation = 0;
   double xOffset = 0.0;
   double yOffset = 0.0;
@@ -312,7 +313,7 @@ bool QgsPointDialog::generateWorldFile()
   {
     if (cmbTransformType->currentText() == tr("Linear"))
     {
-      QgsLeastSquares::linear(mapCoords, pixelCoords, origin, pixelSize);
+      QgsLeastSquares::linear(mapCoords, pixelCoords, origin, pixelXSize, pixelYSize);
     }
     else if (cmbTransformType->currentText() == tr("Helmert"))
     {
@@ -327,7 +328,8 @@ bool QgsPointDialog::generateWorldFile()
       if (res == QMessageBox::Cancel)
 	       return false;
 
-      QgsLeastSquares::helmert(mapCoords, pixelCoords, origin, pixelSize, rotation);
+      QgsLeastSquares::helmert(mapCoords, pixelCoords, origin, pixelXSize, rotation);
+      pixelYSize = pixelXSize;
     }
     else if (cmbTransformType->currentText() == tr("Affine"))
     {
@@ -375,12 +377,12 @@ bool QgsPointDialog::generateWorldFile()
     return false;
   }
   QTextStream stream(&file);
-  stream<<pixelSize<<endl
+  stream<<pixelXSize<<endl
 	<<0<<endl
 	<<0<<endl
-	<<-pixelSize<<endl
-	<<QString::number(origin.x() - xOffset * pixelSize, 'f')<<endl
-	<<QString::number(origin.y() + yOffset * pixelSize, 'f')<<endl;  
+	<<-pixelYSize<<endl
+	<<QString::number(origin.x() - xOffset * pixelXSize, 'f')<<endl
+	<<QString::number(origin.y() + yOffset * pixelYSize, 'f')<<endl;  
   // write the data points in case we need them later
   QFile pointFile(mLayer->source() + ".points");
   if (pointFile.open(QIODevice::WriteOnly))

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,8 @@ void QgsPointDialog::on_cmbTransformType_currentIndexChanged(const QString& valu`
`292`	`292`	`bool QgsPointDialog::generateWorldFile()`
`293`	`293`	`{`
`294`	`294`	`QgsPoint origin(0, 0);`
`295`		`- double pixelSize = 1;`
	`295`	`+ double pixelXSize = 1;`
	`296`	`+ double pixelYSize = 1;`
`296`	`297`	`double rotation = 0;`
`297`	`298`	`double xOffset = 0.0;`
`298`	`299`	`double yOffset = 0.0;`
`@@ -312,7 +313,7 @@ bool QgsPointDialog::generateWorldFile()`
`312`	`313`	`{`
`313`	`314`	`if (cmbTransformType->currentText() == tr("Linear"))`
`314`	`315`	`{`
`315`		`- QgsLeastSquares::linear(mapCoords, pixelCoords, origin, pixelSize);`
	`316`	`+ QgsLeastSquares::linear(mapCoords, pixelCoords, origin, pixelXSize, pixelYSize);`
`316`	`317`	`}`
`317`	`318`	`else if (cmbTransformType->currentText() == tr("Helmert"))`
`318`	`319`	`{`
`@@ -327,7 +328,8 @@ bool QgsPointDialog::generateWorldFile()`
`327`	`328`	`if (res == QMessageBox::Cancel)`
`328`	`329`	`return false;`
`329`	`330`
`330`		`- QgsLeastSquares::helmert(mapCoords, pixelCoords, origin, pixelSize, rotation);`
	`331`	`+ QgsLeastSquares::helmert(mapCoords, pixelCoords, origin, pixelXSize, rotation);`
	`332`	`+ pixelYSize = pixelXSize;`
`331`	`333`	`}`
`332`	`334`	`else if (cmbTransformType->currentText() == tr("Affine"))`
`333`	`335`	`{`
`@@ -375,12 +377,12 @@ bool QgsPointDialog::generateWorldFile()`
`375`	`377`	`return false;`
`376`	`378`	`}`
`377`	`379`	`QTextStream stream(&file);`
`378`		`- stream<<pixelSize<<endl`
	`380`	`+ stream<<pixelXSize<<endl`
`379`	`381`	`<<0<<endl`
`380`	`382`	`<<0<<endl`
`381`		`- <<-pixelSize<<endl`
`382`		`- <<QString::number(origin.x() - xOffset * pixelSize, 'f')<<endl`
`383`		`- <<QString::number(origin.y() + yOffset * pixelSize, 'f')<<endl;`
	`383`	`+ <<-pixelYSize<<endl`
	`384`	`+ <<QString::number(origin.x() - xOffset * pixelXSize, 'f')<<endl`
	`385`	`+ <<QString::number(origin.y() + yOffset * pixelYSize, 'f')<<endl;`
`384`	`386`	`// write the data points in case we need them later`
`385`	`387`	`QFile pointFile(mLayer->source() + ".points");`
`386`	`388`	`if (pointFile.open(QIODevice::WriteOnly))`