X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ChannelOp.cxx;h=99bf0cb70ca9fff56f3364274e98c3657bd11c72;hb=a0964e8c4caecf35f149dbc669714901c5fd2336;hp=d3acb739e14bff037b69c9c7c6888d61821c6283;hpb=439579ec24edd8b147cab07f688d446d59029a1e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
index d3acb739..99bf0cb7 100644
--- a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx
@@ -24,6 +24,7 @@
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Shape.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Iterator.h>
@@ -175,29 +176,43 @@ bool HYDROGUI_ChannelOp::processApply( int& theUpdateFlags,
 
   if ( !myIsEdit )
   {
-    myEditedObject->SetFillingColor( getDefaultFillingColor() );
-    myEditedObject->SetBorderColor( getDefaultBorderColor() );
+    myEditedObject->SetFillingColor( myEditedObject->DefaultFillingColor() );
+    myEditedObject->SetBorderColor( myEditedObject->DefaultBorderColor() );
   }
 
   QString aGuideLineName = aPanel->getGuideLineName();
   QString aProfileName = aPanel->getProfileName();
-  if ( aGuideLineName.isEmpty() || aProfileName.isEmpty() )
+  /*if ( aGuideLineName.isEmpty() || aProfileName.isEmpty() )
   {
     myEditedObject->RemoveGuideLine();
     myEditedObject->RemoveProfile();
   }
-  else
+  else*/
   {
     Handle(HYDROData_Polyline3D) aGuideLine = Handle(HYDROData_Polyline3D)::DownCast(
       HYDROGUI_Tool::FindObjectByName( module(), aGuideLineName, KIND_POLYLINE ) );
+    if ( aGuideLine.IsNull() )
+    {
+      theErrorMsg = tr( "GUIDE_LINE_IS_NOT_SELECTED" );
+      return false;
+    }
+
+    myEditedObject->RemoveGuideLine();
     myEditedObject->SetGuideLine( aGuideLine );
 
     Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast(
       HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+    if ( aProfile.IsNull() )
+    {
+      theErrorMsg = tr( "PROFILE_IS_NOT_SELECTED" );
+      return false;
+    }
+
+    myEditedObject->RemoveProfile();
     myEditedObject->SetProfile( aProfile );
   }
 
-  if ( myEditedObject->IsMustBeUpdated() )
+  if ( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) )
     myEditedObject->Update();
 
   erasePreview();
@@ -221,16 +236,6 @@ Handle(HYDROData_Channel) HYDROGUI_ChannelOp::createNewObject() const
   return Handle(HYDROData_Channel)::DownCast( doc()->CreateObject( KIND_CHANNEL ) );
 }
 
-QColor HYDROGUI_ChannelOp::getDefaultFillingColor() const
-{
-  return HYDROData_Channel::DefaultFillingColor();
-}
-
-QColor HYDROGUI_ChannelOp::getDefaultBorderColor() const
-{
-  return HYDROData_Channel::DefaultBorderColor();
-}
-
 void HYDROGUI_ChannelOp::onCreatePreview()
 {
   HYDROGUI_ChannelDlg* aPanel = ::qobject_cast<HYDROGUI_ChannelDlg*>( inputPanel() );
@@ -263,8 +268,8 @@ void HYDROGUI_ChannelOp::onCreatePreview()
       {
         myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
 
-        QColor aFillingColor = getDefaultFillingColor();
-        QColor aBorderColor = getDefaultBorderColor();
+        QColor aFillingColor = Qt::blue;
+        QColor aBorderColor = Qt::transparent;
         if ( !myEditedObject.IsNull() )
         {
           aFillingColor = myEditedObject->GetFillingColor();