From: asl <asl@opencascade.com>
Date: Mon, 22 Jun 2015 05:40:39 +0000 (+0300)
Subject: patch for correct calculation
X-Git-Tag: v1.4.2~52
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=47ff6619fbd74f5f9ad7f22b3f460c07dbf49f63;p=modules%2Fhydro.git

patch for correct calculation
---

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index ede72aa4..ecb496c2 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -56,7 +56,6 @@ HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool
   myIsEdit( theIsEdit ),
   myActiveViewManager( NULL ),
   myPreviewViewManager( NULL ),
-  myShowGeomObjects( true ),
   myShowZones( false )
 {
   setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) );
@@ -957,8 +956,6 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
 
     QApplication::setOverrideCursor( Qt::WaitCursor );
 
-    setGeomObjectsVisible( false );
-  
     QString aNewCaseName = aPanel->getObjectName();
     QString anOldCaseName = myEditedObject->GetName();
     bool isNameChanged = anOldCaseName != aNewCaseName;
@@ -1174,17 +1171,6 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible, const bool theL
 }
 
 void HYDROGUI_CalculationOp::AssignDefaultZonesColors( const bool theLandCover )
-{
-  myShowGeomObjects = theIsVisible;
-
-  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
-
-  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
-  for ( ; anIter.More(); anIter.Next() ) {
-    setObjectVisibility( anIter.Value(), theIsVisible );
-  }
-}
-
 {
   HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
   HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
@@ -1321,7 +1307,7 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCover )
     aSeq = myEditedObject->GetLandCovers();
   else
     aSeq = myEditedObject->GetGeometryObjects();
-  }
+
   Handle(HYDROData_Entity) anEntity;
 
   if ( myShowZones )
diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 3c1c9a54..e40a21a2 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -155,7 +155,6 @@ private:
   void                            closePreview( bool theRemoveViewManager = true );
   void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
   void                            setZonesVisible( bool theIsVisible, const bool theLandCover );
-  void                            setGeomObjectsVisible( bool theIsVisible );
   void                            getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
                                                       QStringList& theNames, QStringList& theEntries ) const;
 
@@ -195,7 +194,6 @@ private:
 private:
   bool                            myIsEdit;
   bool                            myShowZones;
-  bool                            myShowGeomObjects;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;