#include "HYDROGUI_ImportImageDlg.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_PrsImage.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Iterator.h>
myEditedObject->GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC );
// Create the edited image preview presentation in the viewer
- onCreatePreview( anImage );
+ onCreatePreview( anImage, NULL ); //TODO
// Set transformation local points A,B,C to the image preview presentation
setPresentationTrsfPoints( myPreviewPrs, anIsByTwoPoints, aLocalPointA,
HYDROGUI_InputPanel* HYDROGUI_ImportImageOp::createInputPanel() const
{
HYDROGUI_InputPanel* aPanel = new HYDROGUI_ImportImageDlg( module(), getName() );
- connect( aPanel, SIGNAL( createPreview( QImage ) ), SLOT( onCreatePreview( QImage ) ) );
+ connect( aPanel, SIGNAL( createPreview( QImage, HYDROData_Image::ECW_FileInfo* ) ),
+ SLOT( onCreatePreview( QImage, HYDROData_Image::ECW_FileInfo* ) ) );
connect( aPanel, SIGNAL( activatePointSelection( int ) ), SLOT( onActivatePointSelection( int ) ) );
connect( aPanel, SIGNAL( pointCoordChanged( bool, int, bool, int ) ),
SLOT( onPointCoordChanged( bool, int, bool, int ) ) );
{
HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
+ if( !myIsEdit )
+ {
+ QString aFilePath = aPanel->getFileName();
+ if( aFilePath.isEmpty() )
+ {
+ theErrorMsg = tr( "SELECT_IMAGE_FILE" ).arg( aFilePath );
+ return false;
+ }
+ }
+
QString anImageName = aPanel->getImageName();
if( anImageName.isEmpty() )
+ {
+ theErrorMsg = tr( "SELECT_IMAGE_NAME" ).arg( anImageName );
return false;
+ }
if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anImageName ) )
{
}
}
-void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
+void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage, HYDROData_Image::ECW_FileInfo* theFileInfo )
{
HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
aPanel->setImageSize( myImage.size() );
- aPanel->initializePointSelection();
+ if (!theFileInfo)
+ aPanel->initializePointSelection();
+ else
+ aPanel->ECW_initializePointSelection(theFileInfo);
onPointSelected( false );
onSetCIsUsed( !aPanel->isByTwoPoints() );
}