Skip to content

Commit 35c3ffe

Browse files
authored
Merge pull request #813 from IKhonakhbeeva/camera
Fix getPhoto if the contents of the image folder change
2 parents 4bea116 + 6520d67 commit 35c3ffe

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ void trik::TrikTextualInterpreter::abort()
148148
void trik::TrikTextualInterpreter::init()
149149
{
150150
mBrick.init(); // very crucial. Maybe move into interpret methods?
151+
// TODO: Remove this hack after trikRuntime is fixed to support source directory changes in camera imitation
152+
reinitRobotsParts();
151153
}
152154
153155
void trik::TrikTextualInterpreter::setErrorReporter(qReal::ErrorReporterInterface &errorReporter)

qrtranslations/fr/plugins/robots/trikKitInterpreterCommon_fr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>QObject</name>
66
<message>
7-
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+194"/>
7+
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+196"/>
88
<source>Bogus input values</source>
99
<translation type="unfinished"></translation>
1010
</message>
@@ -223,7 +223,7 @@
223223
<context>
224224
<name>trik::TrikTextualInterpreter</name>
225225
<message>
226-
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-94"/>
226+
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-96"/>
227227
<source>Unsupported script file type</source>
228228
<translation type="unfinished"></translation>
229229
</message>

qrtranslations/ru/plugins/robots/trikKitInterpreterCommon_ru.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<context>
55
<name>QObject</name>
66
<message>
7-
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+194"/>
7+
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+196"/>
88
<source>Bogus input values</source>
99
<translation>Неподходящие значения аргументов</translation>
1010
</message>
@@ -280,7 +280,7 @@
280280
<context>
281281
<name>trik::TrikTextualInterpreter</name>
282282
<message>
283-
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-94"/>
283+
<location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-96"/>
284284
<source>Unsupported script file type</source>
285285
<translation>Неверный формат файла</translation>
286286
</message>

0 commit comments

Comments
 (0)