rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-17 02:52:12 +01:00
Code Issues Releases Activity

Fix compile errors

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@768 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-14 18:43:00 +00:00 committed by pip
parent 684f09d6b8
commit d11bdd5e8f
7 changed files with 0 additions and 710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/src/libs/opmapcontrol/src/finaltest/finaltest.pro
View File

@ -1,14 +0,0 @@
TARGET = finaltest
TEMPLATE = app
#include(../../opmapcontrol.pri)
LIBS+=../../../../../lib/openpilotgcs/OPMapWidgetd.dll
DESTDIR = ../../../../../bin
SOURCES += main.cpp\
mainwindow.cpp
HEADERS += mainwindow.h
FORMS += mainwindow.ui

10
ground/src/libs/opmapcontrol/src/finaltest/main.cpp
View File

@ -1,10 +0,0 @@
#include <QtGui/QApplication>
#include "mainwindow.h"
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
MainWindow w;
w.show();
return a.exec();
}

101
ground/src/libs/opmapcontrol/src/finaltest/mainwindow.cpp
View File

@ -1,101 +0,0 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
map=new mapcontrol::OPMapWidget();
ui->setupUi(this);
ui->comboBox->addItems(mapcontrol::Helper::MapTypes());
ui->comboBox->setCurrentIndex(mapcontrol::Helper::MapTypes().indexOf("GoogleHybrid"));
QHBoxLayout *layout=new QHBoxLayout(parent);
layout->addWidget(map);
layout->addWidget(ui->widget);
ui->centralWidget->setLayout(layout);
connect(map,SIGNAL(zoomChanged(double)),this,SLOT(zoomChanged(double)));
}
MainWindow::~MainWindow()
{
delete ui;
delete map;
}
void MainWindow::changeEvent(QEvent *e)
{
QMainWindow::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
ui->retranslateUi(this);
break;
default:
break;
}
}
void MainWindow::on_pushButtonZoomP_clicked()
{
double x,y;
x=map->Zoom();
y=ui->doubleSpinBox->value();
map->SetZoom(map->Zoom()+ui->doubleSpinBox->value());
}
void MainWindow::on_pushButtonZoomM_clicked()
{
map->SetZoom(map->Zoom()-ui->doubleSpinBox->value());
}
void MainWindow::on_checkBox_clicked(bool checked)
{
map->SetShowTileGridLines(checked);
}
void MainWindow::zoomChanged(double zoom)
{
ui->label_5->setText("CurrentZoom="+QString::number(zoom));
}
void MainWindow::on_pushButtonRL_clicked()
{
map->SetRotate(map->Rotate()-1);
}
void MainWindow::on_pushButtonRC_clicked()
{
map->SetRotate(0);
}
void MainWindow::on_pushButtonRR_clicked()
{
map->SetRotate(map->Rotate()+1);
}
void MainWindow::on_pushButton_clicked()
{
map->ReloadMap();
}
void MainWindow::on_pushButtonGO_clicked()
{
core::GeoCoderStatusCode::Types x=map->SetCurrentPositionByKeywords(ui->lineEdit->text());
ui->label->setText( mapcontrol::Helper::StrFromGeoCoderStatusCode(x));
}
void MainWindow::on_checkBox_2_clicked(bool checked)
{
map->SetUseOpenGL(checked);
}
void MainWindow::on_comboBox_currentIndexChanged(QString value)
{
if (map->isStarted())
map->SetMapType(mapcontrol::Helper::MapTypeFromString(value));
}
void MainWindow::on_pushButton_2_clicked()
{
map->X();
}

39
ground/src/libs/opmapcontrol/src/finaltest/mainwindow.h
View File

@ -1,39 +0,0 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include "../mapwidget/opmapwidget.h"
#include "C:/Users/Xapo\Documents/QT/OpenPilot/src/libs/opmapcontrol/opmapcontrol.h"
#include <QMainWindow>
namespace Ui {
class MainWindow;
}
class MainWindow : public QMainWindow {
Q_OBJECT
public:
MainWindow(QWidget *parent = 0);
~MainWindow();
protected:
void changeEvent(QEvent *e);
private:
Ui::MainWindow *ui;
mapcontrol::OPMapWidget *map;
private slots:
void on_pushButton_2_clicked();
void on_comboBox_currentIndexChanged(QString );
void on_checkBox_2_clicked(bool checked);
void on_pushButtonGO_clicked();
void on_pushButton_clicked();
void on_pushButtonRR_clicked();
void on_pushButtonRC_clicked();
void on_pushButtonRL_clicked();
void on_checkBox_clicked(bool checked);
void on_pushButtonZoomM_clicked();
void on_pushButtonZoomP_clicked();
void zoomChanged(double zoom);
};
#endif // MAINWINDOW_H

248
ground/src/libs/opmapcontrol/src/finaltest/mainwindow.ui
View File

@ -1,248 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>524</width>
<height>496</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QWidget" name="widget" native="true">
<property name="geometry">
<rect>
<x>110</x>
<y>15</y>
<width>181</width>
<height>421</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>181</width>
<height>16777215</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>MapType</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QComboBox" name="comboBox"/>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Goto Place</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item>
<widget class="QPushButton" name="pushButtonGO">
<property name="text">
<string>GO</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>GeoCoderStatusCode</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Rotate</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButtonRL">
<property name="text">
<string>Left</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonRC">
<property name="text">
<string>Center</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonRR">
<property name="text">
<string>Right</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Zoom</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="pushButtonZoomP">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonZoomM">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>ZoomIncrement</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox">
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>CurrentZoom=</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Misc</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>ShowGridLines</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>UseOpenGL</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>ReloadMap</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>524</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QToolBar" name="mainToolBar">
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
<widget class="QStatusBar" name="statusBar"/>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>

297
ground/src/libs/opmapcontrol/src/finaltest/ui_mainwindow.h
View File

@ -1,297 +0,0 @@
/********************************************************************************
** Form generated from reading UI file 'mainwindow.ui'
**
** Created: Mon 14. Jun 16:53:19 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UI_MAINWINDOW_H
#define UI_MAINWINDOW_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
#include <QtGui/QDoubleSpinBox>
#include <QtGui/QGroupBox>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QMainWindow>
#include <QtGui/QMenuBar>
#include <QtGui/QPushButton>
#include <QtGui/QStatusBar>
#include <QtGui/QToolBar>
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class Ui_MainWindow
{
public:
QWidget *centralWidget;
QWidget *widget;
QVBoxLayout *verticalLayout_4;
QVBoxLayout *verticalLayout_3;
QGroupBox *groupBox_5;
QVBoxLayout *verticalLayout_8;
QComboBox *comboBox;
QPushButton *pushButton_2;
QGroupBox *groupBox;
QVBoxLayout *verticalLayout_6;
QVBoxLayout *verticalLayout_5;
QLineEdit *lineEdit;
QPushButton *pushButtonGO;
QLabel *label;
QGroupBox *groupBox_2;
QHBoxLayout *horizontalLayout;
QPushButton *pushButtonRL;
QPushButton *pushButtonRC;
QPushButton *pushButtonRR;
QGroupBox *groupBox_3;
QVBoxLayout *verticalLayout;
QHBoxLayout *horizontalLayout_3;
QPushButton *pushButtonZoomP;
QPushButton *pushButtonZoomM;
QVBoxLayout *verticalLayout_2;
QLabel *label_4;
QDoubleSpinBox *doubleSpinBox;
QLabel *label_5;
QGroupBox *groupBox_4;
QVBoxLayout *verticalLayout_7;
QCheckBox *checkBox;
QCheckBox *checkBox_2;
QPushButton *pushButton;
QMenuBar *menuBar;
QToolBar *mainToolBar;
QStatusBar *statusBar;
void setupUi(QMainWindow *MainWindow)
{
if (MainWindow->objectName().isEmpty())
MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
MainWindow->resize(524, 496);
centralWidget = new QWidget(MainWindow);
centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
widget = new QWidget(centralWidget);
widget->setObjectName(QString::fromUtf8("widget"));
widget->setGeometry(QRect(110, 15, 181, 421));
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy.setHorizontalStretch(10);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
widget->setSizePolicy(sizePolicy);
widget->setMaximumSize(QSize(181, 16777215));
verticalLayout_4 = new QVBoxLayout(widget);
verticalLayout_4->setSpacing(0);
verticalLayout_4->setContentsMargins(0, 0, 0, 0);
verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
verticalLayout_3 = new QVBoxLayout();
verticalLayout_3->setSpacing(6);
verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
groupBox_5 = new QGroupBox(widget);
groupBox_5->setObjectName(QString::fromUtf8("groupBox_5"));
verticalLayout_8 = new QVBoxLayout(groupBox_5);
verticalLayout_8->setSpacing(6);
verticalLayout_8->setContentsMargins(11, 11, 11, 11);
verticalLayout_8->setObjectName(QString::fromUtf8("verticalLayout_8"));
comboBox = new QComboBox(groupBox_5);
comboBox->setObjectName(QString::fromUtf8("comboBox"));
verticalLayout_8->addWidget(comboBox);
pushButton_2 = new QPushButton(groupBox_5);
pushButton_2->setObjectName(QString::fromUtf8("pushButton_2"));
verticalLayout_8->addWidget(pushButton_2);
verticalLayout_3->addWidget(groupBox_5);
groupBox = new QGroupBox(widget);
groupBox->setObjectName(QString::fromUtf8("groupBox"));
verticalLayout_6 = new QVBoxLayout(groupBox);
verticalLayout_6->setSpacing(6);
verticalLayout_6->setContentsMargins(11, 11, 11, 11);
verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6"));
verticalLayout_5 = new QVBoxLayout();
verticalLayout_5->setSpacing(6);
verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
lineEdit = new QLineEdit(groupBox);
lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
verticalLayout_5->addWidget(lineEdit);
pushButtonGO = new QPushButton(groupBox);
pushButtonGO->setObjectName(QString::fromUtf8("pushButtonGO"));
verticalLayout_5->addWidget(pushButtonGO);
verticalLayout_6->addLayout(verticalLayout_5);
label = new QLabel(groupBox);
label->setObjectName(QString::fromUtf8("label"));
verticalLayout_6->addWidget(label);
verticalLayout_3->addWidget(groupBox);
groupBox_2 = new QGroupBox(widget);
groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
horizontalLayout = new QHBoxLayout(groupBox_2);
horizontalLayout->setSpacing(6);
horizontalLayout->setContentsMargins(11, 11, 11, 11);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
pushButtonRL = new QPushButton(groupBox_2);
pushButtonRL->setObjectName(QString::fromUtf8("pushButtonRL"));
horizontalLayout->addWidget(pushButtonRL);
pushButtonRC = new QPushButton(groupBox_2);
pushButtonRC->setObjectName(QString::fromUtf8("pushButtonRC"));
horizontalLayout->addWidget(pushButtonRC);
pushButtonRR = new QPushButton(groupBox_2);
pushButtonRR->setObjectName(QString::fromUtf8("pushButtonRR"));
horizontalLayout->addWidget(pushButtonRR);
verticalLayout_3->addWidget(groupBox_2);
groupBox_3 = new QGroupBox(widget);
groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
verticalLayout = new QVBoxLayout(groupBox_3);
verticalLayout->setSpacing(6);
verticalLayout->setContentsMargins(11, 11, 11, 11);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
horizontalLayout_3 = new QHBoxLayout();
horizontalLayout_3->setSpacing(6);
horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
pushButtonZoomP = new QPushButton(groupBox_3);
pushButtonZoomP->setObjectName(QString::fromUtf8("pushButtonZoomP"));
horizontalLayout_3->addWidget(pushButtonZoomP);
pushButtonZoomM = new QPushButton(groupBox_3);
pushButtonZoomM->setObjectName(QString::fromUtf8("pushButtonZoomM"));
horizontalLayout_3->addWidget(pushButtonZoomM);
verticalLayout->addLayout(horizontalLayout_3);
verticalLayout_2 = new QVBoxLayout();
verticalLayout_2->setSpacing(6);
verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
label_4 = new QLabel(groupBox_3);
label_4->setObjectName(QString::fromUtf8("label_4"));
label_4->setAlignment(Qt::AlignCenter);
verticalLayout_2->addWidget(label_4);
verticalLayout->addLayout(verticalLayout_2);
doubleSpinBox = new QDoubleSpinBox(groupBox_3);
doubleSpinBox->setObjectName(QString::fromUtf8("doubleSpinBox"));
doubleSpinBox->setSingleStep(0.1);
doubleSpinBox->setValue(1);
verticalLayout->addWidget(doubleSpinBox);
label_5 = new QLabel(groupBox_3);
label_5->setObjectName(QString::fromUtf8("label_5"));
label_5->setAlignment(Qt::AlignCenter);
verticalLayout->addWidget(label_5);
groupBox_4 = new QGroupBox(groupBox_3);
groupBox_4->setObjectName(QString::fromUtf8("groupBox_4"));
verticalLayout_7 = new QVBoxLayout(groupBox_4);
verticalLayout_7->setSpacing(6);
verticalLayout_7->setContentsMargins(11, 11, 11, 11);
verticalLayout_7->setObjectName(QString::fromUtf8("verticalLayout_7"));
checkBox = new QCheckBox(groupBox_4);
checkBox->setObjectName(QString::fromUtf8("checkBox"));
checkBox->setChecked(true);
verticalLayout_7->addWidget(checkBox);
checkBox_2 = new QCheckBox(groupBox_4);
checkBox_2->setObjectName(QString::fromUtf8("checkBox_2"));
verticalLayout_7->addWidget(checkBox_2);
pushButton = new QPushButton(groupBox_4);
pushButton->setObjectName(QString::fromUtf8("pushButton"));
verticalLayout_7->addWidget(pushButton);
verticalLayout->addWidget(groupBox_4);
verticalLayout_3->addWidget(groupBox_3);
verticalLayout_4->addLayout(verticalLayout_3);
MainWindow->setCentralWidget(centralWidget);
menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName(QString::fromUtf8("menuBar"));
menuBar->setGeometry(QRect(0, 0, 524, 21));
MainWindow->setMenuBar(menuBar);
mainToolBar = new QToolBar(MainWindow);
mainToolBar->setObjectName(QString::fromUtf8("mainToolBar"));
MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar);
statusBar = new QStatusBar(MainWindow);
statusBar->setObjectName(QString::fromUtf8("statusBar"));
MainWindow->setStatusBar(statusBar);
retranslateUi(MainWindow);
QMetaObject::connectSlotsByName(MainWindow);
} // setupUi
void retranslateUi(QMainWindow *MainWindow)
{
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
groupBox_5->setTitle(QApplication::translate("MainWindow", "MapType", 0, QApplication::UnicodeUTF8));
pushButton_2->setText(QApplication::translate("MainWindow", "PushButton", 0, QApplication::UnicodeUTF8));
groupBox->setTitle(QApplication::translate("MainWindow", "Goto Place", 0, QApplication::UnicodeUTF8));
pushButtonGO->setText(QApplication::translate("MainWindow", "GO", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("MainWindow", "GeoCoderStatusCode", 0, QApplication::UnicodeUTF8));
groupBox_2->setTitle(QApplication::translate("MainWindow", "Rotate", 0, QApplication::UnicodeUTF8));
pushButtonRL->setText(QApplication::translate("MainWindow", "Left", 0, QApplication::UnicodeUTF8));
pushButtonRC->setText(QApplication::translate("MainWindow", "Center", 0, QApplication::UnicodeUTF8));
pushButtonRR->setText(QApplication::translate("MainWindow", "Right", 0, QApplication::UnicodeUTF8));
groupBox_3->setTitle(QApplication::translate("MainWindow", "Zoom", 0, QApplication::UnicodeUTF8));
pushButtonZoomP->setText(QApplication::translate("MainWindow", "+", 0, QApplication::UnicodeUTF8));
pushButtonZoomM->setText(QApplication::translate("MainWindow", "-", 0, QApplication::UnicodeUTF8));
label_4->setText(QApplication::translate("MainWindow", "ZoomIncrement", 0, QApplication::UnicodeUTF8));
label_5->setText(QApplication::translate("MainWindow", "CurrentZoom=", 0, QApplication::UnicodeUTF8));
groupBox_4->setTitle(QApplication::translate("MainWindow", "Misc", 0, QApplication::UnicodeUTF8));
checkBox->setText(QApplication::translate("MainWindow", "ShowGridLines", 0, QApplication::UnicodeUTF8));
checkBox_2->setText(QApplication::translate("MainWindow", "UseOpenGL", 0, QApplication::UnicodeUTF8));
pushButton->setText(QApplication::translate("MainWindow", "ReloadMap", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui {
class MainWindow: public Ui_MainWindow {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UI_MAINWINDOW_H

1
ground/src/libs/opmapcontrol/src/src.pro
View File

@ -3,4 +3,3 @@ CONFIG += ordered
SUBDIRS = core
SUBDIRS += internals
SUBDIRS += mapwidget
SUBDIRS+=finaltest