-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 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
// 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
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
+#include "HYDROGUI_DataObject.h"
#include <HYDROData_Bathymetry.h>
#include <HYDROData_Iterator.h>
#include <SUIT_Desktop.h>
#include <TopoDS.hxx>
+#include <TopoDS_Face.hxx>
#include <TopoDS_Wire.hxx>
#include <QApplication>
}
}
- // collect information about existing closed polylines
- QStringList aPolylines;
-
- HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
- for ( ; anIter.More(); anIter.Next() )
- {
- Handle(HYDROData_PolylineXY) aPolylineObj =
- Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
- if ( aPolylineObj.IsNull() )//TODO: || !aPolylineObj->IsClosed() )
- continue;
-
- QString aPolylineName = aPolylineObj->GetName();
- if ( aPolylineName.isEmpty() )
- continue;
-
- aPolylines.append( aPolylineName );
- }
-
- // collect information about existing bathymetries
- QStringList aBathymetries;
-
- anIter = HYDROData_Iterator( doc(), KIND_BATHYMETRY );
- for ( ; anIter.More(); anIter.Next() )
- {
- Handle(HYDROData_Bathymetry) aBathymetryObj =
- Handle(HYDROData_Bathymetry)::DownCast( anIter.Current() );
- if ( aBathymetryObj.IsNull() )
- continue;
-
- QString aBathymetryName = aBathymetryObj->GetName();
- if ( aBathymetryName.isEmpty() )
- continue;
-
- aBathymetries.append( aBathymetryName );
- }
-
aPanel->setObjectName( anObjectName );
-
- aPanel->setPolylineNames( aPolylines );
- aPanel->setBathymetryNames( aBathymetries );
+ aPanel->setPolylineNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_POLYLINEXY ) );
+ aPanel->setBathymetryNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_BATHYMETRY ) );
aPanel->blockSignals( false );
}
bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_ImmersibleZoneDlg* aPanel = ::qobject_cast<HYDROGUI_ImmersibleZoneDlg*>( inputPanel() );
if ( !aPanel )
closePreview();
if( !myIsEdit )
+ {
module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aZoneObj, true );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aZoneObj );
+ theBrowseObjectsEntries.append( anEntry );
+ }
module()->setIsToUpdate( aZoneObj );
TopoDS_Face aFace;
if( !aZoneShape.IsNull() )
aFace = TopoDS::Face( aZoneShape );
- myPreviewPrs->setFace( aFace );
+ myPreviewPrs->setFace( aFace, true, true, "" );
}
QApplication::restoreOverrideCursor();