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

AndroidGCS OSG: Register for attitude updates in the OSG view

Browse Source
This commit is contained in:
James Cotton 2012-08-21 11:09:52 -05:00
parent b9e20ad0b7
commit 4dbaa63931
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
androidgcs/src/org/openpilot/androidgcs/OsgViewer.java
View File

@ -3,6 +3,7 @@ package org.openpilot.androidgcs;
import org.openpilot.osg.ColorPickerDialog; import org.openpilot.osg.ColorPickerDialog;
import org.openpilot.osg.EGLview; import org.openpilot.osg.EGLview;
import org.openpilot.osg.osgNativeLib; import org.openpilot.osg.osgNativeLib;
import org.openpilot.uavtalk.UAVObject;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.graphics.Color; import android.graphics.Color;
@ -22,6 +23,12 @@ import android.widget.ImageButton;
import android.widget.Toast; import android.widget.Toast;
public class OsgViewer extends ObjectManagerActivity implements View.OnTouchListener, View.OnKeyListener, ColorPickerDialog.OnColorChangeListener { public class OsgViewer extends ObjectManagerActivity implements View.OnTouchListener, View.OnKeyListener, ColorPickerDialog.OnColorChangeListener {
private static final String TAG = OsgViewer.class.getSimpleName();
private static final int LOGLEVEL = 2;
// private static boolean WARN = LOGLEVEL > 1;
private static final boolean DEBUG = LOGLEVEL > 0;
enum moveTypes { NONE , DRAG, MDRAG, ZOOM ,ACTUALIZE} enum moveTypes { NONE , DRAG, MDRAG, ZOOM ,ACTUALIZE}
enum navType { PRINCIPAL , SECONDARY } enum navType { PRINCIPAL , SECONDARY }
enum lightType { ON , OFF } enum lightType { ON , OFF }
@ -38,7 +45,6 @@ public class OsgViewer extends ObjectManagerActivity implements View.OnTouchList
int backgroundColor; int backgroundColor;
private static final String TAG = "OSG Activity";
//Ui elements //Ui elements
EGLview mView; EGLview mView;
Button uiCenterViewButton; Button uiCenterViewButton;
@ -342,4 +348,18 @@ public class OsgViewer extends ObjectManagerActivity implements View.OnTouchList
return (float)(Math.sqrt(x * x + y * y)); return (float)(Math.sqrt(x * x + y * y));
} }
// The below methods should all be called by the parent activity at the appropriate times
@Override
public void onOPConnected() {
super.onOPConnected();
registerObjectUpdates(objMngr.getObject("AttitudeActual"));
}
@Override
protected void objectUpdated(UAVObject obj) {
if (DEBUG) Log.d(TAG, "Object updated: " + obj.getName());
}
} }