#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include <HYDROGUI_ShapeImage.h>
#include <HYDROGUI_ShapeBathymetry.h>
+#include <HYDROGUI_ShapeLandCoverMap.h>
#include "HYDROGUI_Operation.h"
#include "HYDROGUI_DataObject.h"
#include "HYDROGUI_ZLayers.h"
+#include "HYDROGUI_Polyline.h"
#include <HYDROData_Bathymetry.h>
-#include <HYDROData_LandCover.h>
+#include <HYDROData_Image.h>
+#include <HYDROData_LandCoverMap.h>
#include <HYDROData_StricklerTable.h>
#include <AIS_InteractiveContext.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <AIS_ListOfInteractive.hxx>
-
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
#include <TColStd_SequenceOfInteger.hxx>
module()->removeObjectShape( (size_t)aViewer, anObj );
}
aViewer->update();
- UpdateColorScale( aViewer );
+ if ( !module()->isLandCoversScalarMapModeOn( (size_t)aViewer ) ) {
+ UpdateColorScale( aViewer );
+ }
}
HYDROGUI_Shape* HYDROGUI_OCCDisplayer::createShape( const int theViewerId,
return aResShape;
if( theObject->IsKind( STANDARD_TYPE( HYDROData_Image ) ) )
- aResShape = new HYDROGUI_ShapeImage( theContext, Handle_HYDROData_Image::DownCast( theObject ) );
+ aResShape = new HYDROGUI_ShapeImage( theContext, Handle(HYDROData_Image)::DownCast( theObject ) );
else if( theObject->IsKind( STANDARD_TYPE( HYDROData_Bathymetry ) ) )
- aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle_HYDROData_Bathymetry::DownCast( theObject ) );
+ aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle(HYDROData_Bathymetry)::DownCast( theObject ) );
+ else if( theObject->IsKind( STANDARD_TYPE( HYDROData_LandCoverMap ) ) ) {
+ bool isScalarMode = module()->isLandCoversScalarMapModeOn( theViewerId );
+ aResShape = new HYDROGUI_ShapeLandCoverMap( this, theContext, Handle(HYDROData_LandCoverMap)::DownCast( theObject ), -1, isScalarMode );
+ }
else
aResShape = new HYDROGUI_Shape( theContext, theObject );
}
}
else if ( !aCtx.IsNull() ) { // TODO: determine if this code is necessary (added as a fix for issue# 359)
- aCtx->UpdateSelected();
+ aCtx->UpdateSelected(true);
}
UpdateColorScale( aViewer );
if ( !anOwnerObj.IsNull() && anOwnerObj->IsRemoved() )
module()->removeObjectShape( (size_t)aViewer, anOwnerObj );
}
+ UpdateColorScale( aViewer );
}
QString HYDROGUI_OCCDisplayer::GetType() const
HYDROGUI_Shape* anObjShape = module()->getObjectShape( aViewerId, theObject );
// Set Z layer
- if ( anObjShape ) {
- aCtx->SetZLayer( anObjShape->getAISObject(), theZLayerId );
+ if ( anObjShape )
+ {
+ QList<Handle(AIS_InteractiveObject)> shapes = anObjShape->getAISObjects();
+ foreach( Handle(AIS_InteractiveObject) shape, shapes )
+ aCtx->SetZLayer( shape, theZLayerId );
}
}
void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer )
{
- if( !myToUpdateColorScale )
+ if( !myToUpdateColorScale || !theViewer )
return;
OCCViewer_ViewWindow* aWnd = dynamic_cast<OCCViewer_ViewWindow*>( theViewer->getViewManager()->getActiveView() );
Handle(V3d_View) aView = aWnd->getViewPort()->getView();
-
+
+
+ HYDROGUI_Module* aModule = module();
int aViewerId = (size_t)theViewer;//TODO: check if viewer id is correct
- bool isLandCoverColoringOn = module()->isLandCoversScalarMapModeOn( aViewerId );
+ bool isLandCoverColoringOn = aModule->isLandCoversScalarMapModeOn( aViewerId );
- QList<HYDROGUI_Shape*> aLandCoverShapes = module()->getObjectShapes( aViewerId, KIND_LAND_COVER );
- QList<HYDROGUI_Shape*> aBathShapes = module()->getObjectShapes( aViewerId, KIND_BATHYMETRY );
-
- bool isDisplayColorScale = !aBathShapes.empty() || isLandCoverColoringOn;
- Standard_Real anXPos = 0.05; //TODO
- Standard_Real anYPos = 0.1; //TODO
- Standard_Real aWidth = 0.2; //TODO
- Standard_Real aHeight = 0.5; //TODO
- Standard_Integer aTextHeight = 14; //TODO
- Standard_Integer aNbIntervals = 20; //TODO
- TCollection_ExtendedString aColorScaleTitle = "";//TODO
+ QList<HYDROGUI_Shape*> aLandCoverMapShapes = aModule->getObjectShapes( aViewerId, KIND_LAND_COVER_MAP );
+ QList<HYDROGUI_Shape*> aBathShapes = aModule->getObjectShapes( aViewerId, KIND_BATHYMETRY );
+ bool isDisplayColorScale = false;
+ foreach (HYDROGUI_Shape* shape, aLandCoverMapShapes)
+ {
+ if (aModule->isObjectVisible(aViewerId, shape->getObject()))
+ {
+ isDisplayColorScale = true;
+ break;
+ }
+ }
+ if (!isDisplayColorScale)
+ foreach (HYDROGUI_Shape* shape, aBathShapes)
+ {
+ if (aModule->isObjectVisible(aViewerId, shape->getObject()))
+ {
+ isDisplayColorScale = true;
+ break;
+ }
+ }
+
Standard_Real aColorScaleMin = 0, aColorScaleMax = 1;
// Get range
Handle(HYDROData_StricklerTable) aTable;
- TColStd_SequenceOfExtendedString aTableTypes;
+ QStringList aTableTypes;
if ( isLandCoverColoringOn ) {
aTable = module()->getLandCoverColoringTable( aViewerId );
if ( !aTable.IsNull() ) {
- aColorScaleTitle = TCollection_ExtendedString( aTable->GetName().toLatin1().constData() );
+ // TODO: non-empty title leads to buggy behaviour
+ // aColorScaleTitle = TCollection_ExtendedString( aTable->GetName().toLatin1().constData() );
aTable->GetCoefficientRange( aColorScaleMin, aColorScaleMax );
aTableTypes = aTable->GetTypes();
}
}
}
- Handle(Aspect_ColorScale) aColorScale;
+ Handle(AIS_ColorScale) aColorScale = GetColorScale( aViewerId );
+ Handle(AIS_InteractiveContext) aCtx = theViewer->getAISContext();
if( isDisplayColorScale )
{
- aColorScale = aView->ColorScale();
if( !aColorScale.IsNull() )
{
- aColorScale->SetXPosition( anXPos );
- aColorScale->SetYPosition( anYPos );
- aColorScale->SetWidth( aWidth );
- aColorScale->SetHeight( aHeight );
-
- aColorScale->SetTextHeight( aTextHeight );
- aColorScale->SetNumberOfIntervals( aNbIntervals );
-
+ // Set color scale title
+ TCollection_ExtendedString aColorScaleTitle = ""; //TODO
aColorScale->SetTitle( aColorScaleTitle );
+
+ // Set color scale range
aColorScale->SetRange( aColorScaleMin, aColorScaleMax );
+
+ aColorScale->SetToUpdate();
if ( !isLandCoverColoringOn ) {
foreach( HYDROGUI_Shape* aShape, aBathShapes ) {
aBathShape->UpdateWithColorScale( aColorScale );
}
}
+
+ if ( !aCtx.IsNull()/* && !aCtx->IsDisplayed( aColorScale ) */) {
+ if ( !aCtx->IsDisplayed( aColorScale ) ) {
+ aCtx->Display( aColorScale, Standard_False );
+ }
+
+ aCtx->Update( aColorScale, true );
+ }
}
- if( !aView->ColorScaleIsDisplayed() )
- aView->ColorScaleDisplay();
}
else
{
- if( aView->ColorScaleIsDisplayed() )
- aView->ColorScaleErase();
+ if ( !aCtx.IsNull() && aCtx->IsDisplayed( aColorScale ) ) {
+ aCtx->Erase( aColorScale, true );
+ }
}
- bool isScaleColoringOn = isDisplayColorScale && !aColorScale.IsNull();
- foreach( HYDROGUI_Shape* aShape, aLandCoverShapes ) {
- if ( !aShape || !aShape->isVisible() ) {
+ foreach( HYDROGUI_Shape* aShape, aLandCoverMapShapes ) {
+ HYDROGUI_ShapeLandCoverMap* aLandCoverMapShape =
+ dynamic_cast<HYDROGUI_ShapeLandCoverMap*>( aShape );
+
+ if ( !aLandCoverMapShape || !aLandCoverMapShape->isVisible() ) {
continue;
}
+
+ Handle(HYDROData_LandCoverMap) aLandCoverMap =
+ Handle(HYDROData_LandCoverMap)::DownCast( aLandCoverMapShape->getObject() );
- Handle(HYDROData_LandCover) aLandCover =
- Handle(HYDROData_LandCover)::DownCast( aShape->getObject() );
-
- if ( aLandCover.IsNull() ) {
+ if ( aLandCoverMap.IsNull() ) {
continue;
}
-
- QColor aUndefinedColor( Qt::gray );
- QColor aColor = isLandCoverColoringOn ? aUndefinedColor : aLandCover->GetFillingColor();
- if ( isLandCoverColoringOn && !aTable.IsNull() ) {
- TCollection_ExtendedString aStricklerType =
- aLandCover->GetStricklerType().toLatin1().constData();
-
- if ( aTable->HasType( aStricklerType ) ) {
- double aStricklerCoeff = aTable->Get( aStricklerType, 0 );
- Quantity_Color aShapeColor;
- if ( aColorScale->FindColor( aStricklerCoeff, aShapeColor ) ) {
- aColor = QColor( aShapeColor.Red() * 255,
- aShapeColor.Green() * 255,
- aShapeColor.Blue() * 255 );
- }
- }
+ bool isScalarMode = aLandCoverMapShape->isScalarMapModeEnabled();
+ if( isScalarMode != isLandCoverColoringOn )
+ {
+ aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn );
+ theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObjects()[0], Standard_False );
}
+ }
+
+ myToUpdateColorScale = false;
+}
+
+Handle(AIS_ColorScale) HYDROGUI_OCCDisplayer::GetColorScale( const int theViewerId )
+{
+ Handle(AIS_ColorScale) aColorScale;
+
+ aColorScale = myColorScales.value( theViewerId, aColorScale );
+ if ( aColorScale.IsNull() ) {
+ // Create color scale
+ aColorScale = new AIS_ColorScale();
+
+ // Set properties
+ Standard_Integer anXPos = 50; //TODO
+ Standard_Integer anYPos = 100; //TODO
+ Standard_Integer aWidth = 100; //TODO
+ Standard_Integer aHeight = 350; //TODO
- //@MZN aShape->update( false, false );
- aShape->setFillingColor( aColor, true, true );
+ Standard_Integer aTextHeight = 14; //TODO
+ Standard_Integer aNbIntervals = 20; //TODO
+
+ aColorScale->SetTransformPersistence( Graphic3d_TMF_2d, gp_Pnt( -1, -1, 0 ) );
+
+ aColorScale->SetXPosition( anXPos );
+ aColorScale->SetYPosition( anYPos );
+ aColorScale->SetSize( aWidth, aHeight );
+
+ aColorScale->SetTextHeight( aTextHeight );
+ aColorScale->SetNumberOfIntervals( aNbIntervals );
+
+ // Put into the map
+ myColorScales.insert( theViewerId, aColorScale );
}
- myToUpdateColorScale = false;
+ return aColorScale;
+}
+
+void HYDROGUI_OCCDisplayer::UpdatePolylines( int theViewerId, int theType, int theSize )
+{
+ OCCViewer_Viewer* aViewer = module()->getOCCViewer( theViewerId );
+ if( !aViewer )
+ return;
+
+ // Get interactive context
+ Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+ if( aCtx.IsNull() )
+ return;
+
+ AIS_ListOfInteractive objs;
+ aCtx->DisplayedObjects( objs );
+ AIS_ListOfInteractive::const_iterator it = objs.begin(), last = objs.end();
+ for( ; it!=last; it++ )
+ {
+ Handle(HYDROGUI_Arrow) arr = Handle(HYDROGUI_Arrow)::DownCast( *it );
+ if( !arr.IsNull() )
+ {
+ if( theType>=0 )
+ arr->SetType( (HYDROGUI_Arrow::Type)theType );
+ if( theSize>=0 )
+ arr->SetSize( theSize );
+ aCtx->Redisplay( arr, Standard_False );
+ }
+ }
+ aCtx->UpdateCurrentViewer();
}
