Skip to content
Snippets Groups Projects
Commit 079abc4d authored by Xavier Gibert's avatar Xavier Gibert
Browse files

project warnings clean

parent 15d58c97
No related branches found
No related tags found
No related merge requests found
......@@ -2,16 +2,14 @@ package cs.si.satatt;
/*import org.xwalk.core.XWalkResourceClient;
import org.xwalk.core.XWalkUIClient;*/
import mission.Mission;
import mission.MissionAndId;
import org.xwalk.core.XWalkResourceClient;
import org.xwalk.core.XWalkUIClient;
import org.xwalk.core.XWalkView;
import com.commonsware.cwac.loaderex.SQLiteCursorLoader;
import database.MissionReaderDbHelper;
import dialogs.ErrorDialogFragment;
import dialogs.ResetAppDialogFragment;
import dialogs.ResetDbDialogFragment;
......@@ -32,7 +30,6 @@ import android.support.v7.app.ActionBar;
import android.app.DialogFragment;
import android.app.FragmentManager;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
import android.support.v4.widget.DrawerLayout;
import android.os.Bundle;
import android.view.Menu;
......
package cs.si.satatt;
import java.io.IOException;
import java.sql.Date;
import java.text.SimpleDateFormat;
import org.orekit.errors.OrekitException;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.DateComponents;
import org.orekit.time.DateTimeComponents;
import org.orekit.time.TimeScale;
import org.orekit.time.TimeScalesFactory;
......@@ -14,13 +11,10 @@ import org.orekit.time.TimeScalesFactory;
import mission.Mission;
import mission.MissionAndId;
import cs.si.satatt.R;
import cs.si.satatt.R.id;
import cs.si.satatt.R.layout;
import database.SerializationUtil;
import database.MissionReaderContract.MissionEntry;
import android.app.Activity;
import android.content.ContentValues;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
......
......@@ -4,9 +4,7 @@ import mission.Mission;
import mission.MissionAndId;
import simulator.Simulator;
import simulator.SimulatorStatus;
import cs.si.satatt.AboutActivity;
import cs.si.satatt.MainActivity;
import cs.si.satatt.MissionActivity;
import cs.si.satatt.R;
import cs.si.satatt.SatAttApplication;
import database.MissionReaderDbHelper;
......@@ -20,7 +18,6 @@ import android.app.LoaderManager.LoaderCallbacks;
import android.os.Bundle;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.Loader;
import android.content.SharedPreferences;
import android.database.Cursor;
......
......@@ -12,7 +12,6 @@ import org.orekit.time.TimeScale;
import org.orekit.time.TimeScalesFactory;
import org.xwalk.core.XWalkView;
import android.util.Log;
import android.view.View;
import android.widget.ProgressBar;
import android.widget.TextView;
......@@ -98,7 +97,6 @@ public class ModelSimulation {
private TimeScale utc;
private Frame sunFrame;
public void updateSimulation(SpacecraftState scs, int sim_progress){
String debg = "";
ModelState new_state = new ModelState();
ModelInfo new_info = new ModelInfo();
......@@ -106,26 +104,21 @@ public class ModelSimulation {
Attitude sc_att = scs.getAttitude();
new_state.value_attitude = new Quat(sc_att.getOrientation().getRotation());
debg += "Attitude: "+new_state.value_attitude.w+","+new_state.value_attitude.x+","+new_state.value_attitude.y+","+new_state.value_attitude.z+"|";
Vector3D velocity = scs.getPVCoordinates().getVelocity();
new_state.value_velocity[0] = velocity.getX()/1000;
new_state.value_velocity[1] = velocity.getY()/1000;
new_state.value_velocity[2] = velocity.getZ()/1000;
new_info.velocity = scs.getPVCoordinates().getVelocity().getNorm()/1000;
debg += "Velocity: "+new_state.value_velocity[0]+","+new_state.value_velocity[1]+","+new_state.value_velocity[2]+"|";
new_state.value_momentum[0] = scs.getPVCoordinates().getMomentum().getX();
new_state.value_momentum[1] = scs.getPVCoordinates().getMomentum().getY();
new_state.value_momentum[2] = scs.getPVCoordinates().getMomentum().getZ();
debg += "Momentum: "+new_state.value_momentum[0]+","+new_state.value_momentum[1]+","+new_state.value_momentum[2]+"|";
Vector3D earth = scs.getPVCoordinates().getPosition().negate();
new_state.value_earth[0] = earth.getX()/1000;
new_state.value_earth[1] = earth.getY()/1000;
new_state.value_earth[2] = earth.getZ()/1000;
new_info.orbit_radium = earth.getNorm()/1000;
debg += "Earth: "+new_state.value_earth[0]+","+new_state.value_earth[1]+","+new_state.value_earth[2]+"|";
try {
Vector3D sun = scs.getPVCoordinates(sunFrame).getPosition().negate();
......@@ -133,7 +126,7 @@ public class ModelSimulation {
new_state.value_sun[0] = sun.getX()/1000;
new_state.value_sun[1] = sun.getY()/1000;
new_state.value_sun[2] = sun.getZ()/1000;
debg += "Sun: "+new_state.value_sun[0]+","+new_state.value_sun[1]+","+new_state.value_sun[2]+"|";
} catch (OrekitException e) {
e.printStackTrace();
activity.showErrorDialog(activity.getString(R.string.error_computing_orekit), false);
......@@ -147,8 +140,6 @@ public class ModelSimulation {
AbsoluteDate date = sc_att.getDate();
new_info.time = date.getComponents(utc).toString();
debg += "Time: "+new_info.time+"|";
//Compute acceleration
if(tmp_time != null){
......@@ -161,9 +152,7 @@ public class ModelSimulation {
new_state.value_acceleration[1] = acceleration.getY();
new_state.value_acceleration[2] = acceleration.getZ();
new_info.acceleration = acceleration.getNorm();
debg += "Accel: "+new_state.value_acceleration[0]+","+new_state.value_acceleration[1]+","+new_state.value_acceleration[2]+"|";
}
//Log.d("SIMU", debg);
//Update temporal variables for acceleration computation
tmp_vel = velocity;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment