Browse Source

Fixed boost dependency

QGC4.4
lm 15 years ago
parent
commit
5e22d5a848
  1. 6
      src/uas/UAS.cc
  2. 2
      src/ui/map3D/QMap3DWidget.cc
  3. 4
      src/ui/map3D/QMap3DWidget.h

6
src/uas/UAS.cc

@ -1132,8 +1132,8 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
manualYawAngle = yaw * yawScaling; manualYawAngle = yaw * yawScaling;
manualThrust = thrust * thrustScaling; manualThrust = thrust * thrustScaling;
if(mode == (int)MAV_MODE_MANUAL) // if(mode == (int)MAV_MODE_MANUAL)
{ // {
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES #ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
mavlink_message_t message; mavlink_message_t message;
mavlink_msg_manual_control_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &message, this->uasId, (float)manualRollAngle, (float)manualPitchAngle, (float)manualYawAngle, (float)manualThrust, controlRollManual, controlPitchManual, controlYawManual, controlThrustManual); mavlink_msg_manual_control_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &message, this->uasId, (float)manualRollAngle, (float)manualPitchAngle, (float)manualYawAngle, (float)manualThrust, controlRollManual, controlPitchManual, controlYawManual, controlThrustManual);
@ -1142,7 +1142,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
emit attitudeThrustSetPointChanged(this, roll, pitch, yaw, thrust, MG::TIME::getGroundTimeNow()); emit attitudeThrustSetPointChanged(this, roll, pitch, yaw, thrust, MG::TIME::getGroundTimeNow());
#endif #endif
} // }
} }
int UAS::getSystemType() int UAS::getSystemType()

2
src/ui/map3D/QMap3DWidget.cc

@ -64,7 +64,7 @@ QMap3DWidget::display(void* clientData)
void void
QMap3DWidget::displayHandler(void) QMap3DWidget::displayHandler(void)
{ {
if (cheetahModel.get() == 0) if (cheetahModel.data() == 0)
{ {
cheetahModel.reset(new CheetahModel); cheetahModel.reset(new CheetahModel);
cheetahModel->init(1.0f, 1.0f, 1.0f); cheetahModel->init(1.0f, 1.0f, 1.0f);

4
src/ui/map3D/QMap3DWidget.h

@ -34,8 +34,8 @@ protected:
private: private:
double lastRedrawTime; double lastRedrawTime;
boost::scoped_ptr<CheetahModel> cheetahModel; QScopedPointer<CheetahModel> cheetahModel;
boost::scoped_ptr<FTTextureFont> font; QScopedPointer<FTTextureFont> font;
}; };
#endif // QMAP3DWIDGET_H #endif // QMAP3DWIDGET_H

Loading…
Cancel
Save