#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Iterator.h>
-#include <HYDROData_Lambert93.h>
-#include <HYDROData_OperationsFactory.h>
#include <HYDROData_Tool.h>
#include <GraphicsView_ViewManager.h>
QPoint aLocalPointA, aLocalPointB, aLocalPointC;
myEditedObject->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
+ // Create the edited image preview presentation in the viewer
onCreatePreview( anImage );
- if( myPreviewPrs )
+ // Set transformation local points A,B,C to the image preview presentation
+ setPresentationTrsfPoints( myPreviewPrs, anIsByTwoPoints, aLocalPointA,
+ aLocalPointB, aLocalPointC );
+
+ // Build the existing image local and global points mapping
+ // according to the current transformation mode.
+ HYDROData_Image::TransformationMode aTrsfMode = myEditedObject->GetTrsfMode();
+ QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
+ HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
+ if ( aTrsfMode == HYDROData_Image::ReferenceImage )
{
- HYDROGUI_PrsImage::TransformationPointMap aPointMap =
- myPreviewPrs->getTransformationPointMap();
- if( !aPointMap.isEmpty() )
+ // Compute global points using the transformation matrix of the reference image
+ Handle(HYDROData_Image) aRefImage = myEditedObject->GetTrsfReferenceImage();
+ if ( !aRefImage.IsNull() )
{
- aPointMap[ HYDROGUI_PrsImage::PointA ].Point = aLocalPointA;
- aPointMap[ HYDROGUI_PrsImage::PointB ].Point = aLocalPointB;
+ QTransform aRefTrsf = aRefImage->Trsf(); // The reference image transformation matrix
+ aTrsfPointA = aRefTrsf.map( aLocalPointA ); // Compute the global point A
+ aTrsfPointB = aRefTrsf.map( aLocalPointB ); // Compute the global point B
if ( !anIsByTwoPoints )
- aPointMap[ HYDROGUI_PrsImage::PointC ].Point = aLocalPointC;
-
- myPreviewPrs->setTransformationPointMap( aPointMap );
+ {
+ aTrsfPointC = aRefTrsf.map( aLocalPointC ); // Compute the global point C if used
+ }
+ // Build the local-global points map
+ // Use the reference image transformation mode for interpreting global points
+ computeTrsfData( aRefImage->GetTrsfMode(), anIsByTwoPoints, aLocalPointA, aLocalPointB, aLocalPointC,
+ aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
}
}
+ else
+ {
+ // Get global points from the edited image
+ myEditedObject->GetGlobalPoints( aTrsfMode, aTrsfPointA, aTrsfPointB, aTrsfPointC );
+ // Build the local-global points map
+ computeTrsfData( aTrsfMode, anIsByTwoPoints, aLocalPointA, aLocalPointB, aLocalPointC,
+ aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
+ }
- HYDROData_Image::TransformationMode aTrsfMode;
- QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
- myEditedObject->GetGlobalPoints( aTrsfMode,
- aTrsfPointA, aTrsfPointB, aTrsfPointC );
-
- HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
- aDataMap[ HYDROGUI_PrsImage::PointA ] =
- HYDROGUI_ImportImageDlg::ComputeTrsfData( aTrsfMode, aLocalPointA, aTrsfPointA );
- aDataMap[ HYDROGUI_PrsImage::PointB ] =
- HYDROGUI_ImportImageDlg::ComputeTrsfData( aTrsfMode, aLocalPointB, aTrsfPointB );
- if ( !anIsByTwoPoints )
- aDataMap[ HYDROGUI_PrsImage::PointC ] =
- HYDROGUI_ImportImageDlg::ComputeTrsfData( aTrsfMode, aLocalPointC, aTrsfPointC );
-
+ // Initialize the dialog mode, local and global coordinates
+ // except coordinates on the reference image
aPanel->setTransformationMode( aTrsfMode );
aPanel->setTransformationDataMap( aDataMap );
aPanel->setByTwoPoints( anIsByTwoPoints );
- // Set points on reference image
- if ( aTrsfMode = HYDROData_Image::ReferenceImage )
+ // Set points of the reference image
+ if ( aTrsfMode == HYDROData_Image::ReferenceImage )
{
- Handle(HYDROData_Image) aRefImage = myEditedObject->GetTrsfReferenceImage();
+ Handle(HYDROData_Image) aRefImage;
+ myEditedObject->GetReferencePoints( aRefImage,
+ aTrsfPointA, aTrsfPointB, aTrsfPointC );
if ( !aRefImage.IsNull() )
{
aRefImageName = aRefImage->GetName();
+ // Create the reference image presentation in the viewer
onRefImageActivated( aRefImageName );
- if( myRefPreviewPrs )
- {
- HYDROGUI_PrsImage::TransformationPointMap aRefPointMap =
- myRefPreviewPrs->getTransformationPointMap();
- if( !aRefPointMap.isEmpty() )
- {
- aRefPointMap[ HYDROGUI_PrsImage::PointA ].Point = aTrsfPointA.toPoint();
- aRefPointMap[ HYDROGUI_PrsImage::PointB ].Point = aTrsfPointB.toPoint();
- if ( !anIsByTwoPoints )
- aRefPointMap[ HYDROGUI_PrsImage::PointC ].Point = aTrsfPointC.toPoint();
-
- myRefPreviewPrs->setTransformationPointMap( aRefPointMap );
- }
- }
+ // Set transformation points A,B,C to the reference image presentation
+ setPresentationTrsfPoints( myRefPreviewPrs, anIsByTwoPoints, aTrsfPointA.toPoint(),
+ aTrsfPointB.toPoint(), aTrsfPointC.toPoint() );
+
+ // Prepare A, B, C points on the reference image
HYDROGUI_ImportImageDlg::TransformationDataMap aRefDataMap;
- aRefDataMap[ HYDROGUI_PrsImage::PointA ] = HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointA.toPoint() );
- aRefDataMap[ HYDROGUI_PrsImage::PointB ] = HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointB.toPoint() );
+ aRefDataMap[ HYDROGUI_PrsImage::PointA ] =
+ HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointA.toPoint() );
+ aRefDataMap[ HYDROGUI_PrsImage::PointB ] =
+ HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointB.toPoint() );
if ( !anIsByTwoPoints )
- aRefDataMap[ HYDROGUI_PrsImage::PointC ] = HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointC.toPoint() );
+ aRefDataMap[ HYDROGUI_PrsImage::PointC ] =
+ HYDROGUI_ImportImageDlg::TransformationData( aTrsfPointC.toPoint() );
+ // Initialize the dialog's A, B, C points coordinates of the reference image
aPanel->setTransformationDataMap( aRefDataMap, true, true );
}
}
}
}
- // collect information about existing images
+ // Collect information about existing images and initialize the combobox
+ // reference image selector in the dialog.
HYDROGUI_ImportImageDlg::PrsPointDataList aPrsPointDataList;
HYDROData_Iterator anIterator( doc(), KIND_IMAGE );
for( ; anIterator.More(); anIterator.Next() )
aTrsfPointA, aTrsfPointB, aTrsfPointC );
HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
- aDataMap[ HYDROGUI_PrsImage::PointA ] =
- HYDROGUI_ImportImageDlg::ComputeTrsfData( aImgTrsfMode, aLocalPointA, aTrsfPointA );
- aDataMap[ HYDROGUI_PrsImage::PointB ] =
- HYDROGUI_ImportImageDlg::ComputeTrsfData( aImgTrsfMode, aLocalPointB, aTrsfPointB );
- aDataMap[ HYDROGUI_PrsImage::PointC ] =
- HYDROGUI_ImportImageDlg::ComputeTrsfData( aImgTrsfMode, aLocalPointC, aTrsfPointC );
+ computeTrsfData( aImgTrsfMode, false, aLocalPointA, aLocalPointB, aLocalPointC,
+ aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap );
aPrsPointDataList.append( aPrsPointData );
}
}
+ // Initialize the combobox in the dialog with the list of available reference images
aPanel->setPrsPointDataList( aPrsPointDataList );
+ // Select the current reference image in the dialog combobox
aPanel->setRefImageName( aRefImageName );
}
+void HYDROGUI_ImportImageOp::setPresentationTrsfPoints( HYDROGUI_PrsImage* thePrs,
+ bool theIsByTwoPoints,
+ const QPoint theLocalPointA,
+ const QPoint theLocalPointB,
+ const QPoint theLocalPointC )
+{
+ // Set transformation points A,B,C to the image presentation
+ if( thePrs )
+ {
+ HYDROGUI_PrsImage::TransformationPointMap aPointMap =
+ thePrs->getTransformationPointMap();
+ if( !aPointMap.isEmpty() )
+ {
+ aPointMap[ HYDROGUI_PrsImage::PointA ].Point = theLocalPointA;
+ aPointMap[ HYDROGUI_PrsImage::PointB ].Point = theLocalPointB;
+ if ( !theIsByTwoPoints )
+ aPointMap[ HYDROGUI_PrsImage::PointC ].Point = theLocalPointC;
+
+ thePrs->setIsByTwoPoints( theIsByTwoPoints );
+ thePrs->setTransformationPointMap( aPointMap );
+ }
+ }
+}
+
+void HYDROGUI_ImportImageOp::computeTrsfData( HYDROData_Image::TransformationMode theTrsfMode,
+ bool theIsByTwoPoints,
+ const QPoint& theLocalPointA,
+ const QPoint& theLocalPointB,
+ const QPoint& theLocalPointC,
+ const QPointF& theGlobalPointA,
+ const QPointF& theGlobalPointB,
+ const QPointF& theGlobalPointC,
+ HYDROGUI_ImportImageDlg::TransformationDataMap& theDataMap ) const
+{
+ // Build the local-global points map
+ HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
+ theDataMap[ HYDROGUI_PrsImage::PointA ] =
+ HYDROGUI_ImportImageDlg::ComputeTrsfData( theTrsfMode, theLocalPointA, theGlobalPointA );
+ theDataMap[ HYDROGUI_PrsImage::PointB ] =
+ HYDROGUI_ImportImageDlg::ComputeTrsfData( theTrsfMode, theLocalPointB, theGlobalPointB );
+ if ( !theIsByTwoPoints )
+ {
+ theDataMap[ HYDROGUI_PrsImage::PointC ] =
+ HYDROGUI_ImportImageDlg::ComputeTrsfData( theTrsfMode, theLocalPointC, theGlobalPointC );
+ }
+}
+
void HYDROGUI_ImportImageOp::abortOperation()
{
closePreview();
HYDROGUI_InputPanel* HYDROGUI_ImportImageOp::createInputPanel() const
{
HYDROGUI_InputPanel* aPanel = new HYDROGUI_ImportImageDlg( module(), getName() );
- connect( aPanel, SIGNAL( createPreview( QImage ) ),
- this, SLOT( onCreatePreview( QImage ) ) );
- connect( aPanel, SIGNAL( activatePointSelection( int ) ),
- this, SLOT( onActivatePointSelection( int ) ) );
- connect( aPanel, SIGNAL( pointCoordChanged( bool, int, bool, int ) ),
- this, SLOT( onPointCoordChanged( bool, int, bool, int ) ) );
- connect( aPanel, SIGNAL( modeActivated( int ) ),
- this, SLOT( onModeActivated( int ) ) );
+ connect( aPanel, SIGNAL( createPreview( QImage ) ), SLOT( onCreatePreview( QImage ) ) );
+ connect( aPanel, SIGNAL( activatePointSelection( int ) ), SLOT( onActivatePointSelection( int ) ) );
+ connect( aPanel, SIGNAL( pointCoordChanged( bool, int, bool, int ) ),
+ SLOT( onPointCoordChanged( bool, int, bool, int ) ) );
+ connect( aPanel, SIGNAL( modeActivated( int ) ), SLOT( onModeActivated( int ) ) );
connect( aPanel, SIGNAL( refImageActivated( const QString& ) ),
- this, SLOT( onRefImageActivated( const QString& ) ) );
+ SLOT( onRefImageActivated( const QString& ) ) );
+ connect( aPanel, SIGNAL( setCIsUsed( bool ) ), SLOT( onSetCIsUsed( bool ) ) );
return aPanel;
}
+void HYDROGUI_ImportImageOp::onSetCIsUsed( bool theCIsUsed )
+{
+ if ( myPreviewPrs )
+ {
+ myPreviewPrs->setIsByTwoPoints( !theCIsUsed );
+ }
+ if ( myRefPreviewPrs )
+ {
+ myRefPreviewPrs->setIsByTwoPoints( !theCIsUsed );
+ }
+}
+
bool HYDROGUI_ImportImageOp::checkPoints( const QPointF& thePointA,
const QPointF& thePointB,
const QPointF& thePointC,
}
else
{
- if ( aTransformationMode == HYDROData_Image::ManualLambert )
+ if ( aTransformationMode == HYDROData_Image::ManualGeodesic )
{
- aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].LambertPoint;
- aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].LambertPoint;
+ aTrsfPointA = aMap[ HYDROGUI_PrsImage::PointA ].GeodesicPoint;
+ aTrsfPointB = aMap[ HYDROGUI_PrsImage::PointB ].GeodesicPoint;
if ( !anIsByTwoPoints )
- aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].LambertPoint;
+ aTrsfPointC = aMap[ HYDROGUI_PrsImage::PointC ].GeodesicPoint;
}
else
{
anImageObj->SetName( anImageName );
anImageObj->SetImage( myImage );
- anImageObj->SetLocalPoints( aPointA, aPointB, aPointC );
+ anImageObj->SetLocalPoints( aPointA, aPointB, aPointC, false );
if ( aTransformationMode == HYDROData_Image::ReferenceImage )
{
anImageName = myEditedObject->GetName();
}
else
- anImageName = HYDROGUI_Tool::GenerateObjectName( module(), "Image" );
+ anImageName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMAGE_NAME" ) );
aPanel->setImageName( anImageName );
}
}
}
}
- qApp->processEvents();
if( !aViewPort )
return;
// Split views horizontally
if( anApp->desktop()->inherits( "STD_TabDesktop" ) )
{
+ qApp->processEvents();
QtxWorkstack* aWorkstack = ( (STD_TabDesktop*)anApp->desktop() )->workstack();
aViewPort->activateWindow();
aViewPort->show();
const HYDROGUI_PrsImage::TransformationPointMap& aPointMap =
aPrs->getTransformationPointMap();
+
HYDROGUI_PrsImage::TransformationPointMapIterator anIter( aPointMap );
while( anIter.hasNext() )
{
