From eb8ad597c38dd24771dc5351e4a85ed8b6a9bed5 Mon Sep 17 00:00:00 2001
From: zedamota <zedamota>
Date: Sat, 10 Apr 2010 23:01:59 +0000
Subject: [PATCH] Fixes performance issues under windows

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@475 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/plugins.pro                |  5 ++++-
 ground/src/plugins/uploader/uploader.pro      | 12 ++++--------
 .../plugins/uploader/uploadergadgetwidget.cpp | 19 +------------------
 .../plugins/uploader/uploadergadgetwidget.h   |  3 ---
 4 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/ground/src/plugins/plugins.pro b/ground/src/plugins/plugins.pro
index 99d132ffb..855395aa3 100644
--- a/ground/src/plugins/plugins.pro
+++ b/ground/src/plugins/plugins.pro
@@ -60,4 +60,7 @@ plugin_uavobjectbrowser.depends = plugin_coreplugin
 plugin_uavobjectbrowser.depends = plugin_uavobjects
 SUBDIRS += plugin_uavobjectbrowser
 
-
+#Uploader Gadget
+plugin_uploader.subdir = uploader
+plugin_uploader.depends = plugin_coreplugin
+SUBDIRS += plugin_uploader
diff --git a/ground/src/plugins/uploader/uploader.pro b/ground/src/plugins/uploader/uploader.pro
index f7e86e61b..738722be1 100755
--- a/ground/src/plugins/uploader/uploader.pro
+++ b/ground/src/plugins/uploader/uploader.pro
@@ -2,6 +2,8 @@ TEMPLATE = lib
 TARGET = Uploader
 include(../../openpilotgcsplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
+include(../../libs/qextserialport/qextserialport.pri)
+include(../../libs/qymodem/qymodem.pri)
 HEADERS += uploadergadget.h \
     uploadergadgetconfiguration.h \
     uploadergadgetfactory.h \
@@ -15,11 +17,5 @@ SOURCES += uploadergadget.cpp \
     uploadergadgetwidget.cpp \
     uploaderplugin.cpp
 OTHER_FILES += uploader.pluginspec
-
-LIBS += -l$$qtLibraryTarget(QExtSerialPort)
-LIBS += -l$$qtLibraryTarget(QYmodem)
-
-#CONFIG(debug, debug|release):LIBS += -lqextserialportd
-#else:LIBS += -lqextserialport
-#CONFIG(debug, debug|release):LIBS += -lqymodemd
-#else:LIBS += -lqymodem
+#LIBS += -l$$qtLibraryTarget(QExtSerialPort)
+#LIBS += -l$$qtLibraryTarget(QYmodem)
diff --git a/ground/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/src/plugins/uploader/uploadergadgetwidget.cpp
index 3222708df..0cf9223a8 100755
--- a/ground/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -62,33 +62,16 @@ UploaderGadgetWidget::UploaderGadgetWidget(QWidget *parent) : QWidget(parent)
     layout->addWidget(StatusWidget);
     setLayout(layout);
 
-    timer = new QTimer(this);
 
-    connect(timer, SIGNAL(timeout()),
-            this, SLOT(updatePerc()));
     connect(loadfile, SIGNAL(clicked(bool)),
             this,SLOT(setOpenFileName()));
     connect(sendBt, SIGNAL(clicked(bool)),
             this,SLOT(send()));
-
-
-
-}
-
-
-void UploaderGadgetWidget::updatePerc()
-{
-    if(!Ymodem->isRunning())
-    {
-         timer->stop();
-    }
-    progressBar->setValue(percent);
 }
 
 void UploaderGadgetWidget::send()
 {
     Ymodem->SendFileT(openFileNameLE->text());
-    timer->start(500);
 }
 
 UploaderGadgetWidget::~UploaderGadgetWidget()
@@ -111,7 +94,7 @@ void UploaderGadgetWidget::setPort(QextSerialPort* port)
 
 void UploaderGadgetWidget::updatePercSlot(int i)
 {
-    percent=i;
+    progressBar->setValue(i);
 }
 
 void UploaderGadgetWidget::setOpenFileName()
diff --git a/ground/src/plugins/uploader/uploadergadgetwidget.h b/ground/src/plugins/uploader/uploadergadgetwidget.h
index 46e6c8534..78f6eaac6 100755
--- a/ground/src/plugins/uploader/uploadergadgetwidget.h
+++ b/ground/src/plugins/uploader/uploadergadgetwidget.h
@@ -42,7 +42,6 @@
 #include <QtGui/QPushButton>
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QTimer>
 //using namespace qmapcontrol;
 
 
@@ -68,14 +67,12 @@ private:
      QymodemSend * Ymodem;
      QProgressBar *progressBar;
      QTimer *timer;
-     int percent;
 
 private slots:
     void setOpenFileName();
     void send();
     void error(QString errorString,int errorNumber);
     void info(QString infoString,int infoNumber);
-    void updatePerc();
     void updatePercSlot(int);
 };