rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

Merge branch 'pt/CC3d_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
This commit is contained in:
Mike LaBranche 2012-08-03 14:36:16 -07:00
commit 0643f59b85
7 changed files with 6551 additions and 8256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/libs/glc_lib/glc_ext.cpp
View File

@ -63,7 +63,7 @@ bool glc::loadGlSlExtension()
bool glc::loadPointSpriteExtension()
{
bool result= true;
#if !defined(Q_OS_MAC)
#if !defined(Q_OS_MAC) && !defined(Q_OS_LINUX)
const QGLContext* pContext= QGLContext::currentContext();
glPointParameterf = (PFNGLPOINTPARAMETERFARBPROC)pContext->getProcAddress(QLatin1String("glPointParameterf"));
if (!glPointParameterf) qDebug() << "not glPointParameterf";

14787
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

File diff suppressed because it is too large Load Diff

12
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
View File

@ -1690,10 +1690,10 @@
<actualPositionUsed>false</actualPositionUsed>
<altitude>2000</altitude>
<cacheOnly>false</cacheOnly>
<earthFile>%%DATAPATH%%pfd/pfd/default/readymap.earth</earthFile>
<earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
<latitude>46.671478</latitude>
<longitude>10.158932</longitude>
<qmlFile>%%DATAPATH%%pfd/pfd/default/Pfd.qml</qmlFile>
<qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
<terrainEnabled>false</terrainEnabled>
</data>
</NoTerrain>
@ -1706,10 +1706,10 @@
<actualPositionUsed>false</actualPositionUsed>
<altitude>2000</altitude>
<cacheOnly>false</cacheOnly>
<earthFile>%%DATAPATH%%pfd/pfd/default/readymap.earth</earthFile>
<earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
<latitude>46.671478</latitude>
<longitude>10.158932</longitude>
<qmlFile>%%DATAPATH%%pfd/pfd/default/Pfd.qml</qmlFile>
<qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
<terrainEnabled>true</terrainEnabled>
</data>
</Terrain>
@ -2701,10 +2701,10 @@
<Icon1>:\core\images\ah.png</Icon1>
<Icon10>:/core/images/openpilot_logo_64.png</Icon10>
<Icon2>:/core/images/config.png</Icon2>
<Icon3>:/core/images/cpu.png</Icon3>
<Icon3>:/core/images/cog.png</Icon3>
<Icon4>:/core/images/scopes.png</Icon4>
<Icon5>:/core/images/joystick.png</Icon5>
<Icon6>:/core/images/cog.png</Icon6>
<Icon6>:/core/images/cpu.png</Icon6>
<Icon7>:/core/images/openpilot_logo_64.png</Icon7>
<Icon8>:/core/images/openpilot_logo_64.png</Icon8>
<Icon9>:/core/images/openpilot_logo_64.png</Icon9>

BIN
ground/openpilotgcs/src/plugins/welcome/qml/images/system-off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
ground/openpilotgcs/src/plugins/welcome/qml/images/system-on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

4
ground/openpilotgcs/src/plugins/welcome/qml/main.qml
View File

@ -61,8 +61,8 @@ Rectangle {
}
WelcomePageButton {
baseIconName: "planner"
label: "Flight Planner"
baseIconName: "system"
label: "System"
onClicked: welcomePlugin.openPage("System")
}

2
ground/openpilotgcs/src/plugins/welcome/welcome.qrc
View File

@ -22,5 +22,7 @@
<file>qml/images/planner-off.png</file>
<file>qml/images/scopes-on.png</file>
<file>qml/images/scopes-off.png</file>
<file>qml/images/system-on.png</file>
<file>qml/images/system-off.png</file>
</qresource>
</RCC>