-// 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
#include "HYDROGUI_ImportGeomObjectOp.h"
#include "HYDROGUI_GeomObjectDlg.h"
-
+#include "HYDROGUI_DataObject.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
}
bool HYDROGUI_ImportGeomObjectOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
// Get active SalomeApp_Study
SalomeApp_Study* aStudy =
if ( myOpType == ImportCreatedAsObstacle || myOpType == ImportSelectedAsObstacle ) {
anObject = doc()->CreateObject( KIND_OBSTACLE );
Handle(HYDROData_Obstacle) anObstacle = Handle(HYDROData_Obstacle)::DownCast( anObject );
- anObstacle->SetFillingColor( HYDROData_Obstacle::DefaultFillingColor() );
- anObstacle->SetBorderColor( HYDROData_Obstacle::DefaultBorderColor() );
+ anObstacle->SetFillingColor( anObstacle->DefaultFillingColor() );
+ anObstacle->SetBorderColor( anObstacle->DefaultBorderColor() );
+ anObstacle->SetGeomObjectEntry( anEntry.toLatin1().constData() );
} else if ( myOpType == ImportSelectedAsPolyline ) {
anObject = doc()->CreateObject( KIND_POLYLINEXY );
Handle(HYDROData_PolylineXY) aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anObject );
aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
+ aPolylineObj->SetGeomObjectEntry( anEntry.toLatin1().constData() );
}
} else {
anObject = anObjectToEdit;
anIsOk = true;
} else if ( myOpType == ImportSelectedAsPolyline ) {
Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( anObject );
- anIsOk = aPolyline->ImportShape( aShape );
+ anIsOk = aPolyline->ImportShape( aShape, false, NULL );
/* TODO: check it before start operation
if ( anIsOk && !aPolyline->IsEditable() )
if ( anIsOk ) {
anObject->Update();
module()->setIsToUpdate( anObject );
+ QString aHydroObjEntry = HYDROGUI_DataObject::dataObjectEntry( anObject );
+ theBrowseObjectsEntries.append( aHydroObjEntry );
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
}
}
// Update the default name of the HYDRO object
updateDefaultName();
+
+ // Close the dialog corresponding to the external operation
+ closeExternalOperationDlg();
}
void HYDROGUI_ImportGeomObjectOp::closeExternalOperationDlg()
aTypes << GEOM::WIRE << GEOM::EDGE;
return aTypes;
-}
\ No newline at end of file
+}