X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Tool.cxx;h=7370fa3150755baf2c1dde3169fcd584ee5a335c;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=51404eaed7eb174fdea98388e12def5033e3eca9;hpb=5e9db0468e18202a54d6d0913c6532d7761aa035;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx
index 51404eae..7370fa31 100644
--- a/src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/src/HYDROGUI/HYDROGUI_Tool.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,7 +27,9 @@
 #include <HYDROData_Iterator.h>
 #include <HYDROData_ImmersibleZone.h>
 #include <HYDROData_Tool.h>
+#include <HYDROData_Profile.h>
 
+#include <GeometryGUI.h>
 #include <GEOMBase.h>
 
 #include <GraphicsView_Viewer.h>
@@ -229,7 +227,8 @@ bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& the
          anObjectKind == KIND_STREAM ||
          anObjectKind == KIND_CHANNEL ||
          anObjectKind == KIND_DIGUE ||
-         anObjectKind == KIND_DUMMY_3D
+         anObjectKind == KIND_DUMMY_3D || 
+         anObjectKind == KIND_BATHYMETRY
 #ifdef DEB_GROUPS
          || anObjectKind == KIND_SHAPES_GROUP ||
          anObjectKind == KIND_SPLITTED_GROUP
@@ -692,16 +691,26 @@ QColor HYDROGUI_Tool::GenerateFillingColor( const Handle(HYDROData_Document)& th
 }
 
 QStringList HYDROGUI_Tool::FindExistingObjectsNames( const Handle(HYDROData_Document)& theDoc, 
-                                                     const ObjectKind theObjectKind )
+                                                     const ObjectKind theObjectKind,
+                                                     bool isCheckValidProfile )
 {
   QStringList aNames;
 
   HYDROData_Iterator anIter( theDoc, theObjectKind );
   for ( ; anIter.More(); anIter.Next() ) {
     Handle(HYDROData_Entity) anObject = anIter.Current();
-    if( !anObject.IsNull() ) {
-      aNames.append( anObject->GetName() );
+
+    bool isOK = !anObject.IsNull();
+    
+    if( isOK && isCheckValidProfile )
+    {
+      Handle_HYDROData_Profile aProfile = Handle_HYDROData_Profile::DownCast( anObject );
+      if( !aProfile.IsNull() && !aProfile->IsValid() )
+        isOK = false;
     }
+      
+    if( isOK )
+      aNames.append( anObject->GetName() );
   }
 
   return aNames;
@@ -718,3 +727,86 @@ QString HYDROGUI_Tool::GetCoordinateString( const double theNumber, bool isInLoc
     return QString::number( theNumber, 'f', 2 );
 }
 
+Handle(Image_PixMap) HYDROGUI_Tool::Pixmap( const QImage& theImage )
+{
+    Handle(Image_PixMap) pix;
+    if ( theImage.isNull() || theImage.format() == QImage::Format_Invalid )
+        return pix;
+
+    Handle(Image_PixMap) tmpPix = new Image_PixMap();
+    tmpPix->SetTopDown( false );
+    QImage anImage = theImage.mirrored();
+    if ( !anImage.hasAlphaChannel() && anImage.allGray() )
+    {
+        tmpPix->InitTrash( Image_PixMap::ImgGray, anImage.width(), anImage.height(), anImage.width() );
+        for ( int r = 0; r < anImage.height(); r++ )
+        {
+            Standard_Byte* aRowData = tmpPix->ChangeRow( anImage.height() - r - 1 );
+            for  ( int p = 0; p < anImage.width(); p++ )
+                aRowData[p] = qRed( anImage.pixel( p, r ) );
+        }
+    }
+    else
+    {
+        Image_PixMap::ImgFormat aFormat;
+        if ( anImage.hasAlphaChannel() )
+        {
+            if ( anImage.format() != QImage::Format_ARGB32 )
+                anImage = anImage.convertToFormat( QImage::Format_ARGB32 );
+            aFormat = Image_PixMap::ImgRGBA;
+        }
+        else
+        {
+            if ( anImage.format() != QImage::Format_RGB888 )
+                anImage = anImage.convertToFormat( QImage::Format_RGB888 );
+            aFormat = Image_PixMap::ImgRGB;
+        }
+
+        tmpPix->InitWrapper( aFormat, (Standard_Byte*)anImage.bits(), anImage.width(), anImage.height(), anImage.bytesPerLine() );
+    }
+
+    if ( !tmpPix.IsNull() )
+    {
+        pix = new Image_PixMap();
+        pix->InitCopy( *tmpPix.operator->() );
+        pix->SetTopDown( tmpPix->IsTopDown() );
+    }
+
+    return pix;
+}
+
+void HYDROGUI_Tool::DeleteGeomObjects( HYDROGUI_Module* theModule, const QStringList& theEntries )
+{
+  QStringList anEntryList;
+
+  // Get active SalomeApp_Study
+  SalomeApp_Study* aStudy = NULL;
+  if ( theModule && theModule->getApp() ) {
+    aStudy = dynamic_cast<SalomeApp_Study*>( theModule->getApp()->activeStudy() );
+  }
+  if ( !aStudy ) {
+    return;
+  }
+ 
+  // Get GEOM engine
+  GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen();
+  if ( aGeomEngine->_is_nil() ) {
+    return;
+  }
+  
+  // Delete GEOM objects
+  _PTR(StudyBuilder) aStudyBuilder( aStudy->studyDS()->NewBuilder() );
+  foreach ( const QString anEntry, theEntries ) {
+    _PTR(SObject) aSObject( aStudy->studyDS()->FindObjectID( qPrintable(anEntry) ) );
+    if ( aSObject ) {
+      GEOM::GEOM_Object_var aGeomObj = 
+        GEOMBase::GetObjectFromIOR( aSObject->GetIOR().c_str() );
+
+      if ( !aGeomObj->_is_nil() ) {
+        aGeomEngine->RemoveObject( aGeomObj );
+      }
+
+      aStudyBuilder->RemoveObject( aSObject );
+    }
+  }
+}
\ No newline at end of file