From: Martin Vajnar Date: Wed, 28 Aug 2013 18:16:59 +0000 (+0200) Subject: ROBOT_DEMO: minor changes to UI X-Git-Tag: v0.3.4~42 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/b5cd62fbcdd341be3d17604b736ee21cc8801a6b ROBOT_DEMO: minor changes to UI --- diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java index cc2ab95..81bf7ef 100644 --- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java +++ b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java @@ -16,32 +16,34 @@ public final class R { public static final int logo_flamingos=0x7f020002; } public static final class id { - public static final int about=0x7f070018; - public static final int crane=0x7f070015; - public static final int editText1=0x7f070008; - public static final int editText2=0x7f07000b; - public static final int editText3=0x7f07000e; - public static final int editText4=0x7f070011; - public static final int exit=0x7f070019; - public static final int hokuyo=0x7f070014; + public static final int about=0x7f07001a; + public static final int crane=0x7f070017; + public static final int editText1=0x7f07000a; + public static final int editText2=0x7f07000d; + public static final int editText3=0x7f070010; + public static final int editText4=0x7f070013; + public static final int exit=0x7f07001b; + public static final int hokuyo=0x7f070016; public static final int hokuyo_view=0x7f070004; public static final int hokuyo_view_bg=0x7f070003; public static final int imageView1=0x7f070001; - public static final int magnet=0x7f070016; - public static final int managers=0x7f070005; - public static final int ownIP=0x7f070006; + public static final int magnet=0x7f070018; + public static final int managers=0x7f070006; + public static final int ownIP=0x7f070007; public static final int scrollView1=0x7f070000; - public static final int speed=0x7f070012; - public static final int speed_mon=0x7f070013; - public static final int tableRow1=0x7f070007; - public static final int tableRow2=0x7f070009; - public static final int tableRow3=0x7f07000c; - public static final int tableRow4=0x7f07000f; + public static final int scrollView2=0x7f070005; + public static final int scrollView3=0x7f070008; + public static final int speed=0x7f070014; + public static final int speed_mon=0x7f070015; + public static final int tableRow1=0x7f070009; + public static final int tableRow2=0x7f07000b; + public static final int tableRow3=0x7f07000e; + public static final int tableRow4=0x7f070011; public static final int textView1=0x7f070002; - public static final int textView2=0x7f07000a; - public static final int textView3=0x7f07000d; - public static final int textView4=0x7f070010; - public static final int voltage=0x7f070017; + public static final int textView2=0x7f07000c; + public static final int textView3=0x7f07000f; + public static final int textView4=0x7f070012; + public static final int voltage=0x7f070019; } public static final class layout { public static final int about_dialog=0x7f030000; diff --git a/orte/Robot_Demo/res/layout/about_dialog.xml b/orte/Robot_Demo/res/layout/about_dialog.xml index da2bca6..27d4f9e 100644 --- a/orte/Robot_Demo/res/layout/about_dialog.xml +++ b/orte/Robot_Demo/res/layout/about_dialog.xml @@ -1,8 +1,8 @@ - + + + + + + + + + + + + - - - - - - - - + \ No newline at end of file diff --git a/orte/Robot_Demo/res/layout/status_dialog.xml b/orte/Robot_Demo/res/layout/status_dialog.xml index e9454c6..bc2be60 100644 --- a/orte/Robot_Demo/res/layout/status_dialog.xml +++ b/orte/Robot_Demo/res/layout/status_dialog.xml @@ -1,105 +1,117 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:scrollbars="vertical" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orte/Robot_Demo/res/menu/activity_main.xml b/orte/Robot_Demo/res/menu/activity_main.xml index 793a6c0..db290e5 100644 --- a/orte/Robot_Demo/res/menu/activity_main.xml +++ b/orte/Robot_Demo/res/menu/activity_main.xml @@ -21,14 +21,15 @@ diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java index d79eee0..b786adb 100644 --- a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java +++ b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java @@ -149,7 +149,7 @@ public class HokuyoView extends View { x = (temp[0]-y)/0.30; speedCo[1] = -y; - speedCo[0] = speedCo[1]>0 ? -x : x; + speedCo[0] = x; } public void run(boolean run) { diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java index 644e01a..04bf53f 100644 --- a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java +++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java @@ -7,6 +7,7 @@ import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.DialogInterface.OnDismissListener; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.hardware.Sensor; @@ -151,7 +152,6 @@ public class MainActivity extends Activity { } } - @SuppressWarnings("deprecation") @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -172,19 +172,19 @@ public class MainActivity extends Activity { AlertDialog.Builder voltageBuilder = new AlertDialog.Builder(this); LayoutInflater inflater = getLayoutInflater(); View voltageView = inflater.inflate(R.layout.status_dialog, null); - voltageBuilder.setCancelable(false); voltageBuilder.setView(voltageView); - voltageBuilder.setPositiveButton("OK", new DialogInterface.OnClickListener() { + voltageBuilder.setPositiveButton("OK",null); + voltageBuilder.setTitle("Voltages"); + voltageDialog = voltageBuilder.create(); + voltageDialog.setOnDismissListener(new OnDismissListener(){ @Override - public void onClick(DialogInterface dialog, int which) { + public void onDismiss(DialogInterface arg0) { voltageDialog.dismiss(); pwr_voltage.cancel(); mWakeLock.release(); mWifiLock.release(); } }); - voltageBuilder.setTitle("Voltages"); - voltageDialog = voltageBuilder.create(); voltage33 = (EditText)voltageView.findViewById(R.id.editText1); voltage50 = (EditText)voltageView.findViewById(R.id.editText2); voltage80 = (EditText)voltageView.findViewById(R.id.editText3); @@ -202,14 +202,12 @@ public class MainActivity extends Activity { managersField = (EditText)managersView.findViewById(R.id.managers); managersField.setText(mgrs); - managersBuilder.setCancelable(false); managersBuilder.setView(managersView); managersBuilder.setPositiveButton("OK", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { SharedPreferences.Editor editor = prefs.edit(); mgrs = managersField.getText().toString(); - System.out.println(mgrs); editor.putString("managers", mgrs); editor.commit(); @@ -217,12 +215,19 @@ public class MainActivity extends Activity { manager.destroy(); manager = new Manager(mgrs); - wifiInfoTask.cancel(false); managersDialog.dismiss(); } }); + managersBuilder.setNeutralButton("Cancel", null); managersBuilder.setTitle("Set fellow managers"); managersDialog = managersBuilder.create(); + managersDialog.setOnDismissListener(new OnDismissListener() { + @Override + public void onDismiss(DialogInterface arg0) { + managersField.setText(mgrs); + wifiInfoTask.cancel(false); + } + }); mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); mGravity = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); @@ -311,21 +316,23 @@ public class MainActivity extends Activity { mWifiLock.release(); } } - else if (item.getTitle().equals("Crane up")) { - crane_cmd.send(0x100); - item.setTitle("Crane down"); - } - else if (item.getTitle().equals("Crane down")) { + else if (item.getTitle().equals("Crane: up")) { crane_cmd.send(0x190); - item.setTitle("Crane up"); + item.setTitle("Crane: down"); } - else if (item.getTitle().equals("Magnet on")) { - magnet_cmd.send(1); - item.setTitle("Magnet off"); + else if (item.getTitle().equals("Crane: down")) { + crane_cmd.send(0x100); + item.setTitle("Crane: up"); } - else if (item.getTitle().equals("Magnet off")) { - magnet_cmd.send(0); - item.setTitle("Magnet on"); + else if (item.getTitle().equals("Magnet")) { + if (!item.isChecked()) { + magnet_cmd.send(1); + item.setChecked(true); + } + else { + magnet_cmd.send(0); + item.setChecked(false); + } } else if (item.getTitle().equals("Voltage monitor")) { mWakeLock.acquire();