#include "HYDROGUI_Operations.h"
#include "HYDROGUI_CopyPasteOp.h"
+#include "HYDROGUI_CalculationOp.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_DeleteOp.h"
#include "HYDROGUI_ExportImageOp.h"
#include "HYDROGUI_ImportImageOp.h"
#include "HYDROGUI_ImportBathymetryOp.h"
-#include "HYDROGUI_CalculationOp.h"
+#include "HYDROGUI_ImmersibleZoneOp.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_ObserveImageOp.h"
#include "HYDROGUI_PolylineOp.h"
+#include "HYDROGUI_RemoveImageRefsOp.h"
#include "HYDROGUI_ShowHideOp.h"
-#include "HYDROGUI_SplitZonesTool.h"
+#include "HYDROData_SplitToZonesTool.h"
#include "HYDROGUI_TwoImagesOp.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_UpdateImageOp.h"
#include "HYDROGUI_VisualStateOp.h"
-#include "HYDROGUI_ZoneOp.h"
#include <CAM_Application.h>
createAction( ObserveImageId, "OBSERVE_IMAGE" );
createAction( ExportImageId, "EXPORT_IMAGE" );
createAction( UpdateImageId, "UPDATE_IMAGE" );
+ createAction( RemoveImageRefsId, "REMOVE_IMAGE_REFERENCE" );
createAction( CreatePolylineId, "CREATE_POLYLINE" );
createAction( EditPolylineId, "EDIT_POLYLINE" );
createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "", Qt::CTRL + Qt::Key_B );
- createAction( CreateZoneId, "CREATE_ZONE" );
- createAction( EditZoneId, "EDIT_ZONE" );
+ createAction( CreateImmersibleZoneId, "CREATE_IMMERSIBLE_ZONE" );
+ createAction( EditImmersibleZoneId, "EDIT_IMMERSIBLE_ZONE" );
createAction( CreateCalculationId, "CREATE_CALCULATION" );
createAction( EditCalculationId, "EDIT_CALCULATION" );
createMenu( ImportImageId, aHydroId, -1, -1 );
createMenu( ImportBathymetryId, aHydroId, -1, -1 );
createMenu( CreatePolylineId, aHydroId, -1, -1 );
- createMenu( CreateZoneId, aHydroId, -1, -1 );
+ createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
createMenu( CreateCalculationId, aHydroId, -1, -1 );
createMenu( separator(), aHydroId );
createMenu( FuseImagesId, aHydroId, -1, -1 );
createMenu( CutImagesId, aHydroId, -1, -1 );
createMenu( SplitImageId, aHydroId, -1, -1 );
-
- //ouv: debug
- //createMenu( separator(), aHydroId );
- //createMenu( TestSplitId, aHydroId, -1, -1 );
}
void HYDROGUI_Module::createPopups()
connect( anEditUndo, SIGNAL( triggered( int ) ), this, SLOT( onUndo( int ) ) );
connect( anEditRedo, SIGNAL( triggered( int ) ), this, SLOT( onRedo( int ) ) );
-
- QAction* aTestSplit = new QAction( "Test split", application()->desktop() );
- registerAction( TestSplitId, aTestSplit );
- connect( aTestSplit, SIGNAL( triggered() ), this, SLOT( onTestSplit() ) );
}
void HYDROGUI_Module::updateUndoRedoControls()
case UpdateImageId:
anOp = new HYDROGUI_UpdateImageOp( aModule );
break;
+ case RemoveImageRefsId:
+ anOp = new HYDROGUI_RemoveImageRefsOp( aModule );
+ break;
case CreatePolylineId:
case EditPolylineId:
anOp = new HYDROGUI_PolylineOp( aModule, theId == EditPolylineId );
case ImportBathymetryId:
anOp = new HYDROGUI_ImportBathymetryOp( aModule );
break;
- case CreateZoneId:
- case EditZoneId:
- anOp = new HYDROGUI_ZoneOp( aModule, theId == EditZoneId );
+ case CreateImmersibleZoneId:
+ case EditImmersibleZoneId:
+ anOp = new HYDROGUI_ImmersibleZoneOp( aModule, theId == EditImmersibleZoneId );
break;
case CreateCalculationId:
case EditCalculationId:
return anOp;
}
-
-//-----------------------------------------------------------------------------
-// Test splitting
-//-----------------------------------------------------------------------------
-#include <HYDROData_Iterator.h>
-#include <HYDROGUI_Tool.h>
-void HYDROGUI_Module::onTestSplit()
-{
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( getStudyId() );
-
- aDocument->StartOperation();
-
- HYDROData_SequenceOfObjects aZoneList;
- HYDROData_Iterator anIterator( aDocument, KIND_ZONE );
- for( ; anIterator.More(); anIterator.Next() )
- aZoneList.Append( anIterator.Current() );
-
- HYDROGUI_SplitZonesTool::SplitDataList aSplitDataList =
- HYDROGUI_SplitZonesTool::SplitZones( aZoneList, NULL );
-
- int anIndex = 0;
- HYDROGUI_SplitZonesTool::SplitDataListIterator anIter( aSplitDataList );
- while( anIter.hasNext() )
- {
- const HYDROGUI_SplitZonesTool::SplitData& aSplitData = anIter.next();
- const QPainterPath& aPath = aSplitData.Path;
- const QStringList& aZoneNames = aSplitData.ZoneNames;
-
- Handle(HYDROData_Polyline) aPolyline =
- Handle(HYDROData_Polyline)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) );
- if( !aPolyline.IsNull() )
- {
- aPolyline->SetName( QString( "SplitPolyline_%1" ).arg( ++anIndex ) );
- aPolyline->setDimension( 2 );
-
- QList<PolylineSection> aPolylineData;
- for( int i = 0, n = aPath.elementCount(); i < n; i++ )
- {
- const QPainterPath::Element anElement = aPath.elementAt( i );
- switch( anElement.type )
- {
- case QPainterPath::MoveToElement:
- aPolylineData.append( PolylineSection() );
- break;
- case QPainterPath::LineToElement:
- if( !aPolylineData.isEmpty() )
- {
- PolylineSection& aSection = aPolylineData.last();
- aSection.myCoords << anElement.x;
- aSection.myCoords << anElement.y;
- }
- break;
- case QPainterPath::CurveToElement: // currently not supported
- default:
- break;
- }
- }
- aPolyline->setPolylineData( aPolylineData );
- }
-
- Handle(HYDROData_Zone) aZone =
- Handle(HYDROData_Zone)::DownCast( aDocument->CreateObject( KIND_ZONE ) );
- if( !aZone.IsNull() )
- {
- aZone->SetName( QString( "SplitZone_%1" ).arg( anIndex ) );
- aZone->SetPolyline( aPolyline );
-
- aZone->SetBorderColor( Qt::black );
-
- int aCounter = 0;
- int aR = 0, aG = 0, aB = 0;
- QStringListIterator aZoneNameIter( aZoneNames );
- while( aZoneNameIter.hasNext() )
- {
- const QString& aZoneName = aZoneNameIter.next();
- Handle(HYDROData_Zone) aRefZone = Handle(HYDROData_Zone)::DownCast(
- HYDROGUI_Tool::FindObjectByName( this, aZoneName, KIND_ZONE ) );
- if( !aRefZone.IsNull() )
- {
- QColor aRefColor = aRefZone->GetFillingColor();
- aR += aRefColor.red();
- aG += aRefColor.green();
- aB += aRefColor.blue();
- aCounter++;
- }
- }
- if( aCounter > 0 )
- {
- QColor aFillingColor( aR / aCounter, aG / aCounter, aB / aCounter );
- aZone->SetFillingColor( aFillingColor );
- }
- }
- }
-
- aDocument->CommitOperation();
- update( UF_Model );
-}