Correction for hydro_test

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_Image.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_Image.cxx b/src/HYDRO_tests/test_HYDROData_Image.cxx
index 4ab09f269524937de54409ab8dda9318b543d2fd..bcea756c4fa66a36590dd8fbc5ab8ddd16897d25 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Image.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Image.cxx
@@ -39,7 +39,7 @@ static QImage TestImage() {
 
 void test_HYDROData_Image::testQImage()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Image) anImage = 
     Handle(HYDROData_Image)::DownCast(aDoc->CreateObject(KIND_IMAGE));
@@ -61,7 +61,7 @@ void test_HYDROData_Image::testQImage()
 
 void test_HYDROData_Image::testTrsf()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Image) anImage = 
     Handle(HYDROData_Image)::DownCast(aDoc->CreateObject(KIND_IMAGE));
@@ -86,7 +86,7 @@ void test_HYDROData_Image::testTrsf()
 
 void test_HYDROData_Image::testReferences()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Image) anImage1 = 
     Handle(HYDROData_Image)::DownCast(aDoc->CreateObject(KIND_IMAGE));
@@ -137,7 +137,7 @@ void test_HYDROData_Image::testReferences()
 
 void test_HYDROData_Image::testCopy()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Image) anImage1 = 
     Handle(HYDROData_Image)::DownCast(aDoc->CreateObject(KIND_IMAGE));
@@ -169,6 +169,41 @@ void test_HYDROData_Image::testCopy()
   aDoc->Close();
 }
 
+void test_HYDROData_Image::test_static_loadECW()
+{
+  QImage ecwImage;
+  HYDROData_Image::ECW_FileInfo* ECWInfo = new HYDROData_Image::ECW_FileInfo;
+  QString refECWPath = REF_DATA_PATH + "/01-2009-0865-6525-LA93.ecw";    
+  QString refPNGPath = REF_DATA_PATH + "/01-2009-0865-6525-LA93.png";
+  //
+  CPPUNIT_ASSERT ( HYDROData_Image::OpenECW(refECWPath.toLatin1().data(), ecwImage, ECWInfo) );
+  CPPUNIT_ASSERT_EQUAL (10000, ECWInfo->myXSize);
+  CPPUNIT_ASSERT_EQUAL (10000, ECWInfo->myYSize);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL (0.5, ECWInfo->myCellIncrementX, 0.0001);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL (-0.5, ECWInfo->myCellIncrementY, 0.0001);  
+  CPPUNIT_ASSERT_DOUBLES_EQUAL (865000, ECWInfo->myOriginX, 0.0001);
+  CPPUNIT_ASSERT_DOUBLES_EQUAL (6525000, ECWInfo->myOriginY, 0.0001);  
+  //QImage pngImage(refPNGPath);
+  //CPPUNIT_ASSERT( ecwImage == pngImage);
+}
+
+void test_HYDROData_Image::test_loadECW()
+{
+  QImage ecwImage;
+  QString refECWPath = REF_DATA_PATH + "/01-2009-0865-6525-LA93.ecw";    
+  QString refPNGPath = REF_DATA_PATH + "/01-2009-0865-6525-LA93.png";
+  //
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+  Handle(HYDROData_Image) ecwHImage = Handle(HYDROData_Image)::DownCast(aDoc->CreateObject(KIND_IMAGE));
+  //
+  CPPUNIT_ASSERT (ecwHImage->LoadImageECW(refECWPath));
+  //QImage pngImage(refPNGPath);
+  //CPPUNIT_ASSERT( ecwHImage->Image() == pngImage);
+
+  aDoc->Close();
+}
+
+
 void test_HYDROData_Image::testDiff()
 {
   QImage im1, im2;