Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim precision for every functional operation in 2D interpreter #1704

Closed
wants to merge 6 commits into from
Closed

Trim precision for every functional operation in 2D interpreter #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5950f7
Trim precision for every functional operation in 2D interpreter
IKhonakhbeeva Feb 22, 2024
a19f38d
Merge branch 'master' into print_text_block
iakov Jun 2, 2024
1acde6e
Merge branch 'master' into print_text_block
iakov Jun 3, 2024
6776c39
Merge branch 'master' into print_text_block
iakov Jul 29, 2024
4180c34
Merge branch 'master' into print_text_block
iakov Jul 30, 2024
b7af2ec
Merge branch 'master' into print_text_block
iakov Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions plugins/robots/common/trikKit/src/blocks/details/trikPrintTextBlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ 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")
? QString::number(QString::number(eval<qreal>("PrintText"), 'f', 6).toDouble())
: stringProperty("PrintText");
const QString result = boolProperty("Evaluate") ? eval<QString>("PrintText") : stringProperty("PrintText");
const bool redraw = boolProperty("Redraw");

if (!errorsOccured()) {
Expand Down
4 changes: 1 addition & 3 deletions plugins/robots/interpreters/interpreterCore/src/coreBlocks/details/printTextBlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ 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")
? QString::number(QString::number(eval<qreal>("PrintText"), 'f', 6).toDouble())
: stringProperty("PrintText");
const QString result = boolProperty("Evaluate") ? eval<QString>("PrintText") : stringProperty("PrintText");
const bool redraw = boolProperty("Redraw");

if (!errorsOccured()) {
Expand Down
4 changes: 3 additions & 1 deletion plugins/robots/interpreters/interpreterCore/src/textLanguage/robotsBlockParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ void RobotsBlockParser::addIntrinsicFuctions()
, std::function<qreal(qreal)> const &function)
{
add1aryFunction(name, new types::Float, new types::Float
, [function](const QVariant &arg) { return function(arg.toReal()); });
, [function](const QVariant &arg) {
return QString::number(function(arg.toReal()), 'f').toDouble();
});
};

const auto addIntegerFunction = [add1aryFunction] (const QString &name
Expand Down
Loading