Merge pull request #423 from anastasiia-kornilova/400_function_remane

Function block was changed to expression (+icon)

Author: iakov

plugins/robots/editor/common/generated/elements.h

@@ -376,7 +376,7 @@
 			: NodeElementType(metamodel)
 		{
 			setName("Function");
-			setFriendlyName(QObject::tr("Function"));
+			setFriendlyName(QObject::tr("Expression"));
 			setDiagram("RobotsDiagram");
 			setDescription(QObject::tr("Evaluates a value of the given expression. Also new variables can be defined in this block. See the 'Expressions Syntax' chapter in help for more information about 'Function' block syntax."));
 			qReal::LabelProperties label_1(1, 0.6, 1.2, "Body", false, 0);
@@ -385,7 +385,7 @@
 			label_1.setScalingY(false);
 			label_1.setHard(false);
 			label_1.setPlainTextMode(false);
-			label_1.setPrefix(QObject::tr("Body:"));
+			label_1.setPrefix(QObject::tr("Expression:"));
 			addLabel(label_1);
 			loadSdf(utils::xmlUtils::loadDocument(":/generated/shapes/FunctionClass.sdf").documentElement());
 			setSize(QSizeF(50, 50));
@@ -410,7 +410,7 @@
 
 		void initProperties()
 		{
-			addProperty("Body", "string", QObject::tr(""), QObject::tr("Body"), QObject::tr(""), false);
+			addProperty("Body", "string", QObject::tr(""), QObject::tr("Expression"), QObject::tr(""), false);
 		}
 	};
 

plugins/robots/editor/common/robotsMetamodel.xml

@@ -48,7 +48,7 @@
 			<role arrowType="no_arrow" name="NoArrowRole">
 			    <properties/>
 			</role>
- 			<role arrowType="open_arrow" name="OpenArrowRole">
+			<role arrowType="open_arrow" name="OpenArrowRole">
 			    <properties/>
 			</role>
 		</nonGraphicTypes>
@@ -457,20 +457,20 @@
 					</generalizations>
 				</logic>
 			</node>
-			<node displayedName="Function" name="Function" path="58, 12 : 58, 172 :  | 58, 12 : 148, 12 :  | 12, 96 : 108, 96 : " description="Evaluates a value of the given expression. Also new variables can be defined in this block. See the 'Expressions Syntax' chapter in help for more information about 'Function' block syntax.">
+			<node displayedName="Expression" name="Function" path="58, 12 : 58, 172 :  | 58, 12 : 148, 12 :  | 12, 96 : 108, 96 : " description="Evaluates a value of the given expression. Also new variables can be defined in this block. See the 'Expressions Syntax' chapter in help for more information about 'Function' block syntax.">
 				<graphics>
 					<picture sizex="50" sizey="50">
 						<image y1="0" name="images/functionBlock.png" x1="0" y2="50" x2="50"/>
 					</picture>
 					<labels>
-						<label x="30" y="60" textBinded="Body" background="white" prefix="Body:"/>
+						<label x="30" y="60" textBinded="Body" background="white" prefix="Expression:"/>
 					</labels>
 					<nonResizeable/>
 				</graphics>
 				<logic>
 					<container/>
 					<properties>
-						<property displayedName="Body" type="string" name="Body"/>
+						<property displayedName="Expression" type="string" name="Body"/>
 					</properties>
 					<generalizations>
 						<parent parentName="AbstractNode"/>