From d40286a203c60a8a099b2ac92e6e88a449b2c1c2 Mon Sep 17 00:00:00 2001 From: adv Date: Thu, 24 Oct 2013 12:06:07 +0000 Subject: [PATCH] Linux compilation. --- src/HYDROData/CMakeLists.txt | 24 +++++++++---------- ...a_Object.cxx => test_HYDROData_Entity.cxx} | 18 +++++++------- ...OData_Object.h => test_HYDROData_Entity.h} | 8 +++---- .../test_HYDROData_OperationsFactory.cxx | 2 +- src/HYDROData/test_HYDROData_Polyline.cxx | 14 +++++------ src/HYDROGUI/CMakeLists.txt | 2 -- 6 files changed, 33 insertions(+), 35 deletions(-) rename src/HYDROData/{test_HYDROData_Object.cxx => test_HYDROData_Entity.cxx} (67%) rename src/HYDROData/{test_HYDROData_Object.h => test_HYDROData_Entity.h} (60%) diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt index 5e968068..71fc6191 100644 --- a/src/HYDROData/CMakeLists.txt +++ b/src/HYDROData/CMakeLists.txt @@ -70,28 +70,28 @@ set(PROJECT_LIBRARIES HYDROData) if(CPPUNIT_IS_OK) set(TEST_HEADERS - test_HYDROData_Document.h - test_HYDROData_Object.h - test_HYDROData_Iterator.h - test_HYDROData_Image.h - test_HYDROData_Polyline.h test_HYDROData_Bathymetry.h - test_HYDROData_Calculation.h test_HYDROData_BSplineOperation.h + test_HYDROData_Calculation.h + test_HYDROData_Document.h + test_HYDROData_Entity.h + test_HYDROData_Image.h + test_HYDROData_Iterator.h test_HYDROData_OperationsFactory.h + test_HYDROData_Polyline.h ) set(TEST_SOURCES test_HYDROData_Main.cxx - test_HYDROData_Document.cxx - test_HYDROData_Object.cxx - test_HYDROData_Iterator.cxx - test_HYDROData_Image.cxx - test_HYDROData_Polyline.cxx test_HYDROData_Bathymetry.cxx - test_HYDROData_Calculation.cxx test_HYDROData_BSplineOperation.cxx + test_HYDROData_Calculation.cxx + test_HYDROData_Document.cxx + test_HYDROData_Entity.cxx + test_HYDROData_Image.cxx + test_HYDROData_Iterator.cxx test_HYDROData_OperationsFactory.cxx + test_HYDROData_Polyline.cxx ) set(TEST_EXE test_HYDROData) diff --git a/src/HYDROData/test_HYDROData_Object.cxx b/src/HYDROData/test_HYDROData_Entity.cxx similarity index 67% rename from src/HYDROData/test_HYDROData_Object.cxx rename to src/HYDROData/test_HYDROData_Entity.cxx index 7e96fda3..07007168 100644 --- a/src/HYDROData/test_HYDROData_Object.cxx +++ b/src/HYDROData/test_HYDROData_Entity.cxx @@ -1,15 +1,15 @@ -#include +#include #include -#include +#include #include -void test_HYDROData_Object::testName() +void test_HYDROData_Entity::testName() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); - Handle(HYDROData_Object) anObj = aDoc->CreateObject(KIND_IMAGE); // any object + Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object static const QString aName("test_name"); anObj->SetName(aName); CPPUNIT_ASSERT_EQUAL(aName.toStdString(), anObj->GetName().toStdString()); @@ -17,11 +17,11 @@ void test_HYDROData_Object::testName() aDoc->Close(); } -void test_HYDROData_Object::testRemove() +void test_HYDROData_Entity::testRemove() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); - Handle(HYDROData_Object) anObj = aDoc->CreateObject(KIND_IMAGE); // any object + Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object CPPUNIT_ASSERT(!anObj->IsRemoved()); anObj->Remove(); CPPUNIT_ASSERT(anObj->IsRemoved()); @@ -29,15 +29,15 @@ void test_HYDROData_Object::testRemove() aDoc->Close(); } -void test_HYDROData_Object::testCopy() +void test_HYDROData_Entity::testCopy() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); - Handle(HYDROData_Object) anObj = aDoc->CreateObject(KIND_IMAGE); // any object + Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object static const QString aName("test_name"); anObj->SetName(aName); - Handle(HYDROData_Object) aCopy = aDoc->CreateObject(KIND_IMAGE); // object for copy + Handle(HYDROData_Entity) aCopy = aDoc->CreateObject(KIND_IMAGE); // object for copy CPPUNIT_ASSERT(aCopy->GetName().isEmpty()); anObj->CopyTo(aCopy); diff --git a/src/HYDROData/test_HYDROData_Object.h b/src/HYDROData/test_HYDROData_Entity.h similarity index 60% rename from src/HYDROData/test_HYDROData_Object.h rename to src/HYDROData/test_HYDROData_Entity.h index 12284fac..d313802a 100644 --- a/src/HYDROData/test_HYDROData_Object.h +++ b/src/HYDROData/test_HYDROData_Entity.h @@ -1,7 +1,7 @@ #include -class test_HYDROData_Object : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(test_HYDROData_Object); +class test_HYDROData_Entity : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(test_HYDROData_Entity); CPPUNIT_TEST(testName); CPPUNIT_TEST(testRemove); CPPUNIT_TEST(testCopy); @@ -25,5 +25,5 @@ public: void testCopy(); }; -CPPUNIT_TEST_SUITE_REGISTRATION(test_HYDROData_Object); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_HYDROData_Object, "HYDROData_Object"); +CPPUNIT_TEST_SUITE_REGISTRATION(test_HYDROData_Entity); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_HYDROData_Entity, "HYDROData_Entity"); diff --git a/src/HYDROData/test_HYDROData_OperationsFactory.cxx b/src/HYDROData/test_HYDROData_OperationsFactory.cxx index bea1c987..b5d068fe 100644 --- a/src/HYDROData/test_HYDROData_OperationsFactory.cxx +++ b/src/HYDROData/test_HYDROData_OperationsFactory.cxx @@ -60,7 +60,7 @@ void test_HYDROData_OperationsFactory::testCrop() aPolylineData << aPolylineSect; - aCropPolyline->setPolylineData( aPolylineData ); + aCropPolyline->SetPolylineData( aPolylineData ); // prepare Composer Operation ImageComposer_Operator* aCropOp = diff --git a/src/HYDROData/test_HYDROData_Polyline.cxx b/src/HYDROData/test_HYDROData_Polyline.cxx index 290fffad..8899ee29 100755 --- a/src/HYDROData/test_HYDROData_Polyline.cxx +++ b/src/HYDROData/test_HYDROData_Polyline.cxx @@ -14,15 +14,15 @@ void test_HYDROData_Polyline::testPolyline() Handle(HYDROData_Polyline)::DownCast(aDoc->CreateObject(KIND_POLYLINE)); // empty image - int aDim = aPolyline->getDimension(); + int aDim = aPolyline->GetDimension(); CPPUNIT_ASSERT(aDim == 0 ); - aPolyline->setDimension(2); - aDim = aPolyline->getDimension(); + aPolyline->SetDimension(2); + aDim = aPolyline->GetDimension(); CPPUNIT_ASSERT( aDim == 2 ); - aPolyline->setDimension(3); - aDim = aPolyline->getDimension(); + aPolyline->SetDimension(3); + aDim = aPolyline->GetDimension(); CPPUNIT_ASSERT( aDim == 3 ); PolylineSection aSect1; @@ -39,8 +39,8 @@ void test_HYDROData_Polyline::testPolyline() aSect1.myIsClosed = true; aSections << aSect2; - aPolyline->setPolylineData( aSections ); - QList aRestoredSect = aPolyline->getPolylineData(); + aPolyline->SetPolylineData( aSections ); + QList aRestoredSect = aPolyline->GetPolylineData(); int aRestSize = aRestoredSect.size(); CPPUNIT_ASSERT( aRestSize == 2 ); diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt index 7db85c37..d121c61b 100644 --- a/src/HYDROGUI/CMakeLists.txt +++ b/src/HYDROGUI/CMakeLists.txt @@ -41,7 +41,6 @@ set(PROJECT_HEADERS HYDROGUI_PrsZoneDriver.h HYDROGUI_Shape.h HYDROGUI_ShowHideOp.h - HYDROGUI_SplitZonesTool.h HYDROGUI_Tool.h HYDROGUI_TwoImagesDlg.h HYDROGUI_TwoImagesOp.h @@ -91,7 +90,6 @@ set(PROJECT_SOURCES HYDROGUI_PrsZoneDriver.cxx HYDROGUI_Shape.cxx HYDROGUI_ShowHideOp.cxx - HYDROGUI_SplitZonesTool.cxx HYDROGUI_Tool.cxx HYDROGUI_TwoImagesDlg.cxx HYDROGUI_TwoImagesOp.cxx -- 2.39.2