}
}
- // 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() )
- {
- Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anIterator.Current() );
- if( !anImageObj.IsNull() )
- {
- if( myIsEdit && IsEqual( anImageObj, myEditedObject ) )
- continue;
-
- QPoint aLocalPointA, aLocalPointB, aLocalPointC;
- anImageObj->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
-
- HYDROData_Image::TransformationMode aImgTrsfMode;
- QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
- anImageObj->GetGlobalPoints( aImgTrsfMode,
- aTrsfPointA, aTrsfPointB, aTrsfPointC );
-
- HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
- 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
+ getReferenceDataList( aPrsPointDataList );
aPanel->setPrsPointDataList( aPrsPointDataList );
// Select the current reference image in the dialog combobox
aPanel->setRefImageName( aRefImageName );
}
}
+void HYDROGUI_ImportImageOp::getReferenceDataList(
+ HYDROGUI_ImportImageDlg::PrsPointDataList& theList ) const
+{
+ // Collect information about existing images and initialize the combobox
+ // reference image selector in the dialog.
+ HYDROData_Iterator anIterator( doc(), KIND_IMAGE );
+ for( ; anIterator.More(); anIterator.Next() )
+ {
+ Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anIterator.Current() );
+ if( !anImageObj.IsNull() )
+ {
+ if( myIsEdit && IsEqual( anImageObj, myEditedObject ) )
+ continue;
+
+ QPoint aLocalPointA, aLocalPointB, aLocalPointC;
+ anImageObj->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
+
+ HYDROData_Image::TransformationMode aImgTrsfMode;
+ QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
+ anImageObj->GetGlobalPoints( aImgTrsfMode,
+ aTrsfPointA, aTrsfPointB, aTrsfPointC );
+
+ HYDROGUI_ImportImageDlg::TransformationDataMap aDataMap;
+ computeTrsfData( aImgTrsfMode, false, aLocalPointA, aLocalPointB, aLocalPointC,
+ aTrsfPointA, aTrsfPointB, aTrsfPointC, aDataMap );
+
+ HYDROGUI_ImportImageDlg::PrsPointData aPrsPointData( anImageObj->GetName(), aDataMap );
+ theList.append( aPrsPointData );
+ }
+ }
+}
+
void HYDROGUI_ImportImageOp::computeTrsfData( HYDROData_Image::TransformationMode theTrsfMode,
bool theIsByTwoPoints,
const QPoint& theLocalPointA,
if( myPreviewPrs ) // if the image is changed by choosing another file
{
- myPreviewPrs->setImage( myImage );
- myPreviewPrs->compute();
-
+ myPreviewPrs->setImage( myImage, true );
+ if ( sender() ) // reset the previous presentation settings
+ {
+ QString aFileName = aPanel->getFileName();
+
+ aPanel->reset();
+ aPanel->setIsEdit( myIsEdit );
+ // restore the file name
+ aPanel->setFileName( aFileName );
+ // fill the reference list
+ HYDROGUI_ImportImageDlg::PrsPointDataList aPrsPointDataList;
+ getReferenceDataList( aPrsPointDataList );
+ aPanel->setPrsPointDataList( aPrsPointDataList );
+ }
if( myPreviewViewManager )
{
if( GraphicsView_Viewer* aViewer = myPreviewViewManager->getViewer() )
myActiveViewManager = anApp->activeViewManager();
myPreviewPrs = new HYDROGUI_PrsImage( myIsEdit ? myEditedObject : 0 );
- myPreviewPrs->setImage( myImage );
- myPreviewPrs->compute();
+ myPreviewPrs->setImage( myImage, true );
myPreviewViewManager =
dynamic_cast<GraphicsView_ViewManager*>( anApp->createViewManager( GraphicsView_Viewer::Type() ) );
this, SLOT( onPointSelected() ) );
}
}
+ }
- // Set the image name in the dialog
- QString anImageName = aPanel->getImageName().simplified();
- // If edit mode and the name was not set yet then get from the edited object
- if( myIsEdit && anImageName.isEmpty() )
- {
- if( !myEditedObject.IsNull() )
- anImageName = myEditedObject->GetName();
+ // Set the image name in the dialog
+ QString anImageName = aPanel->getImageName().simplified();
+ // If edit mode and the name was not set yet then get from the edited object
+ if( myIsEdit && anImageName.isEmpty() )
+ {
+ if( !myEditedObject.IsNull() )
+ anImageName = myEditedObject->GetName();
+ }
+ // If the name was not set then initialize it from the selected file name
+ if ( anImageName.isEmpty() )
+ {
+ anImageName = aPanel->getFileName();
+ if ( !anImageName.isEmpty() ) {
+ anImageName = QFileInfo( anImageName ).baseName();
}
- // If the name was not set then initialize it from the selected file name
- if ( anImageName.isEmpty() )
- {
- anImageName = aPanel->getFileName();
- if ( !anImageName.isEmpty() ) {
- anImageName = QFileInfo( anImageName ).baseName();
- }
- // If no file name then generate a new image name
- if ( anImageName.isEmpty() ) {
- anImageName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMAGE_NAME" ) );
- }
+ // If no file name then generate a new image name
+ if ( anImageName.isEmpty() ) {
+ anImageName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_IMAGE_NAME" ) );
}
-
- aPanel->setImageName( anImageName );
}
+ aPanel->setImageName( anImageName );
aPanel->setImageSize( myImage.size() );
void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
{
+ if( theName.isEmpty() ) {
+ if( myRefViewManager )
+ closeView( myRefViewManager );
+ return;
+ }
+
GraphicsView_ViewPort* aViewPort = 0;
LightApp_Application* anApp = module()->getApp();
///// Get a view port for the reference image preview
if( myRefViewManager )
{
- if( theName.isEmpty() )
- {
- closeView( myRefViewManager );
- }
- else if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() )
+ if( GraphicsView_Viewer* aViewer = myRefViewManager->getViewer() )
{
aViewPort = aViewer->getActiveViewPort();
}
QImage anImage;
Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast(
HYDROGUI_Tool::FindObjectByName( module(), theName, KIND_IMAGE ) );
+ HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
if( !anImageObj.IsNull() )
{
anImage = anImageObj->Image();
myRefPreviewPrs = new HYDROGUI_PrsImage( anImageObj );
- myRefPreviewPrs->setImage( anImage );
- myRefPreviewPrs->compute();
+ myRefPreviewPrs->setImage( anImage, true );
myRefPreviewPrs->setIsTransformationPointPreview( true );
myRefPreviewPrs->setTransformationPointType( myPointType );
+ myRefPreviewPrs->setIsByTwoPoints( aPanel->isByTwoPoints() );
+
// Add the new reference image presentation to the appropriate view
aViewPort->addItem( myRefPreviewPrs );
}
}
// Initialize the dialog
- HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
aPanel->setImageSize( anImage.size(), true );
aPanel->initializePointSelection();
onPointSelected( true );
