connect( anApp, SIGNAL( operationFinished( const QString&, const QString&, const QStringList& ) ),
this, SLOT( onExternalOperationFinished( const QString&, const QString&, const QStringList& ) ) );
+ HYDROGUI_Tool::setOCCActionShown( this, OCCViewer_ViewWindow::MaximizedId, false );
+
return aRes;
}
myObjectStateMap.clear();
myShapesMap.clear();
+ myVTKPrsMap.clear();
// clear the data model's list of copying objects
HYDROGUI_DataModel::changeCopyingObjects( HYDROData_SequenceOfObjects() );
disconnect( getApp(), SIGNAL( operationFinished( const QString&, const QString&, const QStringList& ) ),
this, SLOT( onExternalOperationFinished( const QString&, const QString&, const QStringList& ) ) );
+ HYDROGUI_Tool::setOCCActionShown( this, OCCViewer_ViewWindow::MaximizedId, true );
+
return LightApp_Module::deactivateModule( theStudy );
}
bool anIsSplittedImage = false;
bool anIsMustBeUpdatedImage = false;
bool anIsPolyline = false;
+ bool anIsProfile = false;
+ bool anAllAreProfiles = false;
bool anIsBathymetry = false;
bool anIsCalculation = false;
bool anIsImmersibleZone = false;
// check the selected data model objects
HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( this );
+ int aNbOfSelectedProfiles = 0;
for( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ )
{
Handle(HYDROData_Entity) anObject = aSeq.Value( anIndex );
Handle(HYDROData_Image) anImage = Handle(HYDROData_Image)::DownCast( anObject );
if( !anImage.IsNull() )
{
- anIsImportedImage = anImage->HasLocalPoints() && !anImage->IsSelfSplitted();
+ anIsImportedImage = anImage->HasLocalPoints();
anIsImageHasRefs = anImage->HasReferences();
if( HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory() )
{
}
}
}
- else if( anObject->GetKind() == KIND_POLYLINE )
+ else if( anObject->GetKind() == KIND_POLYLINEXY )
anIsPolyline = true;
+ else if( anObject->GetKind() == KIND_PROFILE ) {
+ anIsProfile = true;
+ aNbOfSelectedProfiles++;
+ }
else if( anObject->GetKind() == KIND_CALCULATION )
anIsCalculation = true;
else if( anObject->GetKind() == KIND_IMMERSIBLE_ZONE )
anIsGeomObject = HYDROData_Tool::IsGeometryObject( anObject );
}
+ // Check if all selected objects are profiles
+ anAllAreProfiles = ( aNbOfSelectedProfiles > 0 ) &&
+ ( aNbOfSelectedProfiles == aSeq.Length() );
+
// check the selected partitions
if( !anIsSelectedDataObjects && anIsObjectBrowser )
{
case KIND_IMAGE:
theMenu->addAction( action( ImportImageId ) );
break;
- case KIND_POLYLINE:
+ case KIND_POLYLINEXY:
theMenu->addAction( action( CreatePolylineId ) );
break;
+ case KIND_PROFILE:
+ theMenu->addAction( action( CreateProfileId ) );
+ theMenu->addAction( action( ImportProfilesId ) );
+ theMenu->addAction( action( AllGeoreferencementId ) );
+ break;
case KIND_VISUAL_STATE:
theMenu->addAction( action( SaveVisualStateId ) );
break;
theMenu->addAction( action( EditPolylineId ) );
theMenu->addSeparator();
}
+ else if( anIsProfile )
+ {
+ theMenu->addAction( action( EditProfileId ) );
+ theMenu->addAction( action( SelectedGeoreferencementId ) );
+ theMenu->addSeparator();
+ }
else if( anIsCalculation )
{
theMenu->addAction( action( EditCalculationId ) );
}
}
+ if ( anAllAreProfiles ) {
+ theMenu->addAction( action( SelectedGeoreferencementId ) );
+ theMenu->addSeparator();
+ }
+
theMenu->addAction( action( DeleteId ) );
theMenu->addSeparator();
return;
// Compute the new global Z range from the added presentation and the old global Z range.
- double* aGlobalRange = getVTKDisplayer()->GetZRange();
+ double* aGlobalRange = getVTKDisplayer()->GetZRange( theViewId );
double* aRange = theShape->getInternalZRange();
bool anIsUpdate = false;
if ( aRange[0] < aGlobalRange[0] )
//if ( anIsUpdate )
//{
- updateVTKZRange( aGlobalRange );
+ updateVTKZRange( theViewId, aGlobalRange );
//}
ListOfVTKPrs& aViewShapes = myVTKPrsMap[ theViewId ];
// Invalidate global Z range
double anInvalidRange[2] = { HYDROGUI_VTKPrs::InvalidZValue(), HYDROGUI_VTKPrs::InvalidZValue() };
- getVTKDisplayer()->SetZRange( anInvalidRange );
+ getVTKDisplayer()->SetZRange( theViewId, anInvalidRange );
}
void HYDROGUI_Module::removeViewVTKPrs( const int theViewId )
myVTKPrsMap.remove( theViewId );
}
-void HYDROGUI_Module::updateVTKZRange( double theRange[] )
+void HYDROGUI_Module::updateVTKZRange( const int theViewId, double theRange[] )
{
- // For all VTK viewers ...
- QList<int> aViewIdList = myVTKPrsMap.keys();
- foreach( int aViewId, aViewIdList )
+ if ( myVTKPrsMap.contains( theViewId ) )
{
- // ... update all VTK presentations ...
- const ListOfVTKPrs& aViewShapes = myVTKPrsMap.value( aViewId );
+ // For the given viewer id update all VTK presentations ...
+ const ListOfVTKPrs& aViewShapes = myVTKPrsMap.value( theViewId );
HYDROGUI_VTKPrs* aShape;
for ( int i = 0, n = aViewShapes.length(); i < n; ++i )
{
}
}
// ... and update the global color legend scalar bar.
- getVTKDisplayer()->SetZRange( theRange );
+ getVTKDisplayer()->SetZRange( theViewId, theRange );
}
/////////////////// END OF VTKPrs PROCESSING
removeViewShapes( (size_t)anOCCViewer );
}
+ if ( getVTKDisplayer()->IsApplicable( theViewManager ) )
+ {
+ SVTK_Viewer* aVTKViewer = getVTKViewer( anId );
+ if ( aVTKViewer )
+ {
+ getVTKDisplayer()->DeleteScalarBar( anId );
+ removeViewShapes( (size_t)aVTKViewer );
+ }
+ }
+
myViewManagerMap.remove( anId );
}
}
if( OCCViewer_ViewFrame* aViewFrame = dynamic_cast<OCCViewer_ViewFrame*>( theViewWindow ) )
{
aViewFrame->onTopView();
+
+ HYDROGUI_Tool::setOCCActionShown( aViewFrame, OCCViewer_ViewWindow::MaximizedId, false );
}
}
}