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 @@
GEOM_PIPETSHAPE_GROUPPOS
Position
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L
+ Main pipe Radius can't be equal to Left thickness reduction Radius (rL)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L
+ Main pipe external Radius (Radius + Width) can't be equal to Left thickness reduction external Radius (rL + wL)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R
+ Main pipe Radius can't be equal to Right thickness reduction Radius (rR)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R
+ Main pipe external Radius (Radius + Width) can't be equal to Right thickness reduction external Radius (rR + wR)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I
+ Incident pipe Radius can't be equal to Incident pipe thickness reduction Radius (rI)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I
+ Incident pipe external Radius (Radius + Width) can't be equal to Incident pipe thickness reduction external Radius (rI + wI)!
+
AdvancedGUI_SmoothingSurfaceDlg
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 @@
GEOM_PIPETSHAPE_GROUPPOS
Position
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L
+ Main pipe Radius can't be equal to Left thickness reduction Radius (rL)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L
+ Main pipe external Radius (Radius + Width) can't be equal to Left thickness reduction external Radius (rL + wL)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R
+ Main pipe Radius can't be equal to Right thickness reduction Radius (rR)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R
+ Main pipe external Radius (Radius + Width) can't be equal to Right thickness reduction external Radius (rR + wR)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I
+ Incident pipe Radius can't be equal to Incident pipe thickness reduction Radius (rI)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I
+ Incident pipe external Radius (Radius + Width) can't be equal to Incident pipe thickness reduction external Radius (rI + wI)!
+
AdvancedGUI_SmoothingSurfaceDlg
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 @@
GEOM_PIPETSHAPE_GROUPPOS
GEOM_PIPETSHAPE_GROUPPOS
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L
+ Main pipe Radius can't be equal to Left thickness reduction Radius (rL)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L
+ Main pipe external Radius (Radius + Width) can't be equal to Left thickness reduction external Radius (rL + wL)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R
+ Main pipe Radius can't be equal to Right thickness reduction Radius (rR)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R
+ Main pipe external Radius (Radius + Width) can't be equal to Right thickness reduction external Radius (rR + wR)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I
+ Incident pipe Radius can't be equal to Incident pipe thickness reduction Radius (rI)!
+
+
+ GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I
+ Incident pipe external Radius (Radius + Width) can't be equal to Incident pipe thickness reduction external Radius (rI + wI)!
+
AdvancedGUI_SmoothingSurfaceDlg