From: vsv Date: Tue, 7 Jun 2016 14:39:32 +0000 (+0300) Subject: Correct compilation errors X-Git-Tag: V_2.4.0~136 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=28f4045c9be1df4b9fb76b5b01f32f4c78293dfe;p=modules%2Fshaper.git Correct compilation errors --- diff --git a/src/Config/Config_Translator.cpp b/src/Config/Config_Translator.cpp index 9a03118fe..b6984f002 100644 --- a/src/Config/Config_Translator.cpp +++ b/src/Config/Config_Translator.cpp @@ -109,7 +109,7 @@ std::string insertParameters(const std::string& theString, const std::list #include + +/// The definition provides collection and writing of missed translations //#define MISSED_TRANSLATION /** diff --git a/src/Events/Events_InfoMessage.h b/src/Events/Events_InfoMessage.h index bf92b3af3..e44121955 100644 --- a/src/Events/Events_InfoMessage.h +++ b/src/Events/Events_InfoMessage.h @@ -63,7 +63,7 @@ public: void addParameter(double theParam) { char aBuf[50]; - int n = sprintf_s(aBuf, "%g", theParam); + int n = sprintf(aBuf, "%g", theParam); std::string aStr(aBuf); myParameters.push_back(aStr); } @@ -73,7 +73,7 @@ public: void addParameter(int theParam) { char aBuf[50]; - int n = sprintf_s(aBuf, "%d", theParam); + int n = sprintf(aBuf, "%d", theParam); std::string aStr(aBuf); myParameters.push_back(aStr); } diff --git a/src/SketchPlugin/SketchPlugin_msg_en.ts b/src/SketchPlugin/SketchPlugin_msg_en.ts index 32b56ab36..7861640f7 100644 --- a/src/SketchPlugin/SketchPlugin_msg_en.ts +++ b/src/SketchPlugin/SketchPlugin_msg_en.ts @@ -55,6 +55,10 @@ ModelAPI_StateInvalidArgument Wrong object is selected + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + Line is not selected + @@ -65,7 +69,15 @@ Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. - Select second line is not selected + Second line is not selected + + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + First line is not selected + + + ConstraintEntityB - GeomValidators_ShapeType: The object is empty + Second line is not selected @@ -75,6 +87,18 @@ Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. Circle is nopt selected + + Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer. + + + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + + + + ConstraintValue - GeomValidators_Positive: Double is not initialized. + + @@ -87,6 +111,10 @@ Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. Line is not selected + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + Line is not selected + @@ -107,6 +135,14 @@ Attribute "StartPoint" is locked by modification value in the viewer. Select a start point in the viewer + + Attribute "StartPoint" is not initialized. + Start point is not selected + + + Attribute "EndPoint" is not initialized. + + @@ -184,4 +220,248 @@ Intermediate point is not defined + + + SketchConstraintMirror + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + Line is not selected + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + Mirror line is not selected + + + Model_FeatureValidator: Attribute "ConstraintMirrorList" is not initialized. + Objects for mirror are not selected + + + + + SketchMultiRotation + + Model_FeatureValidator: Attribute "AngleType" is not initialized. + Type of angle is not defined + + + Model_FeatureValidator: Attribute "MultiRotationCenter" is not initialized. + Rotation center is not selected + + + MultiRotationCenter - GeomValidators_ShapeType: The object is empty + Rotation center is not selected + + + + + SketchMultiTranslation + + Model_FeatureValidator: Attribute "MultiTranslationEndPoint" is not initialized. + End point of translation vector is not defined + + + Model_FeatureValidator: Attribute "MultiTranslationList" is not initialized. + Objects for translation are not selected + + + MultiTranslationEndPoint - GeomValidators_ShapeType: The object is empty + End point of translation vector is not selected + + + MultiTranslationStartPoint - GeomValidators_ShapeType: The object is empty + Start point of translation vector is not selected + + + + + SketchConstraintAngle + + Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer. + + + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + + + + ConstraintEntityB - GeomValidators_ShapeType: The object is empty + + + + Model_FeatureValidator: Attribute "AngleReversedLine1" is not initialized. + + + + + + SketchConstraintCoincidence + + ConstraintEntityA - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. + + + + ConstraintEntityB - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. + + + + + + SketchConstraintDistance + + Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer. + + + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + + + + ConstraintEntityB - GeomValidators_ShapeType: The object is empty + + + + ConstraintValue - GeomValidators_Positive: Double is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. + + + + + + SketchConstraintEqual + + ConstraintEntityA - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. + + + + ConstraintEntityB - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. + + + + ConstraintEntityB - SketchPlugin_EqualAttr: An empty object is used. + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. + + + + + + SketchConstraintLength + + Attribute "ConstraintFlyoutValuePnt" is locked by modification value in the viewer. + + + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + + + + ConstraintValue - GeomValidators_Positive: Double is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + + + SketchConstraintMiddle + + ConstraintEntityA - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. + + + + ConstraintEntityB - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. + + + + ConstraintEntityB - SketchPlugin_MiddlePointAttr: Middle point constraint allows points and lines only + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. + + + + + + SketchConstraintParallel + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + + + + ConstraintEntityB - GeomValidators_ShapeType: The object is empty + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. + + + + + + SketchConstraintRigid + + ConstraintEntityA - GeomValidators_ShapeType: The object is empty + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + + + SketchConstraintTangent + + ConstraintEntityA - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityA and ConstraintEntityB attributes. + + + + ConstraintEntityB - PartSet_DifferentObjects: The feature uses one object in ConstraintEntityB and ConstraintEntityA attributes. + + + + ConstraintEntityB - SketchPlugin_TangentAttr: It uses an empty object + + + + Model_FeatureValidator: Attribute "ConstraintEntityA" is not initialized. + + + + Model_FeatureValidator: Attribute "ConstraintEntityB" is not initialized. + + +