bug #237: fatal error on profile

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ChannelOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
index 720a3648c77bb48600e56283612c05a5897ce525..0149a1c85d108641db29e1eaad2bc99a64112ca8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
@@ -68,10 +68,7 @@ void HYDROGUI_ChannelOp::startOperation()
 
   aPanel->reset();
 
-  if( myIsEdit )
-    myEditedObject = Handle(HYDROData_Channel)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
-  else 
-    myEditedObject = Handle(HYDROData_Channel)::DownCast( doc()->CreateObject( KIND_CHANNEL ) );
+  myEditedObject = getObjectToEdit();
 
   QString aSelectedGuideLine, aSelectedProfile;
 
@@ -108,9 +105,11 @@ void HYDROGUI_ChannelOp::startOperation()
   onCreatePreview( true );
 }
 
+
 void HYDROGUI_ChannelOp::abortOperation()
 {
   erasePreview();
+  abortDocOperation();
 
   HYDROGUI_Operation::abortOperation();
 }
@@ -130,7 +129,7 @@ HYDROGUI_InputPanel* HYDROGUI_ChannelOp::createInputPanel() const
 }
 
 bool HYDROGUI_ChannelOp::processApply( int& theUpdateFlags,
-                                              QString& theErrorMsg )
+                                       QString& theErrorMsg )
 {
   HYDROGUI_ChannelDlg* aPanel = ::qobject_cast<HYDROGUI_ChannelDlg*>( inputPanel() );
   if ( !aPanel )
@@ -159,7 +158,8 @@ bool HYDROGUI_ChannelOp::processApply( int& theUpdateFlags,
 
   myEditedObject->SetName( anObjectName );
 
-  if ( !myIsEdit ) {
+  if ( !myIsEdit )
+  {
     myEditedObject->SetFillingColor( HYDROData_Channel::DefaultFillingColor() );
     myEditedObject->SetBorderColor( HYDROData_Channel::DefaultBorderColor() );
   }
@@ -174,6 +174,12 @@ bool HYDROGUI_ChannelOp::processApply( int& theUpdateFlags,
   return true;
 }
 
+Handle(HYDROData_Channel) HYDROGUI_ChannelOp::getObjectToEdit() const
+{
+  return myIsEdit ? Handle(HYDROData_Channel)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ) :
+                    Handle(HYDROData_Channel)::DownCast( doc()->CreateObject( KIND_CHANNEL ) );
+}
+
 void HYDROGUI_ChannelOp::onCreatePreview( const bool theIsInit )
 {
   HYDROGUI_ChannelDlg* aPanel = ::qobject_cast<HYDROGUI_ChannelDlg*>( inputPanel() );