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 8259381af1ee2d4767cf1fdd1a0842c11ec95a49..3c505853e9989e51b936271ade3eeb6665ab0030 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,7 +19,8 @@
 #include "HYDROGUI_Poly3DOp.h"
 
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include <HYDROGUI_DataObject.h>
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_Poly3DDlg.h"
 #include "HYDROGUI_UpdateFlags.h"
 
@@ -64,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();
   }
@@ -108,7 +106,8 @@ void HYDROGUI_Poly3DOp::startOperation()
 }
 
 bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
-                                         QString& theErrorMsg )
+                                      QString& theErrorMsg,
+                                      QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_Poly3DDlg* aPanel = dynamic_cast<HYDROGUI_Poly3DDlg*>( inputPanel() );
 
@@ -149,6 +148,8 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
   else
   {
     aResult = Handle(HYDROData_Polyline3D)::DownCast( doc()->CreateObject( KIND_POLYLINE ) );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+    theBrowseObjectsEntries.append( anEntry );
   }
 
   if( aResult.IsNull() )
@@ -172,7 +173,7 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
 
   if( !myIsEdit )
   {
-    aResult->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
+    aResult->SetBorderColor( aResult->DefaultBorderColor() );
   }
 
   aResult->Update();