Fix sin/cos and small values display (#1631)

* Fix printing very small values for printTextBlock

* Use degrees for sin and cos in block's programming instead of radians

* Fix sin/cos generation for python and js on trik

* Fix printTextBlock for trik too

Author: IKhonakhbeeva

plugins/robots/common/trikKit/src/blocks/details/trikPrintTextBlock.cpp

@@ -30,7 +30,9 @@ void TrikPrintTextBlock::doJob(kitBase::robotModel::robotParts::Display &display
 	const int x = eval<int>("XCoordinateText");
 	const int y = eval<int>("YCoordinateText");
 	const int fontSize = eval<int>("FontSize");
-	const QString result = boolProperty("Evaluate") ? eval<QString>("PrintText") : stringProperty("PrintText");
+	const QString result = boolProperty("Evaluate")
+			? QString::number(QString::number(eval<qreal>("PrintText"), 'f', 6).toDouble())
+			: stringProperty("PrintText");
 	const bool redraw = boolProperty("Redraw");
 
 	if (!errorsOccured()) {

plugins/robots/generators/trik/trikPythonGeneratorLibrary/templates/functions/cos.t

@@ -1 +1 @@
-math.cos(@@ARGUMENT@@)
+math.cos(@@ARGUMENT@@*pi/180)

plugins/robots/generators/trik/trikPythonGeneratorLibrary/templates/functions/sin.t

@@ -1 +1 @@
-math.sin(@@ARGUMENT@@)
+math.sin(@@ARGUMENT@@*pi/180)

plugins/robots/generators/trik/trikQtsGeneratorLibrary/templates/functions/cos.t

@@ -1 +1 @@
-Math.cos(@@ARGUMENT@@)
+Math.cos(@@ARGUMENT@@*pi/180)

plugins/robots/generators/trik/trikQtsGeneratorLibrary/templates/functions/sin.t

@@ -1 +1 @@
-Math.sin(@@ARGUMENT@@)
+Math.sin(@@ARGUMENT@@*pi/180)

plugins/robots/interpreters/interpreterCore/src/coreBlocks/details/printTextBlock.cpp

@@ -28,7 +28,9 @@ void PrintTextBlock::doJob(kitBase::robotModel::robotParts::Display &display)
 {
 	const int x = eval<int>("XCoordinateText");
 	const int y = eval<int>("YCoordinateText");
-	const QString result = boolProperty("Evaluate") ? eval<QString>("PrintText") : stringProperty("PrintText");
+	const QString result = boolProperty("Evaluate")
+			? QString::number(QString::number(eval<qreal>("PrintText"), 'f', 6).toDouble())
+			: stringProperty("PrintText");
 	const bool redraw = boolProperty("Redraw");
 
 	if (!errorsOccured()) {

plugins/robots/interpreters/interpreterCore/src/textLanguage/robotsBlockParser.cpp

@@ -198,8 +198,8 @@ void RobotsBlockParser::addIntrinsicFuctions()
 		return text;
 	});
 
-	addFloatFunction("sin", [](qreal x) {return qSin(x); });
-	addFloatFunction("cos", [](qreal x) {return qCos(x); });
+	addFloatFunction("sin", [](qreal x) { return qSin(M_PI / 180 * x); });
+	addFloatFunction("cos", [](qreal x) { return qCos(M_PI / 180 * x); });
 	addFloatFunction("ln", [](qreal x) {return qLn(x); });
 	addFloatFunction("exp", [](qreal x) {return qExp(x); });
 	addFloatFunction("asin", [](qreal x) {return qAsin(x); });