Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed HUD to Attitude Indicator (AI) #651

Merged
merged 1 commit into from
Feb 25, 2014
Merged

Renamed HUD to Attitude Indicator (AI) #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DroidPlanner/res/layout/fragment_hud.xml → ...es/layout/fragment_attitude_indicator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical" >

<org.droidplanner.widgets.HUD.HUD
<org.droidplanner.widgets.AttitudeIndicator
android:id="@+id/hudWidget"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
Expand Down
12 changes: 6 additions & 6 deletions DroidPlanner/res/layout/fragment_telemetry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
android:text="@string/default_angle_value"
android:textSize="16sp"/>

<org.droidplanner.widgets.HUD.HUD
android:id="@+id/hudView"
<org.droidplanner.widgets.AttitudeIndicator
android:id="@+id/aiView"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toRightOf="@+id/rollValueText"
Expand All @@ -100,7 +100,7 @@
android:paddingRight="10dp"
android:paddingBottom="1dp"
android:layout_alignLeft="@+id/rollValueText"
android:layout_alignRight="@+id/hudView"
android:layout_alignRight="@+id/aiView"
android:baselineAligned="true">

<TextView
Expand Down Expand Up @@ -146,7 +146,7 @@
android:paddingRight="10dp"
android:paddingBottom="1dp"
android:layout_alignLeft="@+id/rollValueText"
android:layout_alignRight="@+id/hudView"
android:layout_alignRight="@+id/aiView"
android:baselineAligned="true">

<TextView
Expand Down Expand Up @@ -192,7 +192,7 @@
android:paddingRight="10dp"
android:paddingBottom="1dp"
android:layout_alignLeft="@+id/rollValueText"
android:layout_alignRight="@+id/hudView"
android:layout_alignRight="@+id/aiView"
android:baselineAligned="true">

<TextView
Expand Down Expand Up @@ -237,7 +237,7 @@
android:paddingRight="10dp"
android:paddingBottom="1dp"
android:layout_alignLeft="@+id/rollValueText"
android:layout_alignRight="@+id/hudView"
android:layout_alignRight="@+id/aiView"
android:baselineAligned="true">

<TextView
Expand Down
8 changes: 4 additions & 4 deletions DroidPlanner/src/org/droidplanner/fragments/TelemetryFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.droidplanner.drone.Drone;
import org.droidplanner.drone.DroneInterfaces.DroneEventsType;
import org.droidplanner.drone.DroneInterfaces.OnDroneListener;
import org.droidplanner.widgets.HUD.HUD;
import org.droidplanner.widgets.AttitudeIndicator;

import android.content.SharedPreferences;
import android.os.Bundle;
Expand All @@ -19,7 +19,7 @@

public class TelemetryFragment extends Fragment implements OnDroneListener{

private HUD hud;
private AttitudeIndicator attitudeIndicator;
private Drone drone;
private TextView roll;
private TextView yaw;
Expand All @@ -36,7 +36,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_telemetry, container,
false);
hud = (HUD) view.findViewById(R.id.hudView);
attitudeIndicator = (AttitudeIndicator) view.findViewById(R.id.aiView);

roll = (TextView) view.findViewById(R.id.rollValueText);
yaw = (TextView) view.findViewById(R.id.yawValueText);
Expand Down Expand Up @@ -95,7 +95,7 @@ public void onOrientationUpdate(Drone drone) {
y = 360+y;
}

hud.setAttitude(r, p, y);
attitudeIndicator.setAttitude(r, p, y);

roll.setText(String.format("%3.0f\u00B0", r));
pitch.setText(String.format("%3.0f\u00B0", p));
Expand Down
6 changes: 3 additions & 3 deletions ...src/org/droidplanner/widgets/HUD/HUD.java → ...oidplanner/widgets/AttitudeIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.droidplanner.widgets.HUD;
package org.droidplanner.widgets;

import android.content.Context;
import android.graphics.Canvas;
Expand All @@ -13,7 +13,7 @@
import android.util.AttributeSet;
import android.view.View;

public class HUD extends View {
public class AttitudeIndicator extends View {

private static final float INTERNAL_RADIUS = 0.85f;
private static final float YAW_ARROW_SIZE = 1.2f;
Expand Down Expand Up @@ -45,7 +45,7 @@ public class HUD extends View {
private float yaw, roll, pitch;
private Paint tickPaint;

public HUD(Context context, AttributeSet attrs) {
public AttitudeIndicator(Context context, AttributeSet attrs) {
super(context, attrs);
initialize();
setAttitude(-30, 20, 0);
Expand Down