some progress on QCT file compatibility. Not working yet

Author: csoler

QctMapDB.cpp

@@ -8,15 +8,13 @@
 #define NOT_IMPLEMENTED std::cerr << __PRETTY_FUNCTION__ << ": not implemented yet."
 
 QctMapDB::QctMapDB(const QString& name)
-    : MapDB(name)
+    : MapDB(name), mQctFile(name.toStdString())
 {
     if(!QFile(name).exists())
         throw std::runtime_error("Specified file " + name.toStdString() + " is not present on disk.");
 
     std::cerr << "Reading Qct file " + name.toStdString() << std::endl;
 
-    mQctFile.readFilename(name.toStdString().c_str(),true,nullptr);
-
     double lat_00, lon_00, lat_10, lon_10, lat_01, lon_01, lat_11, lon_11 ;
     mQctFile.computeLatLonLimits(lat_00, lon_00, lat_10, lon_10, lat_01, lon_01, lat_11, lon_11 );
 
@@ -29,13 +27,28 @@ QctMapDB::QctMapDB(const QString& name)
         std::cerr << "Area is axis aligned. Good." << std::endl;
     else
         std::cerr << "Area is not axis aligned. Not good." << std::endl;
+
+    mBottomLeft.x = 0;
+    mBottomLeft.y = 0;
+    mTopRight.x = mQctFile.QCT_TILE_SIZE * mQctFile.sizeX();
+    mTopRight.y = mQctFile.QCT_TILE_SIZE * mQctFile.sizeY();
+
+    for(int i=0;i<mQctFile.sizeX();++i)
+        for(int j=0;j<mQctFile.sizeY();++j)
+        {
+            MapDB::RegisteredImage registered_img;
+            registered_img.W = mQctFile.QCT_TILE_SIZE ;
+            registered_img.H = mQctFile.QCT_TILE_SIZE ;
+            registered_img.bottom_left_corner.x = mQctFile.QCT_TILE_SIZE * i ;
+            registered_img.bottom_left_corner.y = mQctFile.QCT_TILE_SIZE * j ;
+
+            mImages.insert(std::make_pair(MapDB::ImageHandle(i+mQctFile.sizeX()*j),registered_img));
+        }
 }
 
 const std::map<MapDB::ImageHandle,MapDB::RegisteredImage>& QctMapDB::getFullListOfImages() const
 {
-    NOT_IMPLEMENTED;
-
-    return std::map<MapDB::ImageHandle,MapDB::RegisteredImage>();
+    return mImages;
 }
 bool QctMapDB::getImageParams(ImageHandle h, MapDB::RegisteredImage& img) const
 {
@@ -45,9 +58,9 @@ bool QctMapDB::getImageParams(ImageHandle h, MapDB::RegisteredImage& img) const
 }
 QImage QctMapDB::getImageData(ImageHandle h) const
 {
-    NOT_IMPLEMENTED;
+    QImage image(QctFile::QCT_TILE_SIZE,QctFile::QCT_TILE_SIZE,QImage::Format_ARGB32);
+
 
-    return QImage();
 }
 bool QctMapDB::imageSpaceCoordinatesToGPSCoordinates(const MapDB::ImageSpaceCoord& ic,MapDB::GPSCoord& g) const
 {
@@ -62,3 +75,14 @@ const MapDB::ReferencePoint& QctMapDB::getReferencePoint(int i) const
     return ReferencePoint();
 }
 int QctMapDB::numberOfReferencePoints() const { return 2 ; }
+
+std::pair<int,int> QctMapDB::handleToCoordinates(ImageHandle h) const
+{
+    return std::make_pair( int(h)%mQctFile.sizeX(), int(h)/mQctFile.sizeY());
+}
+
+MapDB::ImageHandle QctMapDB::coordinatesToHandle(int x,int y) const
+{
+    return ImageHandle(mQctFile.sizeX()*y + x);
+}
+

QctMapDB.h

@@ -19,6 +19,9 @@ class QctMapDB : public MapDB
         virtual int numberOfReferencePoints() const override;
 
 private:
+        std::pair<int,int> handleToCoordinates(ImageHandle h) const;
+        ImageHandle coordinatesToHandle(int x,int y) const;
+        std::map<MapDB::ImageHandle,MapDB::RegisteredImage> mImages;
 
         QctFile mQctFile;
 };

qct2png.cpp

@@ -812,13 +812,13 @@ QCT::readFile(FILE *fp, int headeronly,unsigned char *data)
 		fgetc(fp);
 	}
 
-	// Don't read and unpack image data if not required
+		if(size_x == 0) size_x = width ;
+	if(size_y == 0) size_y = height ;
+
+// Don't read and unpack image data if not required
 	if (headeronly)
 		return true;
 
-	if(size_x == 0) size_x = width ;
-	if(size_y == 0) size_y = height ;
-
 
 	{
 		int xx, yy;
@@ -1173,7 +1173,7 @@ static bool writePNGFile(FILE *fp, const unsigned char *data, const int *palette
 
 	return true;
 #else
-	throwError("cannot write file (PNG not supported)");
+	//throwError("cannot write file (PNG not supported)");
 	return false;
 #endif
 }
@@ -1341,14 +1341,20 @@ main(int argc, char *argv[])
 	// Image index (width * height pointers)
     // Allocate image data once for all
 
-	unsigned char *image_data = (unsigned char*)calloc(size_tile_y*QCT_TILE_SIZE, size_tile_x*QCT_TILE_SIZE);
 
 	if (query)
 	{
 		qct.printMetadata(stdout);
+		return 1;
 	}
-	else if (outputfile)
-		writePNGFilename(outputfile,image_data,qct.getPalette(),size_tile_x*QCT_TILE_SIZE,size_tile_y*QCT_TILE_SIZE);
+
+	unsigned char *image_data = (unsigned char*)calloc(size_tile_y*QCT_TILE_SIZE, size_tile_x*QCT_TILE_SIZE);
+
+	std::cerr << "Image size: " << size_tile_y*QCT_TILE_SIZE << " x " <<  size_tile_x*QCT_TILE_SIZE << std::endl;
+	if(!qct.readFilename(inputfile,query,image_data))
+		return 0;
+
+	writePNGFilename(outputfile,image_data,qct.getPalette(),size_tile_x*QCT_TILE_SIZE,size_tile_y*QCT_TILE_SIZE);
 
 	if (outputKMZfile)
     {