X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabAscent.java;h=afce937f415f3d8d88122a219c935a0c9adcc3f7;hp=2c4063396cbd1b5d58e454c9d05d3206feecfe0e;hb=c813c2c8f71017a686128e06b5178fc99ece251c;hpb=7339d2379713b5b7e4c4fe6bad89ed93f9d39e82

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index 2c406339..afce937f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_7.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -30,8 +30,6 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabAscent extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
 	private TextView mHeightView;
 	private TextView mMaxHeightView;
 	private TextView mSpeedView;
@@ -45,13 +43,6 @@ public class TabAscent extends AltosDroidTab {
 	private TextView mMainVoltageView;
 	private GoNoGoLights mMainLights;
 
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_ascent, container, false);
@@ -78,18 +69,11 @@ public class TabAscent extends AltosDroidTab {
 		return v;
 	}
 
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-	}
-
 	public String tab_name() {
 		return "ascent";
 	}
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
 			set_value(mHeightView, AltosConvert.height, 6, state.height());
 			set_value(mHeightView, AltosConvert.height, 6, state.height());