From ac59b45bd9d2b7015a0b6618a4cf2ac1c5f67784 Mon Sep 17 00:00:00 2001 From: dbv Date: Thu, 3 Mar 2016 12:31:48 +0300 Subject: [PATCH] Errors messages correction. --- src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp | 32 +++++++++---------- .../FeaturesPlugin_CompositeBoolean.cpp | 16 +++++----- .../FeaturesPlugin_CompositeSketch.cpp | 2 +- .../FeaturesPlugin_Extrusion.cpp | 10 +++--- .../FeaturesPlugin_ExtrusionBoolean.cpp | 2 +- .../FeaturesPlugin_Intersection.cpp | 2 +- .../FeaturesPlugin_Partition.cpp | 14 ++++---- .../FeaturesPlugin_Placement.cpp | 20 ++++++------ .../FeaturesPlugin_Revolution.cpp | 10 +++--- .../FeaturesPlugin_RevolutionBoolean.cpp | 2 +- .../FeaturesPlugin_Rotation.cpp | 6 ++-- .../FeaturesPlugin_Translation.cpp | 6 ++-- .../SketchPlugin_ConstraintFillet.h | 2 +- 13 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp index 25f8f3e0d..7360f443c 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp @@ -130,7 +130,7 @@ void FeaturesPlugin_Boolean::execute() case GeomAlgoAPI_Boolean::BOOL_CUT: case GeomAlgoAPI_Boolean::BOOL_COMMON:{ if((anObjects.empty() && aCompSolidsObjects.empty()) || aTools.empty()) { - std::string aFeatureError = "Not enough objects for boolean operation"; + std::string aFeatureError = "Error: Not enough objects for boolean operation."; setError(aFeatureError); return; } @@ -144,17 +144,17 @@ void FeaturesPlugin_Boolean::execute() // Checking that the algorithm worked properly. if(!aBoolAlgo.isDone()) { - static const std::string aFeatureError = "Boolean algorithm failed"; + static const std::string aFeatureError = "Error: Boolean algorithm failed."; setError(aFeatureError); return; } if(aBoolAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if(!aBoolAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } @@ -192,17 +192,17 @@ void FeaturesPlugin_Boolean::execute() // Checking that the algorithm worked properly. if(!aBoolAlgo->isDone()) { - static const std::string aFeatureError = "Boolean algorithm failed"; + static const std::string aFeatureError = "Error: Boolean algorithm failed."; setError(aFeatureError); return; } if(aBoolAlgo->shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if(!aBoolAlgo->isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } @@ -217,7 +217,7 @@ void FeaturesPlugin_Boolean::execute() aShapesToAdd.push_back(aBoolAlgo->shape()); std::shared_ptr aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true)); if(!aFillerAlgo->isDone()) { - std::string aFeatureError = "PaveFiller algorithm failed"; + std::string aFeatureError = "Error: PaveFiller algorithm failed."; setError(aFeatureError); return; } @@ -236,7 +236,7 @@ void FeaturesPlugin_Boolean::execute() } case GeomAlgoAPI_Boolean::BOOL_FUSE: { if((anObjects.size() + aTools.size() + aCompSolidsObjects.size() + anEdgesAndFaces.size()) < 2) { - std::string aFeatureError = "Not enough objects for boolean operation"; + std::string aFeatureError = "Error: Not enough objects for boolean operation."; setError(aFeatureError); return; } @@ -320,17 +320,17 @@ void FeaturesPlugin_Boolean::execute() // Checking that the algorithm worked properly. if(!aFuseAlgo->isDone()) { - static const std::string aFeatureError = "Boolean algorithm failed"; + static const std::string aFeatureError = "Error: Boolean algorithm failed."; setError(aFeatureError); return; } if(aFuseAlgo->shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if(!aFuseAlgo->isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } @@ -352,17 +352,17 @@ void FeaturesPlugin_Boolean::execute() } std::shared_ptr aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true)); if(!aFillerAlgo->isDone()) { - std::string aFeatureError = "PaveFiller algorithm failed"; + std::string aFeatureError = "Error: PaveFiller algorithm failed."; setError(aFeatureError); return; } if(aFillerAlgo->shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if(!aFillerAlgo->isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } @@ -381,7 +381,7 @@ void FeaturesPlugin_Boolean::execute() break; } default: { - std::string anOperationError = "Error: wrong type of operation"; + std::string anOperationError = "Error: Wrong type of operation"; setError(anOperationError); return; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp index 48c4f08d0..f3ef628e7 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp @@ -198,7 +198,7 @@ void FeaturesPlugin_CompositeBoolean::execute() // Checking that the algorithm worked properly. if(!aBoolAlgo.isDone() || aBoolAlgo.shape()->isNull() || !aBoolAlgo.isValid()) { - setError("Boolean algorithm failed"); + setError("Error: Boolean algorithm failed."); return; } @@ -236,7 +236,7 @@ void FeaturesPlugin_CompositeBoolean::execute() // Checking that the algorithm worked properly. if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) { - setError("Boolean algorithm failed"); + setError("Error: Boolean algorithm failed."); return; } @@ -250,7 +250,7 @@ void FeaturesPlugin_CompositeBoolean::execute() aShapesToAdd.push_back(aBoolAlgo->shape()); std::shared_ptr aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true)); if(!aFillerAlgo->isDone()) { - std::string aFeatureError = "PaveFiller algorithm failed"; + std::string aFeatureError = "Error: PaveFiller algorithm failed."; setError(aFeatureError); return; } @@ -327,7 +327,7 @@ void FeaturesPlugin_CompositeBoolean::execute() // Checking that the algorithm worked properly. if(!aFuseAlgo->isDone() || aFuseAlgo->shape()->isNull() || !aFuseAlgo->isValid()) { - static const std::string aFeatureError = "Boolean algorithm failed"; + static const std::string aFeatureError = "Error: Boolean algorithm failed."; setError(aFeatureError); return; } @@ -341,17 +341,17 @@ void FeaturesPlugin_CompositeBoolean::execute() aNotUsedSolids.push_back(aShape); std::shared_ptr aFillerAlgo(new GeomAlgoAPI_PaveFiller(aNotUsedSolids, true)); if(!aFillerAlgo->isDone()) { - std::string aFeatureError = "PaveFiller algorithm failed"; + std::string aFeatureError = "Error: PaveFiller algorithm failed."; setError(aFeatureError); return; } if(aFillerAlgo->shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if(!aFillerAlgo->isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } @@ -368,7 +368,7 @@ void FeaturesPlugin_CompositeBoolean::execute() break; } default: { - setError("Error: wrong type of boolean operation"); + setError("Error: Wrong type of boolean operation."); return; } } diff --git a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp index 901433c99..3b520ba92 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp @@ -157,7 +157,7 @@ void FeaturesPlugin_CompositeSketch::execute() if(aErrorsNum > 0) { std::ostringstream aStringStream; - aStringStream << "Warning: could not create solid(s) from " << aErrorsNum << " face(s)."; + aStringStream << "Error: Could not create solid(s) from " << aErrorsNum << " face(s)."; setError(aStringStream.str()); } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp index 535eb2fdd..bdee88eaf 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp @@ -65,13 +65,13 @@ void FeaturesPlugin_Extrusion::execute() ResultPtr aContext = aFaceSel->context(); std::shared_ptr aContextShape = aContext->shape(); if(!aContextShape.get()) { - static const std::string aContextError = "The selection context is bad"; + static const std::string aContextError = "Error: The selection context is bad."; setError(aContextError); return; } ResultConstructionPtr aConstruction = std::dynamic_pointer_cast(aContext); if(!aConstruction.get()) { - static const std::string aFaceError = "Can not find basis for extrusion"; + static const std::string aFaceError = "Error: Can not find basis for extrusion."; setError(aFaceError); return; } @@ -130,7 +130,7 @@ void FeaturesPlugin_Extrusion::execute() GeomAlgoAPI_Prism aPrismAlgo(aBaseShape, aToShape, aToSize, aFromShape, aFromSize); if(!aPrismAlgo.isDone()) { - static const std::string aPrismAlgoError = "Extrusion algorithm failed"; + static const std::string aPrismAlgoError = "Error: Extrusion algorithm failed."; setError(aPrismAlgoError); aResultIndex = 0; break; @@ -138,13 +138,13 @@ void FeaturesPlugin_Extrusion::execute() // Check if shape is valid if(!aPrismAlgo.shape().get() || aPrismAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); aResultIndex = 0; break; } if(!aPrismAlgo.isValid()) { - std::string aPrismAlgoError = "Warning: resulting shape is not valid"; + std::string aPrismAlgoError = "Error: Resulting shape is not valid."; setError(aPrismAlgoError); aResultIndex = 0; break; diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp index 79b5cda61..bc514dcd6 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp @@ -79,7 +79,7 @@ void FeaturesPlugin_ExtrusionBoolean::makeSolids(const ListOfShape& theFaces, // Checking that the algorithm worked properly. if(!aPrismAlgo->isDone() || !aPrismAlgo->shape().get() || aPrismAlgo->shape()->isNull() || !aPrismAlgo->isValid()) { - setError("Extrusion algorithm failed"); + setError("Error: Extrusion algorithm failed."); theResults.clear(); return; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp b/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp index 39fdb9782..16d625770 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp @@ -80,7 +80,7 @@ void FeaturesPlugin_Intersection::execute() return; } if (!anIntersectionAlgo.isValid()) { - std::string aFeatureError = "Error: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp b/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp index fd3d270a4..66a64ba43 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp @@ -93,7 +93,7 @@ void FeaturesPlugin_Partition::execute() bool isCombine = boolean(COMBINE_ID())->value(); if(anObjects.empty()/* || aTools.empty()*/) { - std::string aFeatureError = "Not enough objects for partition operation"; + std::string aFeatureError = "Error: Not enough objects for partition operation."; setError(aFeatureError); return; } @@ -112,17 +112,17 @@ void FeaturesPlugin_Partition::execute() // Checking that the algorithm worked properly. if (!aPartitionAlgo->isDone()) { - static const std::string aFeatureError = "Partition algorithm failed"; + static const std::string aFeatureError = "Error: Partition algorithm failed."; setError(aFeatureError); return; } if (aPartitionAlgo->shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if (!aPartitionAlgo->isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } @@ -147,17 +147,17 @@ void FeaturesPlugin_Partition::execute() // Checking that the algorithm worked properly. if (!aPartitionAlgo->isDone()) { - static const std::string aFeatureError = "Partition algorithm failed"; + static const std::string aFeatureError = "Error: Partition algorithm failed."; setError(aFeatureError); return; } if (aPartitionAlgo->shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } if (!aPartitionAlgo->isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index d38f20c19..43b25be20 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp @@ -70,7 +70,7 @@ void FeaturesPlugin_Placement::execute() } std::shared_ptr aStartShape = anObjRef->value(); if(!aStartShape) { - static const std::string aSelectionError = "The start shape selection is bad"; + static const std::string aSelectionError = "Error: The start shape selection is bad."; setError(aSelectionError); return; } @@ -82,7 +82,7 @@ void FeaturesPlugin_Placement::execute() aStartShapeContext = aContextRes->shape(); } if(!aStartShapeContext.get()) { - static const std::string aContextError = "The start shape selection context is bad"; + static const std::string aContextError = "Error: The start shape selection context is bad."; setError(aContextError); return; } @@ -91,7 +91,7 @@ void FeaturesPlugin_Placement::execute() anObjRef = selection(END_SHAPE_ID()); std::shared_ptr anEndShape = anObjRef->value(); if(!anEndShape) { - static const std::string aSelectionError = "The end shape selection is bad"; + static const std::string aSelectionError = "Error: The end shape selection is bad."; setError(aSelectionError); return; } @@ -102,7 +102,7 @@ void FeaturesPlugin_Placement::execute() anEndShapeContext = aContextRes->shape(); } if(!anEndShapeContext.get()) { - static const std::string aContextError = "The end shape selection context is bad"; + static const std::string aContextError = "Error: The end shape selection context is bad."; setError(aContextError); return; } @@ -113,7 +113,7 @@ void FeaturesPlugin_Placement::execute() if (aShapes[i]->isFace()) { std::shared_ptr aFace(new GeomAPI_Face(aShapes[i])); if (!aFace->isPlanar()) { - static const std::string aPlanarityError = "One of selected faces is not planar"; + static const std::string aPlanarityError = "Error: One of selected faces is not planar."; setError(aPlanarityError); return; } @@ -121,7 +121,7 @@ void FeaturesPlugin_Placement::execute() else if (aShapes[i]->isEdge()) { std::shared_ptr anEdge(new GeomAPI_Edge(aShapes[i])); if (!anEdge->isLine()) { - static const std::string aLinearityError = "One of selected endges is not linear"; + static const std::string aLinearityError = "Error: One of selected endges is not linear."; setError(aLinearityError); return; } @@ -136,7 +136,7 @@ void FeaturesPlugin_Placement::execute() GeomAlgoAPI_Placement aPlacementAlgo( aStartShapeContext, anEndShapeContext, aStartShape, anEndShape, isReverse, isCentering, true); if(!aPlacementAlgo.isDone()) { - static const std::string aFeatureError = "Placement algorithm failed"; + static const std::string aFeatureError = "Error: Placement algorithm failed."; setError(aFeatureError); return; } @@ -159,17 +159,17 @@ void FeaturesPlugin_Placement::execute() // Checking that the algorithm worked properly. if(!aTransformAlgo.isDone()) { - static const std::string aFeatureError = "Transform algorithm failed"; + static const std::string aFeatureError = "Error: Transform algorithm failed."; setError(aFeatureError); break; } if(aTransformAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); break; } if(!aTransformAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); break; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp index c6fc2ed5c..5a7a34b39 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp @@ -68,13 +68,13 @@ void FeaturesPlugin_Revolution::execute() ResultPtr aContext = aFaceSel->context(); std::shared_ptr aContextShape = aContext->shape(); if(!aContextShape.get()) { - static const std::string aContextError = "The selection context is bad"; + static const std::string aContextError = "Error: The selection context is bad."; setError(aContextError); return; } ResultConstructionPtr aConstruction = std::dynamic_pointer_cast(aContext); if(!aConstruction.get()) { - static const std::string aFaceError = "Can not find basis for revolution"; + static const std::string aFaceError = "Error: Can not find basis for revolution."; setError(aFaceError); return; } @@ -146,7 +146,7 @@ void FeaturesPlugin_Revolution::execute() GeomAlgoAPI_Revolution aRevolAlgo(aBaseShape, anAxis, aToShape, aToAngle, aFromShape, aFromAngle); if(!aRevolAlgo.isDone()) { - static const std::string aPrismAlgoError = "Revolution algorithm failed"; + static const std::string aPrismAlgoError = "Error: Revolution algorithm failed."; setError(aPrismAlgoError); aResultIndex = 0; break; @@ -154,13 +154,13 @@ void FeaturesPlugin_Revolution::execute() // Check if shape is valid if(!aRevolAlgo.shape().get() || aRevolAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); aResultIndex = 0; break; } if(!aRevolAlgo.isValid()) { - std::string aPrismAlgoError = "Warning: resulting shape is not valid"; + std::string aPrismAlgoError = "Error: Resulting shape is not valid."; setError(aPrismAlgoError); aResultIndex = 0; break; diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp index 566cac8a1..aaade0a86 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp @@ -96,7 +96,7 @@ void FeaturesPlugin_RevolutionBoolean::makeSolids(const ListOfShape& theFaces, // Checking that the algorithm worked properly. if(!aRevolAlgo->isDone() || !aRevolAlgo->shape().get() || aRevolAlgo->shape()->isNull() || !aRevolAlgo->isValid()) { - setError("Revolution algorithm failed"); + setError("Error: Revolution algorithm failed."); theResults.clear(); return; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp index 0423ac8af..3d3076ab5 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp @@ -90,17 +90,17 @@ void FeaturesPlugin_Rotation::execute() // Checking that the algorithm worked properly. if(!aRotationAlgo.isDone()) { - static const std::string aFeatureError = "Rotation algorithm failed"; + static const std::string aFeatureError = "Error: Rotation algorithm failed."; setError(aFeatureError); break; } if(aRotationAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); break; } if(!aRotationAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); break; } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp b/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp index 41a93ddba..c3931387c 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp @@ -93,17 +93,17 @@ void FeaturesPlugin_Translation::execute() // Checking that the algorithm worked properly. if(!aTranslationAlgo.isDone()) { - static const std::string aFeatureError = "Translation algorithm failed"; + static const std::string aFeatureError = "Error: Translation algorithm failed."; setError(aFeatureError); break; } if(aTranslationAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); break; } if(!aTranslationAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); break; } diff --git a/src/SketchPlugin/SketchPlugin_ConstraintFillet.h b/src/SketchPlugin/SketchPlugin_ConstraintFillet.h index bd8a51888..b1199bcb8 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintFillet.h +++ b/src/SketchPlugin/SketchPlugin_ConstraintFillet.h @@ -26,7 +26,7 @@ class SketchPlugin_ConstraintFillet : public SketchPlugin_ConstraintBase { public: struct FilletFeatures { - std::list baseEdges; ///< list of objects the fillet is based + std::list> baseEdgesState; ///< list of objects the fillet is based and its states std::list resultEdges; ///< list of result edges std::list resultConstraints; ///< list of constraints provided by the fillet }; -- 2.39.2