refs #1327: debug of scaling operations

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

diff --git a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx b/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
index 7dc18267d1a9e5973e7f6ec9e55733f1aa394e32..3c505853e9989e51b936271ade3eeb6665ab0030 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
@@ -20,7 +20,7 @@
 
 #include "HYDROGUI_Module.h"
 #include <HYDROGUI_DataObject.h>
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_Poly3DDlg.h"
 #include "HYDROGUI_UpdateFlags.h"
 
@@ -61,7 +61,8 @@ void HYDROGUI_Poly3DOp::startOperation()
   QString aPoly3DName;
   if( myIsEdit )
   {
-    myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( isApplyAndClose() )
+      myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if( !myEditedObject.IsNull() )
       aPoly3DName = myEditedObject->GetName();
   }
@@ -172,7 +173,7 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
 
   if( !myIsEdit )
   {
-    aResult->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
+    aResult->SetBorderColor( aResult->DefaultBorderColor() );
   }
 
   aResult->Update();