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

Jump to bottom

Merge master into junior #1124

Merged
merged 3 commits into from
Sep 29, 2020
Merged

Merge master into junior #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63e4b7a
Fix loading robot image from settings
IKhonakhbeeva Sep 28, 2020
f1b2320
Merge pull request #1122 from IKhonakhbeeva/robot_image
iakov Sep 28, 2020
3b39857
Merge master into junior
IKhonakhbeeva Sep 29, 2020
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
3 changes: 3 additions & 0 deletions plugins/robots/common/twoDModel/include/twoDModel/robotModel/twoDRobotModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class TWO_D_MODEL_EXPORT TwoDRobotModel : public kitBase::robotModel::CommonRobo
QList<kitBase::robotModel::PortInfo> configurablePorts() const override;
QList<kitBase::robotModel::DeviceInfo> convertibleBases() const override;
int priority() const override;
void rereadSettings() override;

/// Configures 2D model window`s engine for using it in 2D model devices emulators.
void setEngine(engine::TwoDModelEngineInterface &engine);
Expand Down Expand Up @@ -128,6 +129,8 @@ class TWO_D_MODEL_EXPORT TwoDRobotModel : public kitBase::robotModel::CommonRobo
/// Returns scanning angle and max distance by given device type.
virtual QPair<qreal,int> rangeSensorAngleAndDistance (const kitBase::robotModel::DeviceInfo &deviceType) const;

signals:
void settingsChanged();
protected:
kitBase::robotModel::robotParts::Device *createDevice(
const kitBase::robotModel::PortInfo &port
Expand Down
8 changes: 8 additions & 0 deletions plugins/robots/common/twoDModel/src/engine/view/scene/robotItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ RobotItem::RobotItem(const QString &robotImageFileName, model::RobotModel &robot
connect(&mRobotModel.configuration(), &model::SensorsConfiguration::rotationChanged
, this, &RobotItem::updateSensorRotation);

connect(&mRobotModel.info(), &twoDModel::robotModel::TwoDRobotModel::settingsChanged
, this, &RobotItem::updateImage);

setAcceptHoverEvents(true);
setAcceptDrops(true);
setZValue(ZValue::Robot);
Expand Down Expand Up @@ -383,3 +386,8 @@ void RobotItem::BeepItem::drawBeepArcs(QPainter *painter, const QPointF &center,
painter->drawArc(rect, 225 * 16, 90 * 16);
painter->restore();
}

void RobotItem::updateImage()
{
mImage.loadFrom(mRobotModel.info().robotImage());
}
1 change: 1 addition & 0 deletions plugins/robots/common/twoDModel/src/engine/view/scene/robotItem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class RobotItem : public graphicsUtils::RotateItem, public items::SolidItem
void ride(const QPointF &newPos, qreal rotation);

void onLanded();
void updateImage();

/** @brief Image of a robot drawn on scene */
model::Image mImage;
Expand Down
5 changes: 5 additions & 0 deletions plugins/robots/common/twoDModel/src/robotModel/twoDRobotModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,8 @@ DeviceInfo TwoDRobotModel::markerInfo() const
{
return DeviceInfo::create<parts::Marker>();
}

void TwoDRobotModel::rereadSettings()
{
emit settingsChanged();
}