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

AndroidGCS PFD: Properly center image now so it works over multiple sizes.

Browse Source 
However, it doesn't automatically fill the screen in normal PFD view yet.  Specifying the width in pfd.xml directly does fix that but is incorrect.
This commit is contained in:
James Cotton 2012-08-27 11:05:08 -05:00
parent 7b5470dcf2
commit 57cf7c67a6
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
View File

@ -93,25 +93,33 @@ public class AttitudeView extends View {
@Override
protected void onDraw(Canvas canvas) {
final int PX = getMeasuredWidth() / 2;
final int PY = getMeasuredHeight() / 2;
final int PX = getMeasuredWidth();
final int PY = getMeasuredHeight();
// TODO: Figure out why these magic numbers are needed to center it
final int WIDTH = 600;
final int HEIGHT = 600;
final int DEG_TO_PX = 10; // Magic number for how to scale pitch
// Want 60 deg to move the horizon all the way off the screen
final int DEG_TO_PX = (PY/2) / 60; // Magic number for how to scale pitch
canvas.save(0);
canvas.rotate(-roll, PX, PY);
canvas.save();
canvas.rotate(-roll, PX / 2, PY / 2);
canvas.translate(0, pitch * DEG_TO_PX);
Drawable horizon = getContext().getResources().getDrawable(
R.drawable.im_pfd_horizon);
// This puts the image at the center of the PFD canvas (after it was
// translated)
horizon.setBounds(-(WIDTH - PX) / 2, -(HEIGHT - PY) / 2, WIDTH, HEIGHT);
double margin = 0.5;
horizon.setBounds( (int) (-margin * PX), (int) (-margin * PY), (int) ((1 + margin) * PX), (int) ((1+margin) *PY));
horizon.draw(canvas);
canvas.restore();
canvas.drawLine(0, 0, PX, 0, markerPaint);
canvas.drawLine(0, 0, 0, PY, markerPaint);
canvas.drawLine(PX, 0, PX, PY, markerPaint);
canvas.drawLine(0, PY, PX, PY, markerPaint);
canvas.drawLine(0,PY/2,PX,PY/2,markerPaint);
canvas.drawLine(PX/2,0,PX/2,PY,markerPaint);
}
}

5
androidgcs/src/org/openpilot/androidgcs/PfdActivity.java
View File

@ -28,7 +28,6 @@ import org.openpilot.androidgcs.fragments.PFD;
import android.app.FragmentTransaction;
import android.os.Bundle;
import android.view.View;
import android.widget.AbsListView;
import android.widget.LinearLayout;
public class PfdActivity extends ObjectManagerActivity {
@ -44,8 +43,8 @@ public class PfdActivity extends ObjectManagerActivity {
layout.setOrientation(LinearLayout.HORIZONTAL);
layout.setLayoutParams(new LinearLayout.LayoutParams(
AbsListView.LayoutParams.MATCH_PARENT,
AbsListView.LayoutParams.MATCH_PARENT));
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
layout.setId(0x101);
{
FragmentTransaction fragmentTransaction = getFragmentManager()