Merge branch 'v10release' of github.com:hengli/qgroundcontrol into v10release

src/ui/HUD.cc

@@ -153,6 +153,7 @@ HUD::HUD(int width, int height, QWidget* parent)
     connect(refreshTimer, SIGNAL(timeout()), this, SLOT(paintHUD()));
 
     // Resize to correct size and fill with image
+    resize(this->width(), this->height());
     //glDrawPixels(glImage.width(), glImage.height(), GL_RGBA, GL_UNSIGNED_BYTE, glImage.bits());
 
     // Set size once

src/ui/QGCRGBDView.cc

@@ -248,7 +248,7 @@ void QGCRGBDView::updateData(UASInterface *uas)
             {
                 if (depth[c] != 0)
                 {
-                    int idx = fminf(depth[c], 10.0f) / 10.0f * 127.0f;
+                    int idx = fminf(depth[c], 7.0f) / 7.0f * 127.0f;
                     idx = 127 - idx;
 
                     pixel[0] = colormapJet[idx][2] * 255.0f;

src/ui/map3D/Pixhawk3DWidget.cc

@@ -1242,7 +1242,7 @@ Pixhawk3DWidget::updateRGBD(double robotX, double robotY, double robotZ)
             {
                 if (depth[c] != 0)
                 {
-                    int idx = fminf(depth[c], 10.0f) / 10.0f * 127.0f;
+                    int idx = fminf(depth[c], 7.0f) / 7.0f * 127.0f;
                     idx = 127 - idx;
 
                     pixel[0] = colormap_jet[idx][2] * 255.0f;