bool anIsZone = false;
bool anIsObstacle = false;
bool anIsStricklerTable = false;
- bool anIsLandCover = false;
+ bool anIsLandCoverMap = false;
bool anIsStream = false;
bool anIsChannel = false;
bool anIsDigue = false;
anIsVisibleInSelection |= aVisibility;
anIsHiddenInSelection |= !aVisibility;
- if ( anObject->CanBeUpdated() && anObject->IsMustBeUpdated() )
+ if ( anObject->CanBeUpdated() && anObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
{
anIsMustObjectBeUpdated = true;
}
anIsObstacle = true;
else if( anObjectKind == KIND_STRICKLER_TABLE )
anIsStricklerTable = true;
- else if( anObjectKind == KIND_LAND_COVER )
- anIsLandCover = true;
+ else if( anObjectKind == KIND_LAND_COVER_MAP )
+ anIsLandCoverMap = true;
else if( anObjectKind == KIND_STREAM )
{
anIsStream = true;
case KIND_STRICKLER_TABLE:
theMenu->addAction( action( ImportStricklerTableFromFileId ) );
break;
- case KIND_LAND_COVER:
- theMenu->addAction( action( CreateLandCoverId ) );
+ case KIND_LAND_COVER_MAP:
+ theMenu->addAction( action( CreateLandCoverMapId ) );
+ theMenu->addAction( action( ImportLandCoverMapId ) );
break;
case KIND_CALCULATION:
theMenu->addAction( action( CreateCalculationId ) );
break;
case KIND_POLYLINEXY:
+ theMenu->addAction( action( ImportPolylineId ) );
theMenu->addAction( action( CreatePolylineId ) );
break;
case KIND_POLYLINE:
{
theMenu->addAction( action( EditPolylineId ) );
theMenu->addSeparator();
+ theMenu->addAction( action( SplitPolylinesId ) );
+ theMenu->addAction( action( MergePolylinesId ) );
+ theMenu->addSeparator();
}
else if( anIsPolyline3D )
{
theMenu->addAction( action( DuplicateStricklerTableId ) );
theMenu->addSeparator();
- if ( !isLandCoversScalarMapModeOn( anActiveViewId ) &&
- !getObjectShapes( anActiveViewId, KIND_LAND_COVER ).isEmpty() ) {
+ Handle(HYDROData_StricklerTable) aTable =
+ Handle(HYDROData_StricklerTable)::DownCast( aSeq.First() );
+ QString aCurrentTable =
+ HYDROGUI_DataObject::dataObjectEntry( getLandCoverColoringTable( anActiveViewId ) );
+ bool isUsed = aCurrentTable == HYDROGUI_DataObject::dataObjectEntry( aTable );
+
+ if ( !isUsed && !getObjectShapes( anActiveViewId, KIND_LAND_COVER_MAP ).isEmpty() ) {
theMenu->addAction( action( LandCoverScalarMapModeOnId ) );
theMenu->addSeparator();
}
}
- else if( anIsLandCover )
+ else if( anIsLandCoverMap )
{
- theMenu->addAction( action( EditLandCoverId ) );
+ theMenu->addAction( action( AddLandCoverId ) );
+ theMenu->addAction( action( RemoveLandCoverId ) );
+ theMenu->addSeparator();
+ theMenu->addAction( action( SplitLandCoverId ) );
+ theMenu->addAction( action( MergeLandCoverId ) );
theMenu->addSeparator();
}
else if( anIsVisualState && anIsObjectBrowser )
theMenu->addSeparator();
}
+ if ( anIsStream || anIsChannel || anIsDigue || anIsObstacle )
+ {
+ theMenu->addAction( action( PolylineExtractionId ) );
+ theMenu->addSeparator();
+ }
+
// Add set color action for geometrical objects
if ( anIsObjectCanBeColored )
{
theMenu->addSeparator();
}
- if (anIsPolyline || anIsPolyline3D)
- theMenu->addAction( action( ExportPolylineId ) );
+ bool anIsPoly = anIsPolyline || anIsPolyline3D;
+ if ((anIsPoly && !anIsLandCoverMap) || (!anIsPoly && anIsLandCoverMap))
+ theMenu->addAction( action( ExportToShapeFileID ) );
// Add copy action
QAction* aCopyAction = action( CopyId );
anIsImmersibleZone || anIsZone || anIsRegion ||
anIsBathymetry || anIsObstacle || anIsStream ||
anIsChannel || anIsDigue || anIsDummyObject3D ||
- anIsValidProfile || anIsGroup || anIsLandCover )
+ anIsValidProfile || anIsGroup || anIsLandCoverMap )
{
if( anIsHiddenInSelection )
theMenu->addAction( action( ShowId ) );
setPreferenceProperty( defaultStricklerCoef, "step", 0.01 );
}
+void HYDROGUI_Module::preferencesChanged( const QString& theSection, const QString& thePref )
+{
+ if ( theSection == "preferences" && thePref == "default_strickler_coefficient" )
+ {
+ SUIT_ResourceMgr* resMgr = application()->resourceMgr();
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( application()->activeStudy()->id() );
+ if ( resMgr && !aDoc.IsNull() )
+ aDoc->SetDefaultStricklerCoefficient( resMgr->doubleValue( theSection, thePref, 0 ) );
+ }
+ else
+ LightApp_Module::preferencesChanged( theSection, thePref );
+}
+
QCursor HYDROGUI_Module::getPrefEditCursor() const
{
int aCursorType = SUIT_Session::session()->resourceMgr()->integerValue("preferences", "type_of_cursor", (int)CT_CrossCursor );
if ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
setLandCoversScalarMapModeOff( theViewId );
- } else if ( theObject->GetKind() == KIND_LAND_COVER && theState ) {
+ } else if ( theObject->GetKind() == KIND_LAND_COVER_MAP && theState ) {
getOCCDisplayer()->SetToUpdateColorScale();
}
}
}
/////////////////// END OF VTKPrs PROCESSING
+void HYDROGUI_Module::clearCache()
+{
+ myObjectStateMap.clear();
+}
+
CAM_DataModel* HYDROGUI_Module::createDataModel()
{
return new HYDROGUI_DataModel( this );
{
return myLandCoverColoringMap.contains( theViewId );
}
+
+void HYDROGUI_Module::setObjectRemoved( const Handle(HYDROData_Entity)& theObject )
+{
+ if ( theObject.IsNull() || !theObject->IsRemoved() ) {
+ return;
+ }
+
+ if ( theObject->GetKind() == KIND_STRICKLER_TABLE ) {
+ Handle(HYDROData_StricklerTable) aTable =
+ Handle(HYDROData_StricklerTable)::DownCast( theObject );
+ QList<int> aViewIds;
+ QMutableMapIterator<int, Handle(HYDROData_StricklerTable)> anIter( myLandCoverColoringMap );
+ while ( anIter.hasNext() ) {
+ if ( HYDROGUI_DataObject::dataObjectEntry( anIter.next().value() ) ==
+ HYDROGUI_DataObject::dataObjectEntry( aTable ) ) {
+ anIter.remove();
+ }
+ }
+ }
+}