//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 ( !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;
return;
int aCurIndex = -1;
- aCurIndex = aPanel->GetCurrentWizardIndex();
+ aCurIndex = aPanel->getCurrentWizardIndex();
if (aCurIndex != 0)
return;
OCCViewer_ViewManager* aViewManager = getPreviewManager();
Handle(AIS_InteractiveContext) aCtx = NULL;
- if ( aViewManager ) {
- if ( OCCViewer_Viewer* aViewer = aViewManager->getOCCViewer() ) {
+ if ( aViewManager )
+ if ( OCCViewer_Viewer* aViewer = aViewManager->getOCCViewer() )
aCtx = aViewer->getAISContext();
- }
- }
if ( !aCtx.IsNull() )
{
//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 )
{
aSTColors.prepend(QColor(Qt::gray));
QVector<int> aCurCBIndices(aSetOfAttrValuesList.size());
- if (DefStricklerTableObj->GetAttrName() == aPanel->getSelectedFieldName())
+ if (DefStricklerTableObj->GetAttrName().trimmed() == aPanel->getSelectedFieldName().trimmed())
for (int i = 0; i < aSetOfAttrValuesList.size(); i++)
{
QString aST = DefStricklerTableObj->GetType(aSetOfAttrValuesList[i]);
void HYDROGUI_ImportLandCoverMapOp::onApply()
{
+ HYDROGUI_ImportLandCoverMapDlg* aPanel = ::qobject_cast<HYDROGUI_ImportLandCoverMapDlg*>( inputPanel() );
+ if ( !aPanel )
+ return;
+
+ if (!aPanel->CheckFirstPageFilling())
+ return;
+
QApplication::setOverrideCursor( Qt::WaitCursor );
int anUpdateFlags = 0;
QString anErrorMsg;
}
else
{
- Handle(HYDROData_Entity) LCM = Handle(HYDROData_Entity)::DownCast( myLCM );
- LCM->Remove();
+ myLCM->Remove();
module()->setObjectRemoved( myLCM );
abort();
}