Add onSuccess event (#1604)

* Add onSuccess event * Add true condition
trikset · Oct 17, 2022 · beaab34 · beaab34
1 parent 4a8f3b1
commit beaab34
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp
@@ -41,7 +41,7 @@ ConstraintsChecker::ConstraintsChecker(qReal::ErrorReporterInterface &errorRepor
 			mDefferedSuccessTriggered = true;
 		} else {
 			mSuccessTriggered = true;
-			emit success();
+			onSuccess();
 		}
 	});
 	connect(&mStatus, &details::StatusReporter::fail, this, [this]() { mFailTriggered = true; });
@@ -293,9 +293,21 @@ void ConstraintsChecker::programFinished(qReal::interpretation::StopReason reaso
 {
 	if (!mSuccessTriggered && !mFailTriggered && mEnabled) {
 		if (mDefferedSuccessTriggered && reason == qReal::interpretation::StopReason::finised) {
-			emit success();
+			onSuccess();
 		} else {
 			emit fail(tr("Program has finished, but the task is not accomplished."));
 		}
 	}
 }
+
+void ConstraintsChecker::onSuccess()
+{
+	for (const auto &event : mEvents) {
+		if (event->id() == "on_success") {
+			event->setUp();
+			event->check();
+			break;
+		}
+	}
+	emit success();
+}
diff --git a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h
@@ -119,6 +119,8 @@ class ConstraintsChecker : public QObject
 	void programStarted();
 	void programFinished(qReal::interpretation::StopReason reason);
 
+	void onSuccess();
+
 	qReal::ErrorReporterInterface &mErrorReporter;
 	model::Model &mModel;
 	details::StatusReporter mStatus;

diff --git a/plugins/robots/common/twoDModel/src/engine/constraints/details/constraintsParser.cpp b/plugins/robots/common/twoDModel/src/engine/constraints/details/constraintsParser.cpp
@@ -294,6 +294,10 @@ Condition ConstraintsParser::parseConditionContents(const QDomElement &element,
 		return parseNegationTag(element, event);
 	}
 
+	if (tag == "true") {
+		return mConditions.constant(true);
+	}
+
 	if (tag == "equals" || tag.startsWith("notequal")
 			|| tag == "greater" || tag == "less"
 			|| tag == "notgreater" || tag == "notless")

diff --git a/qrtranslations/fr/plugins/robots/twoDModel_fr.ts b/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
@@ -68,7 +68,7 @@
         <translation>Attribut &quot;glue&quot; doit avoir une valeur &quot;and&quot; ou &quot;or&quot;.</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+59"/>
         <location line="+183"/>
         <source>Unknown tag &quot;%1&quot;.</source>
         <translation>Balise inconnue &quot;%1&quot;.</translation>

diff --git a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
@@ -237,7 +237,7 @@
         <translation>Аттрибут &quot;glue&quot; должен иметь значение &quot;and&quot; или &quot;or&quot;.</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+59"/>
         <location line="+183"/>
         <source>Unknown tag &quot;%1&quot;.</source>
         <translation>Неизвестный тэг &quot;%1&quot;.</translation>