From: abk <abk@opencascade.com>
Date: Wed, 5 Aug 2015 14:21:08 +0000 (+0300)
Subject: refs #626: No warning appears during attempt splitting not intersected polylines
X-Git-Tag: BR_quadtree_20150925~2^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d4c96dba2a8044a02dd03c841812033e9c2f6ed7;p=modules%2Fhydro.git

refs #626: No warning appears during attempt splitting not intersected polylines

Functionality to output the warning using the flag was created.
---

diff --git a/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx b/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx
index 5adf7730..ff9f45c2 100644
--- a/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_SplitPolylinesOp.cxx
@@ -26,6 +26,8 @@
 #include <LightApp_Application.h>
 #include <OCCViewer_ViewModel.h>
 #include <OCCViewer_ViewManager.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
 #include <gp_Pnt2d.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRep_Builder.hxx>
@@ -87,15 +89,24 @@ bool HYDROGUI_SplitPolylinesOp::processApply( int& theUpdateFlags,
   double aTolerance = 1E-2; //TODO
 
   HYDROData_PolylineOperator anOp;
-  bool isIntersected = false;
   switch( aPanel->GetMode() )
   {
   case HYDROGUI_SplitPolylinesDlg::ByPoint:
     anOp.Split( doc(), aMainPolyline, aPoint, aTolerance );
     break;
   case HYDROGUI_SplitPolylinesDlg::ByTool:
+  {
+    bool isIntersected = false;
     anOp.Split( doc(), aMainPolyline, aToolPolyline, aTolerance, isIntersected);
+
+    if (!isIntersected)
+    {
+      const QString aTitle = tr("SPLIT_POLYLINE_BY_TOOL_WARNING_TITLE");
+      const QString aMsg = tr("SPLIT_POLYLINE_BY_TOOL_WARNING_MSG");
+      SUIT_MessageBox::warning(module()->getApp()->desktop(), aTitle, aMsg);
+    }
     break;
+  }
   case HYDROGUI_SplitPolylinesDlg::Split:
     anOp.Split( doc(), aPolylinesList, aTolerance );
     break;
diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index a2b27fd5..27f896be 100644
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -3024,6 +3024,14 @@ Polyline should consist from one not closed curve.</translation>
       <source>SPLIT_POLYLINES</source>
       <translation>Split polylines</translation>
     </message>
+    <message>
+      <source>SPLIT_POLYLINE_BY_TOOL_WARNING_TITLE</source>
+      <translation>Split polyline by tool</translation>
+    </message>
+    <message>
+      <source>SPLIT_POLYLINE_BY_TOOL_WARNING_MSG</source>
+      <translation>The splitted polyline is not intersected by the tool.</translation>
+    </message>
   </context>
 
   <context>