From: akl <akl@opencascade.com>
Date: Tue, 3 Dec 2013 10:21:43 +0000 (+0000)
Subject: Fix of INT PAL 0051918: note 0504992: Additional checks were added to show the friend... 
X-Git-Tag: V7_3_0b1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6cd43e071fa682fadf98491ef9e3f7dc40a61977;p=modules%2Fgeom.git

Fix of INT PAL 0051918: note 0504992: Additional checks were added to show the friendly messages about incorrect input data.
---

diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
index 4e686ea82..489ee5c8b 100644
--- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
+++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
@@ -871,18 +871,45 @@ bool AdvancedGUI_PipeTShapeDlg::isValid (QString& msg)
     ok = LReductionGroupParams->SpinBox2->isValid(msg, !IsPreview()) && ok;
     ok = LReductionGroupParams->SpinBox3->isValid(msg, !IsPreview()) && ok;
     ok = LReductionGroupParams->SpinBox4->isValid(msg, !IsPreview()) && ok;
+    if(MainTubeGroupParams->SpinBox_DX->value() == LReductionGroupParams->SpinBox1->value()) {
+      msg += tr("GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L") + "\n";
+      ok = false;
+    }
+    if(MainTubeGroupParams->SpinBox_DX->value() + MainTubeGroupParams->SpinBox_DY->value() ==
+       LReductionGroupParams->SpinBox1->value() + LReductionGroupParams->SpinBox2->value()) {
+      msg += tr("GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L") + "\n";
+      ok = false;
+    }
   }
   if (RReductionGroupParams->GroupBox1->isChecked()) {
     ok = RReductionGroupParams->SpinBox1->isValid(msg, !IsPreview()) && ok;
     ok = RReductionGroupParams->SpinBox2->isValid(msg, !IsPreview()) && ok;
     ok = RReductionGroupParams->SpinBox3->isValid(msg, !IsPreview()) && ok;
     ok = RReductionGroupParams->SpinBox4->isValid(msg, !IsPreview()) && ok;
+    if(MainTubeGroupParams->SpinBox_DX->value() == RReductionGroupParams->SpinBox1->value()) {
+      msg += tr("GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R") + "\n";
+      ok = false;
+    }
+    if(MainTubeGroupParams->SpinBox_DX->value() + MainTubeGroupParams->SpinBox_DY->value() ==
+       RReductionGroupParams->SpinBox1->value() + RReductionGroupParams->SpinBox2->value()) {
+      msg += tr("GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R") + "\n";
+      ok = false;
+    }
   }
   if (IReductionGroupParams->GroupBox1->isChecked()) {
     ok = IReductionGroupParams->SpinBox1->isValid(msg, !IsPreview()) && ok;
     ok = IReductionGroupParams->SpinBox2->isValid(msg, !IsPreview()) && ok;
     ok = IReductionGroupParams->SpinBox3->isValid(msg, !IsPreview()) && ok;
     ok = IReductionGroupParams->SpinBox4->isValid(msg, !IsPreview()) && ok;
+    if(IncidentTubeGroupParams->SpinBox_DX->value() == IReductionGroupParams->SpinBox1->value()) {
+      msg += tr("GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I") + "\n";
+      ok = false;
+    }
+    if(IncidentTubeGroupParams->SpinBox_DX->value() + IncidentTubeGroupParams->SpinBox_DY->value() ==
+       IReductionGroupParams->SpinBox1->value() + IReductionGroupParams->SpinBox2->value()) {
+      msg += tr("GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I") + "\n";
+      ok = false;
+    }
   }
 
   ok = fabs(MainTubeGroupParams->SpinBox_DX->value()) > Precision::Confusion() && ok;
diff --git a/src/AdvancedGUI/AdvancedGUI_msg_en.ts b/src/AdvancedGUI/AdvancedGUI_msg_en.ts
index e7524147c..2aab6e88a 100644
--- a/src/AdvancedGUI/AdvancedGUI_msg_en.ts
+++ b/src/AdvancedGUI/AdvancedGUI_msg_en.ts
@@ -246,6 +246,30 @@
         <source>GEOM_PIPETSHAPE_GROUPPOS</source>
         <translation>Position</translation>
     </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L</source>
+        <translation>Main pipe Radius can't be equal to Left thickness reduction Radius (rL)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L</source>
+        <translation>Main pipe external Radius (Radius + Width) can't be equal to Left thickness reduction external Radius (rL + wL)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R</source>
+        <translation>Main pipe Radius can't be equal to Right thickness reduction Radius (rR)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R</source>
+        <translation>Main pipe external Radius (Radius + Width) can't be equal to Right thickness reduction external Radius (rR + wR)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I</source>
+        <translation>Incident pipe Radius can't be equal to Incident pipe thickness reduction Radius (rI)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I</source>
+        <translation>Incident pipe external Radius (Radius + Width) can't be equal to Incident pipe thickness reduction external Radius (rI + wI)!</translation>
+    </message>
 </context>
 <context>
     <name>AdvancedGUI_SmoothingSurfaceDlg</name>
diff --git a/src/AdvancedGUI/AdvancedGUI_msg_fr.ts b/src/AdvancedGUI/AdvancedGUI_msg_fr.ts
index 69c38cbc9..74bce4882 100644
--- a/src/AdvancedGUI/AdvancedGUI_msg_fr.ts
+++ b/src/AdvancedGUI/AdvancedGUI_msg_fr.ts
@@ -246,6 +246,30 @@
         <source>GEOM_PIPETSHAPE_GROUPPOS</source>
         <translation>Position</translation>
     </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L</source>
+        <translation type="unfinished">Main pipe Radius can't be equal to Left thickness reduction Radius (rL)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L</source>
+        <translation type="unfinished">Main pipe external Radius (Radius + Width) can't be equal to Left thickness reduction external Radius (rL + wL)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R</source>
+        <translation type="unfinished">Main pipe Radius can't be equal to Right thickness reduction Radius (rR)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R</source>
+        <translation type="unfinished">Main pipe external Radius (Radius + Width) can't be equal to Right thickness reduction external Radius (rR + wR)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I</source>
+        <translation type="unfinished">Incident pipe Radius can't be equal to Incident pipe thickness reduction Radius (rI)!</translation>
+    </message>
+    <message>
+        <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I</source>
+        <translation type="unfinished">Incident pipe external Radius (Radius + Width) can't be equal to Incident pipe thickness reduction external Radius (rI + wI)!</translation>
+    </message>
 </context>
 <context>
     <name>AdvancedGUI_SmoothingSurfaceDlg</name>
diff --git a/src/AdvancedGUI/AdvancedGUI_msg_ja.ts b/src/AdvancedGUI/AdvancedGUI_msg_ja.ts
index 6bb1122f6..a03179a22 100644
--- a/src/AdvancedGUI/AdvancedGUI_msg_ja.ts
+++ b/src/AdvancedGUI/AdvancedGUI_msg_ja.ts
@@ -246,6 +246,30 @@
       <source>GEOM_PIPETSHAPE_GROUPPOS</source>
       <translation>GEOM_PIPETSHAPE_GROUPPOS</translation>
     </message>
+    <message>
+      <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L</source>
+      <translation type="unfinished">Main pipe Radius can't be equal to Left thickness reduction Radius (rL)!</translation>
+    </message>
+    <message>
+      <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L</source>
+      <translation type="unfinished">Main pipe external Radius (Radius + Width) can't be equal to Left thickness reduction external Radius (rL + wL)!</translation>
+    </message>
+    <message>
+      <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R</source>
+      <translation type="unfinished">Main pipe Radius can't be equal to Right thickness reduction Radius (rR)!</translation>
+    </message>
+    <message>
+      <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R</source>
+      <translation type="unfinished">Main pipe external Radius (Radius + Width) can't be equal to Right thickness reduction external Radius (rR + wR)!</translation>
+    </message>
+    <message>
+      <source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I</source>
+      <translation type="unfinished">Incident pipe Radius can't be equal to Incident pipe thickness reduction Radius (rI)!</translation>
+    </message>
+    <message>
+      <source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I</source>
+      <translation type="unfinished">Incident pipe external Radius (Radius + Width) can't be equal to Incident pipe thickness reduction external Radius (rI + wI)!</translation>
+    </message>
   </context>
   <context>
     <name>AdvancedGUI_SmoothingSurfaceDlg</name>