LP-559 Update Controller page - SetupWizard with vector pics

Author: f5soh

ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp

@@ -216,68 +216,61 @@ void ControllerPage::connectionStatusChanged()
 
         SetupWizard::CONTROLLER_TYPE type = getControllerType();
         setControllerType(type);
-        QPixmap boardPic;
-        QSize picSize = QSize(250, 250);
 
         switch (type) {
         case SetupWizard::CONTROLLER_CC:
-            boardPic.load(":/configgadget/images/coptercontrol.svg");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/coptercontrol.svg"));
             break;
 
         case SetupWizard::CONTROLLER_CC3D:
-            boardPic.load(":/configgadget/images/cc3d_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/cc3d.svg"));
             break;
 
         case SetupWizard::CONTROLLER_REVO:
         case SetupWizard::CONTROLLER_DISCOVERYF4:
-            boardPic.load(":/configgadget/images/revolution_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/revolution.svg"));
             break;
 
         case SetupWizard::CONTROLLER_NANO:
-            boardPic.load(":/configgadget/images/nano_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/revo_nano.svg"));
             break;
 
         case SetupWizard::CONTROLLER_SPARKY2:
-            boardPic.load(":/configgadget/images/sparky2_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/sparky2.svg"));
             break;
 
         case SetupWizard::CONTROLLER_SPRACINGF3:
-            boardPic.load(":/configgadget/images/spracingf3_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/spracingf3.svg"));
             break;
 
         case SetupWizard::CONTROLLER_SPRACINGF3EVO:
-            boardPic.load(":/configgadget/images/spracingf3evo_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/spracingf3evo.svg"));
             break;
 
         case SetupWizard::CONTROLLER_PIKOBLX:
-            boardPic.load(":/configgadget/images/pikoblx_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/pikoblx.svg"));
             break;
 
         case SetupWizard::CONTROLLER_TINYFISH:
-            boardPic.load(":/configgadget/images/tinyfish_top.png");
-            ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
+            ui->boardImg->load(QString(":/configgadget/images/tinyfish.svg"));
             break;
 
         default:
-            ui->boardImg->setPixmap(QPixmap());
+            ui->boardImg->load(QString(""));
             break;
         }
+        QSize picSize = ui->boardImg->sizeHint();
+        picSize.scale(250, 250, Qt::KeepAspectRatio);
+        ui->boardImg->setFixedSize(picSize);
+        ui->boardImg->show();
         qDebug() << "Connection status changed: Connected, controller type: " << getControllerType();
     } else {
         ui->deviceCombo->setEnabled(true);
         ui->connectButton->setText(tr("Connect"));
         ui->boardTypeCombo->setEnabled(false);
         ui->boardTypeCombo->model()->setData(ui->boardTypeCombo->model()->index(0, 0), QVariant(0), Qt::UserRole - 1);
         setControllerType(SetupWizard::CONTROLLER_UNKNOWN);
-        ui->boardImg->setPixmap(QPixmap());
+        ui->boardImg->hide();
         qDebug() << "Connection status changed: Disconnected";
     }
     emit completeChanged();

ground/gcs/src/plugins/setupwizard/pages/controllerpage.ui

@@ -83,7 +83,7 @@ p, li { white-space: pre-wrap; }
       <number>6</number>
      </property>
      <item>
-      <widget class="QLabel" name="boardImg">
+      <widget class="QSvgWidget" name="boardImg" native="true">
        <property name="minimumSize">
         <size>
          <width>100</width>
@@ -96,12 +96,6 @@ p, li { white-space: pre-wrap; }
          <height>250</height>
         </size>
        </property>
-       <property name="text">
-        <string notr="true"/>
-       </property>
-       <property name="scaledContents">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
     </layout>
@@ -203,6 +197,13 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QSvgWidget</class>
+   <extends>QWidget</extends>
+   <header>qsvgwidget.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>