Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of compilation warnings. Part I.
[modules/shaper.git]
/
src
/
ConstructionPlugin
/
ConstructionPlugin_Validators.cpp
diff --git
a/src/ConstructionPlugin/ConstructionPlugin_Validators.cpp
b/src/ConstructionPlugin/ConstructionPlugin_Validators.cpp
index a26f2f519bb7066b6d1cfb31d80e376bfb18389d..b36b2bd513f5ea04d340915aea2599359469d172 100644
(file)
--- a/
src/ConstructionPlugin/ConstructionPlugin_Validators.cpp
+++ b/
src/ConstructionPlugin/ConstructionPlugin_Validators.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
CEA/DEN, 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-54,7
+54,7
@@
bool ConstructionPlugin_ValidatorPointLines::isValid(const AttributePtr& theAttr
GeomShapePtr aLineShape1 = aLineAttribute1->value();
ResultPtr aContext1 = aLineAttribute1->context();
if(!aContext1.get()) {
GeomShapePtr aLineShape1 = aLineAttribute1->value();
ResultPtr aContext1 = aLineAttribute1->context();
if(!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if(!aLineShape1.get()) {
return false;
}
if(!aLineShape1.get()) {
@@
-120,7
+120,7
@@
bool ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel::isValid(
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if(!aShape1.get()) {
return false;
}
if(!aShape1.get()) {
@@
-136,14
+136,11
@@
bool ConstructionPlugin_ValidatorPointEdgeAndPlaneNotParallel::isValid(
aShape2 = aContext2->shape();
}
aShape2 = aContext2->shape();
}
- bool isPlaneFirst = false;
anEdge = getEdge(aShape1);
anEdge = getEdge(aShape1);
-
aFace = getFace(aShape2);
if(!anEdge.get() || !aFace.get()) {
anEdge = getEdge(aShape2);
aFace = getFace(aShape1);
aFace = getFace(aShape2);
if(!anEdge.get() || !aFace.get()) {
anEdge = getEdge(aShape2);
aFace = getFace(aShape1);
- isPlaneFirst = true;
}
if(!anEdge.get() || !aFace.get()) {
}
if(!anEdge.get() || !aFace.get()) {
@@
-174,7
+171,7
@@
bool ConstructionPlugin_ValidatorPlaneThreePoints::isValid(const AttributePtr& t
GeomShapePtr aPointShape1 = aPointAttribute1->value();
ResultPtr aContext1 = aPointAttribute1->context();
if(!aContext1.get()) {
GeomShapePtr aPointShape1 = aPointAttribute1->value();
ResultPtr aContext1 = aPointAttribute1->context();
if(!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if(!aPointShape1.get()) {
return false;
}
if(!aPointShape1.get()) {
@@
-252,7
+249,7
@@
bool ConstructionPlugin_ValidatorPlaneLinePoint::isValid(
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if(!aShape1.get()) {
return false;
}
if(!aShape1.get()) {
@@
-310,7
+307,7
@@
bool ConstructionPlugin_ValidatorPlaneTwoParallelPlanes::isValid(
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if(!aShape1.get()) {
return false;
}
if(!aShape1.get()) {
@@
-363,7
+360,7
@@
bool ConstructionPlugin_ValidatorAxisTwoNotParallelPlanes::isValid(
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if(!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if(!aShape1.get()) {
return false;
}
if(!aShape1.get()) {
@@
-414,7
+411,7
@@
bool ConstructionPlugin_ValidatorPointThreeNonParallelPlanes::isValid(
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if (!aContext1.get()) {
GeomShapePtr aShape1 = anAttribute1->value();
ResultPtr aContext1 = anAttribute1->context();
if (!aContext1.get()) {
- theError = "One of the attribute not initialized.";
+ theError = "One of the attribute
is
not initialized.";
return false;
}
if (!aShape1.get()) {
return false;
}
if (!aShape1.get()) {