Skip to content

Commit 29b1225

Browse files
authored
Fixing import (#786)
* SetRunner when settingDir, always change tab path Path to tab wasn't changing when we open code tabs in robot mode * Update trikRuntime module
1 parent 4c8e820 commit 29b1225

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikTextualInterpreter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ROBOTS_TRIK_KIT_INTERPRETER_COMMON_EXPORT TrikTextualInterpreter
4343
void setErrorReporter(qReal::ErrorReporterInterface &errorReporter);
4444
bool isRunning() const;
4545
void setRunning(bool running);
46-
void setCurrentDir(const QString &dir);
46+
void setCurrentDir(const QString &dir, const QString &languageExtension);
4747
QStringList supportedRobotModelNames() const;
4848
QStringList knownMethodNames() const;
4949

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void TrikKitInterpreterPluginBase::startCodeInterpretation(const QString &code,
125125

126126
auto texttab = dynamic_cast<qReal::text::QScintillaTextEdit *>(mMainWindow->currentTab());
127127
auto savePath = texttab ? mCurrentTabPath : mProjectManager->saveFilePath();
128-
textualInterpreter()->setCurrentDir(QFileInfo(savePath).absolutePath());
128+
textualInterpreter()->setCurrentDir(QFileInfo(savePath).absolutePath(), extension);
129129
textualInterpreter()->setRunning(true);
130130
emit started();
131131
textualInterpreter()->interpretScript(code, extension);
@@ -152,7 +152,7 @@ void TrikKitInterpreterPluginBase::startCodeInterpretation(const QString &code
152152
mMainWindow->errorReporter()->clear();
153153
textualInterpreter()->init();
154154

155-
textualInterpreter()->setCurrentDir(QFileInfo(mProjectManager->saveFilePath()).absolutePath());
155+
textualInterpreter()->setCurrentDir(QFileInfo(mProjectManager->saveFilePath()).absolutePath(), extension);
156156
textualInterpreter()->setRunning(true);
157157
emit started();
158158
textualInterpreter()->interpretScriptExercise(code, inputs, extension);
@@ -546,12 +546,12 @@ void TrikKitInterpreterPluginBase::testStop(qReal::interpretation::StopReason re
546546

547547
void TrikKitInterpreterPluginBase::onTabChanged(const TabInfo &info)
548548
{
549+
mCurrentTabPath = info.pathToOpenedTextFile();
549550
if (!mIsModelSelected) {
550551
return;
551552
}
552553
const bool isCodeTab = info.type() == qReal::TabInfo::TabType::code;
553554
const bool isQtsInterp = mTextualInterpreter->supportedRobotModelNames().contains(mCurrentlySelectedModelName);
554-
mCurrentTabPath = info.pathToOpenedTextFile();
555555

556556
if (isCodeTab) {
557557
auto texttab = dynamic_cast<qReal::text::QScintillaTextEdit *>(mMainWindow->currentTab());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,10 @@ void trik::TrikTextualInterpreter::setRunning(bool running)
225225
mBrick.processSensors(running);
226226
}
227227

228-
void trik::TrikTextualInterpreter::setCurrentDir(const QString &dir)
228+
void trik::TrikTextualInterpreter::setCurrentDir(const QString &dir, const QString &languageExtension)
229229
{
230230
mBrick.setCurrentDir(dir);
231+
mScriptRunner.setDefaultRunner(languageExtension);
231232
mScriptRunner.setWorkingDirectory(trikKernel::FileUtils::normalizePath(dir));
232233
}
233234

0 commit comments

Comments
 (0)