Compiling 32bit on Mac OS again to re-gain Google Earth support, fixed MAP API KEY to re-enable Google Maps support, added Asctec Hex rotor and SenseSoar models

14 years ago · 751839cc16
7 changed files with 11770 additions and 12 deletions
--- a/files/vehicles/SenseSoar_Airplane/senseSoarDummy.dae
+++ b/files/vehicles/SenseSoar_Airplane/senseSoarDummy.dae
--- a/files/vehicles/sFly_Hexrotor/sfly-hex.dae
+++ b/files/vehicles/sFly_Hexrotor/sfly-hex.dae
--- a/files/vehicles/sFly_Hexrotor/sfly-hex.skp
+++ b/files/vehicles/sFly_Hexrotor/sfly-hex.skp
--- a/images/earth.html
+++ b/images/earth.html
@ -1,4 +1,4 @@
				@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

 <html>
  <head>
@ -8,7 +8,7 @@
				@@ -8,7 +8,7 @@
    <title>QGroundControl Google Earth View</title>
    <!-- *** Replace the key below below with your own API key, available at http://code.google.com/apis/maps/signup.html *** -->
    <!--<script type="text/javascript" src="https://getfirebug.com/firebug-lite-beta.js"></script>-->
-    <script type="text/javascript" src="http://www.google.com/jsapi?key=ABQIAAAAwbkbZLyhsmTCWXbTcjbgbRSzHs7K5SvaUdm8ua-Xxy_-2dYwMxQMhnagaawTo7L1FE1-amhuQxIlXw"></script>
+    <script type="text/javascript" src="https://www.google.com/jsapi?key=ABQIAAAA5Q6wxQ6lxKS8haLVdUJaqhSjosg_0jiTTs2iXtkDVG0n0If1mBRHzhWw5VqBZX-j4NuzoVpU-UaHVg"></script>
    <script type="text/javascript">
 google.load("earth", "1", { 'language': 'en'});

@ -415,9 +415,9 @@ function createAircraft(id, type, color)
				@@ -415,9 +415,9 @@ function createAircraft(id, type, color)
 	planeModel.setLocation(planeLoc);
 	planeLink = ge.createLink('');
 	planeOrient = ge.createOrientation(''); 
-	planeModel.setOrientation(planeOrient);
+	planeModel.setOrientation(planeOrient); 

-	planeLink.setHref('http://www.asl.ethz.ch/people/rudink/senseSoarDummy.dae'); 
+	planeLink.setHref('http://qgroundcontrol.org/_media/users/models/sfly-hex.dae');
 	planeModel.setLink(planeLink);
 	planeModel.setAltitudeMode (ge.ALTITUDE_ABSOLUTE); 

@ -584,10 +584,10 @@ function setAircraftPositionAttitude(id, lat, lon, alt, roll, pitch, yaw)
				@@ -584,10 +584,10 @@ function setAircraftPositionAttitude(id, lat, lon, alt, roll, pitch, yaw)
 		//currFollowHeading = ((yaw/M_PI)+1.0)*360.0;
 	
 	
-		planeOrient.setRoll(+((pitch / M_PI)) * 180.0);  
-		planeOrient.setTilt(-((roll / M_PI)) * 180.0);  
-		planeOrient.setHeading(((yaw / M_PI)) * 180.0 - 90.0); 
-		planeModel.setOrientation(planeOrient);
+		// FIXME Currently invalid conversion from right-handed z-down to z-up frame
+		planeOrient.setRoll(((roll/M_PI))*180.0+180.0);
+		planeOrient.setTilt(((pitch/M_PI))*180.0+180.0);
+		planeOrient.setHeading(((yaw/M_PI))*180.0-90.0);
 	
 		currFollowHeading = ((yaw/M_PI))*180.0;
    
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@ -42,8 +42,8 @@ macx {
				@@ -42,8 +42,8 @@ macx {
   # COMPILER_VERSION = $$system(gcc -v)
    #message(Using compiler $$COMPILER_VERSION)

-        CONFIG += x86_64 cocoa phonon
-        CONFIG -= x86
+        CONFIG += x86 cocoa phonon
+        CONFIG -= x86_64

    #HARDWARE_PLATFORM = $$system(uname -a)
    #contains( $$HARDWARE_PLATFORM, "9.6.0" ) || contains( $$HARDWARE_PLATFORM, "9.7.0" ) || contains( $$HARDWARE_PLATFORM, "9.8.0" ) || contains( $$HARDWARE_PLATFORM, "9.9.0" ) {
--- a/src/libs/opmapcontrol/src/core/providerstrings.cpp
+++ b/src/libs/opmapcontrol/src/core/providerstrings.cpp
@ -63,7 +63,7 @@ namespace core {
				@@ -63,7 +63,7 @@ namespace core {
        /// Google Maps API generated using http://greatmaps.codeplex.com/
        /// from http://code.google.com/intl/en-us/apis/maps/signup.html
        /// </summary>
-        GoogleMapsAPIKey = "ABQIAAAAWaQgWiEBF3lW97ifKnAczhRAzBk5Igf8Z5n2W3hNnMT0j2TikxTLtVIGU7hCLLHMAuAMt-BO5UrEWA";
+        GoogleMapsAPIKey = "ABQIAAAA5Q6wxQ6lxKS8haLVdUJaqhSjosg_0jiTTs2iXtkDVG0n0If1mBRHzhWw5VqBZX-j4NuzoVpU-UaHVg";

        // Yahoo version strings
        VersionYahooMap = "4.3";
--- a/src/libs/opmapcontrol/src/mapwidget/waypointlineitem.cpp
+++ b/src/libs/opmapcontrol/src/mapwidget/waypointlineitem.cpp
@ -27,7 +27,6 @@ WaypointLineItem::WaypointLineItem(WayPointItem* wp1, WayPointItem* wp2, QColor
				@@ -27,7 +27,6 @@ WaypointLineItem::WaypointLineItem(WayPointItem* wp1, WayPointItem* wp2, QColor
    setLine(localPoint1.X(), localPoint1.Y(), localPoint2.X(), localPoint2.Y());

    // Connect updates
-
    // Update line from both waypoints
    connect(wp1, SIGNAL(WPValuesChanged(WayPointItem*)), this, SLOT(updateWPValues(WayPointItem*)));
    connect(wp2, SIGNAL(WPValuesChanged(WayPointItem*)), this, SLOT(updateWPValues(WayPointItem*)));