X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Tool.cxx;h=6cc4ae17009cd18d049be5fbea233d8d5a6b88b0;hb=36005df362d7bee6db949b079960cec90333aed2;hp=c4e6b90b58cd43a80c3ec6fd3cc517c42edf1da4;hpb=419118d6b16f91ec37912b242cfe7469a585d16e;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx index c4e6b90b..6cc4ae17 100644 --- a/src/HYDROGUI/HYDROGUI_Tool.cxx +++ b/src/HYDROGUI/HYDROGUI_Tool.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -185,7 +184,7 @@ QString HYDROGUI_Tool::GetTempDir( const bool theToCreate ) #ifdef WNT tmpdir = "C:\\"; #else - tmpdir = "/tmp"; + tmpdir = strdup( "/tmp" ); #endif } aRes = tmpdir; @@ -229,7 +228,7 @@ bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& the anObjectKind == KIND_DIGUE || anObjectKind == KIND_DUMMY_3D || anObjectKind == KIND_BATHYMETRY || - anObjectKind == KIND_LAND_COVER + anObjectKind == KIND_LAND_COVER_MAP #ifdef DEB_GROUPS || anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLITTED_GROUP @@ -364,23 +363,6 @@ HYDROData_SequenceOfObjects HYDROGUI_Tool::GetGeometryObjects( return aResSeq; } -HYDROData_SequenceOfObjects HYDROGUI_Tool::GetLandCovers( HYDROGUI_Module* theModule ) -{ - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() ); - - HYDROData_SequenceOfObjects aResSeq; - - HYDROData_Iterator anIter( aDocument ); - for ( ; anIter.More(); anIter.Next() ) - { - Handle(HYDROData_Entity) anObj = anIter.Current(); - if ( !anObj.IsNull() && anObj->IsKind( STANDARD_TYPE(HYDROData_LandCover) )) - aResSeq.Append( anObj ); - } - - return aResSeq; -} - ObjectKind HYDROGUI_Tool::GetSelectedPartition( HYDROGUI_Module* theModule ) { HYDROGUI_DataModel* aModel = theModule->getDataModel(); @@ -680,7 +662,7 @@ QColor HYDROGUI_Tool::GenerateFillingColor( HYDROGUI_Module* theModule, QColor HYDROGUI_Tool::GenerateFillingColor( const Handle(HYDROData_Document)& theDoc, const QStringList& theZoneNames ) { - QColor aFillingColor( HYDROData_ImmersibleZone::DefaultFillingColor() ); + QColor aFillingColor( Qt::darkBlue ); int aCounter = 0; int aR = 0, aG = 0, aB = 0;