Browse Source

bmp_22x22_8bit sometimes showing from bmp_22x22_8bit_greyscale.mavlink with random pixels

QGC4.4
pixhawk 14 years ago
parent
commit
919c2b2034
  1. 1
      src/uas/UAS.cc
  2. 25
      src/ui/HUD.cc

1
src/uas/UAS.cc

@ -902,6 +902,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) @@ -902,6 +902,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
// Restart statemachine
imagePacketsArrived = 0;
emit imageReady(this);
qDebug() << "imageReady emitted. all packets arrived";
//this->requestImage();
//qDebug() << "SENDING REQUEST TO GET NEW IMAGE FROM SYSTEM" << uasId;

25
src/ui/HUD.cc

@ -138,8 +138,8 @@ HUD::HUD(int width, int height, QWidget* parent) @@ -138,8 +138,8 @@ HUD::HUD(int width, int height, QWidget* parent)
hudInstrumentsEnabled(true),
videoEnabled(false),
xImageFactor(1.0),
yImageFactor(1.0)
imageRequested(false),
yImageFactor(1.0),
imageRequested(false)
{
// Set auto fill to false
setAutoFillBackground(false);
@ -168,7 +168,7 @@ HUD::HUD(int width, int height, QWidget* parent) @@ -168,7 +168,7 @@ HUD::HUD(int width, int height, QWidget* parent)
imageTimer->setInterval(250);
//connect(refreshTimer, SIGNAL(timeout()), this, SLOT(update()));
connect(refreshTimer, SIGNAL(timeout()), this, SLOT(paintHUD()));
connect(imageTimer, SIGNAL(timeout()), this, SLOT(requestNewImage()));
// connect(imageTimer, SIGNAL(timeout()), this, SLOT(requestNewImage())); TODO
// Resize to correct size and fill with image
//glDrawPixels(glImage.width(), glImage.height(), GL_RGBA, GL_UNSIGNED_BYTE, glImage.bits());
@ -1635,14 +1635,15 @@ void HUD::setPixels(int imgid, const unsigned char* imageData, int length, int s @@ -1635,14 +1635,15 @@ void HUD::setPixels(int imgid, const unsigned char* imageData, int length, int s
void HUD::requestNewImage()
{
if (!imageRequested)
{
this->u->requestImage();
imageRequested = true;
}
else
{
qDebug() << "HUD::requestNewImage()";
// if (!imageRequested)
// {
// this->u->requestImage();
// imageRequested = true;
// }
// else
// {
this->glImage = this->u->getImage();
imageRequested = false;
}
// imageRequested = false;
// }
}

Loading…
Cancel
Save