Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportLandCoverMapOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
index 437f84dd4b58f4d0ede044c8d325feb93e57b232..5cb9d9478c73085f4c5aa6accd6cdfabae58dbde 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
@@
-132,7
+132,7
@@
void HYDROGUI_ImportLandCoverMapOp::onFileSelected()
//Import polygons from SHP file as faces
//This faces should be added to the new LCM object
//Import polygons from SHP file as faces
//This faces should be added to the new LCM object
- int aStat = myImporter.ImportPolygons(myFileName, aPolygonsList, myPolygonFaces, aShapeTypeOfFile);
+ int aStat = myImporter.ImportPolygons(
doc(),
myFileName, aPolygonsList, myPolygonFaces, aShapeTypeOfFile);
if (aStat == 1)
{
aPanel->setPolygonNames(aPolygonsList);
if (aStat == 1)
{
aPanel->setPolygonNames(aPolygonsList);
@@
-262,7
+262,7
@@
bool HYDROGUI_ImportLandCoverMapOp::processApply( int& theUpdateFlags,
if ( !aPanel->getFileName().isEmpty() )
anObjName = aPanel->getObjectName();
if ( !aPanel->getFileName().isEmpty() )
anObjName = aPanel->getObjectName();
- Handle
_HYDROData_Document
aDoc = HYDROData_Document::Document( application()->activeStudy()->id() );
+ Handle
(HYDROData_Document)
aDoc = HYDROData_Document::Document( application()->activeStudy()->id() );
//check if name of LCM is already exists
QSet<QString> aNameList;
//check if name of LCM is already exists
QSet<QString> aNameList;
@@
-408,7
+408,7
@@
void HYDROGUI_ImportLandCoverMapOp::onNext( const int theIndex )
//Collect all strickler_types
QSet<QString> aSTSet;
//Collect all strickler_types
QSet<QString> aSTSet;
- Handle
_HYDROData_Document
aDoc = HYDROData_Document::Document( application()->activeStudy()->id() );
+ Handle
(HYDROData_Document)
aDoc = HYDROData_Document::Document( application()->activeStudy()->id() );
Handle(HYDROData_StricklerTable) DefStricklerTableObj;
if ( aDoc )
{
Handle(HYDROData_StricklerTable) DefStricklerTableObj;
if ( aDoc )
{
@@
-495,8
+495,7
@@
void HYDROGUI_ImportLandCoverMapOp::onApply()
}
else
{
}
else
{
- Handle(HYDROData_Entity) LCM = Handle(HYDROData_Entity)::DownCast( myLCM );
- LCM->Remove();
+ myLCM->Remove();
module()->setObjectRemoved( myLCM );
abort();
}
module()->setObjectRemoved( myLCM );
abort();
}