aPanel->reset();
if ( myInitialMode == All ) {
- int anAllMode = HYDROGUI_GeoreferencementDlg::AllProfiles;
- aPanel->setMode( anAllMode );
- onModeActivated( anAllMode );
+ onModeActivated( HYDROGUI_GeoreferencementDlg::AllProfiles );
} else if ( myInitialMode == Selected ) {
- int aSelectionMode = HYDROGUI_GeoreferencementDlg::SelectedProfiles;
- aPanel->setMode( aSelectionMode );
- onModeActivated( aSelectionMode );
+ onModeActivated( HYDROGUI_GeoreferencementDlg::SelectedProfiles );
}
LightApp_Application* anApp = module()->getApp();
dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), false ) );
if ( aViewManager ) {
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
- aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+ Qt::UniqueConnection );
}
connect( anApp->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
- this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
+ this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ), Qt::UniqueConnection );
}
void HYDROGUI_GeoreferencementOp::abortOperation()
{
+ LightApp_Application* anApp = module()->getApp();
+ if ( anApp && anApp->desktop() ) {
+ anApp->desktop()->disconnect( this );
+ }
+
HYDROGUI_Operation::abortOperation();
}
void HYDROGUI_GeoreferencementOp::commitOperation()
{
+ LightApp_Application* anApp = module()->getApp();
+ if ( anApp && anApp->desktop() ) {
+ anApp->desktop()->disconnect( this );
+ }
+
HYDROGUI_Operation::commitOperation();
}
{
HYDROGUI_InputPanel* aPanel = new HYDROGUI_GeoreferencementDlg( module(), getName() );
connect( aPanel, SIGNAL( modeActivated( int ) ), SLOT( onModeActivated( int ) ) );
+ connect( aPanel, SIGNAL( updateSelection() ), SLOT( onUpdateSelection() ) );
return aPanel;
}
bool HYDROGUI_GeoreferencementOp::processApply( int& theUpdateFlags,
QString& theErrorMsg )
{
- theUpdateFlags = UF_Model;
+ theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
return store( theErrorMsg );
}
return;
}
- // Store the dialog data to the data model
- if ( !store( anErrorMsg ) ) {
- aPanel->setMode( theActualMode == HYDROGUI_GeoreferencementDlg::AllProfiles ?
- HYDROGUI_GeoreferencementDlg::SelectedProfiles :
- HYDROGUI_GeoreferencementDlg::AllProfiles);
+ aPanel->setMode( theActualMode == HYDROGUI_GeoreferencementDlg::AllProfiles ?
+ HYDROGUI_GeoreferencementDlg::SelectedProfiles :
+ HYDROGUI_GeoreferencementDlg::AllProfiles);
+ // Store the dialog data to the data model
+ bool isToStore = false;
+ // Check if modifications exists
+ if ( aPanel->isModified() ) {
+ // Show confirmation dialog
+ SUIT_MessageBox::StandardButtons aButtons =
+ SUIT_MessageBox::Yes | SUIT_MessageBox::No;
+
+ isToStore = SUIT_MessageBox::question( module()->getApp()->desktop(),
+ tr( "CONFIRMATION" ),
+ tr( "CONFIRM_STORE" ),
+ aButtons,
+ SUIT_MessageBox::Yes) == SUIT_MessageBox::Yes;
+ }
+ // Store modifications if needed
+ if ( isToStore && !store( anErrorMsg ) ) {
anErrorMsg.append( "\n" + tr( "INPUT_VALID_DATA" ) );
SUIT_MessageBox::critical( module()->getApp()->desktop(),
tr( "INSUFFICIENT_INPUT_DATA" ),
return;
}
- // Get georeferencement data from the data model
- HYDROGUI_GeoreferencementDlg::ProfilesGeoDataMap aDataMap;
+ aPanel->setMode( theActualMode );
+
+ // Get the list of profiles
HYDROData_SequenceOfObjects aSeqOfProfiles;
if( theActualMode == HYDROGUI_GeoreferencementDlg::AllProfiles ) {
aSeqOfProfiles = HYDROGUI_Tool::GetSelectedObjects( module() );
}
- HYDROData_SequenceOfObjects::Iterator anIter( aSeqOfProfiles );
- for ( ; anIter.More(); anIter.Next() ) {
- Handle(HYDROData_Profile) aProfile =
- Handle(HYDROData_Profile)::DownCast( anIter.Value() );
- if ( aProfile.IsNull() ) {
- continue;
- }
-
- HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData;
-
- gp_XY aFirstPoint, aLastPoint;
- if ( aProfile->GetFirstPoint( aFirstPoint ) && aProfile->GetLastPoint( aLastPoint ) ) {
- aGeoData =
- HYDROGUI_GeoreferencementDlg::ProfileGeoData( aFirstPoint.X(), aFirstPoint.Y(),
- aLastPoint.X(), aLastPoint.Y() );
- }
-
- aDataMap.insert( aProfile->GetName(), aGeoData );
- }
-
- // Set the collected data to the dialog
- aPanel->setData( aDataMap );
+ // Set the profiles to the panel
+ setPanelData( aSeqOfProfiles );
}
void HYDROGUI_GeoreferencementOp::onWindowActivated( SUIT_ViewWindow* theViewWindow )
::qobject_cast<HYDROGUI_GeoreferencementDlg*>( inputPanel() );
if ( aPanel ) {
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
- aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+ Qt::UniqueConnection);
}
}
}
}
// Get georeferencement data from the panel
- HYDROGUI_GeoreferencementDlg::ProfilesGeoDataMap aGeoDataMap;
- aPanel->getData( aGeoDataMap );
-
- if ( aGeoDataMap.empty() ) {
+ HYDROGUI_GeoreferencementDlg::ProfilesGeoDataList aGeoDataList;
+ aPanel->getData( aGeoDataList );
+ if ( aGeoDataList.empty() ) {
return true;
}
// Check the data validity
- foreach ( const QString& aProfileName, aGeoDataMap.keys() ) {
- HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData =
- aGeoDataMap.value( aProfileName );
+ foreach ( const HYDROGUI_GeoreferencementDlg::ProfileGeoData& aGeoData, aGeoDataList ) {
if ( aGeoData.isIncomplete ) {
- theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( aProfileName );
+ theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( aGeoData.Name );
return false;
}
}
// Store the data in the data model
- foreach ( const QString& aProfileName, aGeoDataMap.keys() ) {
+ foreach ( const HYDROGUI_GeoreferencementDlg::ProfileGeoData& aGeoData, aGeoDataList ) {
Handle(HYDROData_Profile) aProfile =
Handle(HYDROData_Profile)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+ HYDROGUI_Tool::FindObjectByName( module(), aGeoData.Name, KIND_PROFILE ) );
if ( !aProfile.IsNull() ) {
- HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData =
- aGeoDataMap.value( aProfileName );
if ( !aGeoData.isEmpty ) {
- aProfile->SetFirstPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) );
- aProfile->SetLastPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) );
+ aProfile->SetLeftPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) );
+ aProfile->SetRightPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) );
} else {
aProfile->Invalidate();
}
+
+ aProfile->Update();
}
}
+ module()->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
+ commitDocOperation(); // TODO: analyze the consequences
+
return true;
}
+
+void HYDROGUI_GeoreferencementOp::onUpdateSelection()
+{
+ // Get the selected profiles
+ HYDROData_SequenceOfObjects aSeqOfProfiles =
+ HYDROGUI_Tool::GetSelectedObjects( module() );
+
+ // Set them to the dialog
+ setPanelData( aSeqOfProfiles );
+}
+
+void HYDROGUI_GeoreferencementOp::setPanelData(
+ const HYDROData_SequenceOfObjects& theProfiles )
+{
+ // Get the panel
+ HYDROGUI_GeoreferencementDlg* aPanel =
+ ::qobject_cast<HYDROGUI_GeoreferencementDlg*>( inputPanel() );
+ if ( !aPanel ) {
+ return;
+ }
+
+ // Get georeferencement data from the data model
+ HYDROGUI_GeoreferencementDlg::ProfilesGeoDataList aData;
+
+ HYDROData_SequenceOfObjects::Iterator anIter( theProfiles );
+ for ( ; anIter.More(); anIter.Next() ) {
+ Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( anIter.Value() );
+ if ( aProfile.IsNull() ) {
+ continue;
+ }
+
+ HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData( aProfile->GetName() );
+
+ gp_XY aFirstPoint, aLastPoint;
+ if ( aProfile->GetLeftPoint( aFirstPoint ) && aProfile->GetRightPoint( aLastPoint ) ) {
+ aGeoData =
+ HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name,
+ aFirstPoint.X(), aFirstPoint.Y(),
+ aLastPoint.X(), aLastPoint.Y() );
+ }
+
+ aData.append( aGeoData );
+ }
+
+ // Set the collected data to the dialog
+ aPanel->setData( aData );
+}
\ No newline at end of file
