Skip to content

Add playTone visualisation to code interpretation #1171

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

Merged
iakov merged 1 commit into from
Nov 18, 2020
Merged

Add playTone visualisation to code interpretation #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikbrick.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class TrikBrick final : public trikControl::BrickInterface
public slots:
void configure(const QString &, const QString &) override {}
void playSound(const QString &) override {}
void playTone(int, int msDuration) override;
void say(const QString &msg) override;
void stop() override;
trikControl::MotorInterface *motor(const QString &port) override;
Expand All @@ -95,7 +96,6 @@ public slots:
trikControl::FifoInterface *fifo(const QString &) override {return nullptr;}
trikControl::I2cDeviceInterface *i2c(int, int) override {return nullptr;}

void playTone(int, int) override {}
QVector<uint8_t> getStillImage() override;
trikControl::EventDeviceInterface *eventDevice(const QString &) override {return nullptr;}
void stopEventDevice(const QString &) override {}
Expand Down
5 changes: 5 additions & 0 deletions plugins/robots/interpreters/trikKitInterpreterCommon/src/trikbrick.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ void TrikBrick::say(const QString &msg) {
QMetaObject::invokeMethod(sh, [sh, msg](){sh->say(msg);});
}

void TrikBrick::playTone(int, int msDuration) {
auto* robot = mTwoDRobotModel.data();
QMetaObject::invokeMethod(robot, [robot, msDuration](){robot->engine()->playSound(msDuration);});
}

void TrikBrick::stop() {
/// @todo: properly implement this?
mTwoDRobotModel->stopRobot();
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/fr/plugins/robots/trikKitInterpreterCommon_fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</message>
<message>
<location line="-30"/>
<location line="+262"/>
<location line="+267"/>
<source>Trying to read from file %1 failed</source>
<translation type="unfinished"></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/ru/plugins/robots/trikKitInterpreterCommon_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
</message>
<message>
<location line="-30"/>
<location line="+262"/>
<location line="+267"/>
<source>Trying to read from file %1 failed</source>
<translation>Не удалось открыть файл %1</translation>
</message>
Expand Down