Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@arthurbenemann
arthurbenemann committed Oct 30, 2014
2 parents 5a71ca6 + eeeb1e6 commit f8bde99
Show file tree
Hide file tree
Showing 71 changed files with 3,086 additions and 858 deletions.
2 changes: 1 addition & 1 deletion Android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.droidplanner"
android:versionCode="106"
android:versionCode="107"
android:versionName="please run version.sh to get the version name">

<uses-sdk
Expand Down
8 changes: 0 additions & 8 deletions Android/assets/CameraInfo/Canon SX260 SX280 HS.xml
View file

This file was deleted.

8 changes: 8 additions & 0 deletions Android/assets/CameraInfo/RX100_M3_24mm.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<cameraInfo>
<Name>RX100_M3 24mm</Name>
<SensorWidth>13.2</SensorWidth>
<SensorHeight>8.8</SensorHeight>
<SensorResolution>20.2</SensorResolution>
<FocalLength>24.0</FocalLength>
</cameraInfo>
8 changes: 8 additions & 0 deletions Android/assets/CameraInfo/RX100_M3_70mm.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<cameraInfo>
<Name>RX100_M3 70mm</Name>
<SensorWidth>13.2</SensorWidth>
<SensorHeight>8.8</SensorHeight>
<SensorResolution>20.2</SensorResolution>
<FocalLength>70.0</FocalLength>
</cameraInfo>
2 changes: 1 addition & 1 deletion Android/res/layout-land/fragment_setup_mag_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
android:background="@drawable/mode_desc_rectangle"
android:padding="10dp"
android:layout_marginBottom="20dp"
android:text="@string/setup_imu_start"
android:text="@string/setup_mag_start"
/>

<Button
Expand Down
98 changes: 98 additions & 0 deletions Android/res/layout/fragment_editor_detail_camera_trigger.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/missionItemDetailLayout" >

<org.droidplanner.android.widgets.spinners.SpinnerSelfSelect
android:id="@+id/spinnerWaypointType"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="5dp"
android:entries="@array/ExampleWaypointType" />

<RelativeLayout
android:id="@+id/title_rect"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_alignParentTop="true"
android:background="@drawable/wp_title_rectangle" >

<TextView
android:id="@+id/WaypointIndex"
style="@style/largeMissionDetailText"
android:layout_width="64dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
tools:text="22" />

<View
android:id="@+id/title_div"
android:layout_width="1dp"
android:layout_height="54dp"
android:layout_alignParentTop="true"
android:layout_marginTop="5dp"
android:layout_toRightOf="@id/WaypointIndex"
android:background="@drawable/wp_title_div" />

<RelativeLayout
android:id="@+id/title_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/title_div"
android:orientation="vertical" >

<TextView
android:id="@+id/WaypointType"
style="@style/missionHeaderTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="@string/waypointType_Camera_Trigger" />

<TextView
android:id="@+id/DistanceLabel"
style="@style/missionHeaderlabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/WaypointType"
android:layout_below="@id/WaypointType" />
</RelativeLayout>
</RelativeLayout>

<ImageView
android:id="@+id/menuHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/title_rect"
android:layout_alignParentRight="true"
android:layout_margin="10dp"
android:src="@drawable/ic_menu_hint"
tools:ignore="ContentDescription" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title_rect"
android:orientation="vertical"
android:paddingBottom="5dp" >

<TextView
style="@style/ModeDetailText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/mode_desc_rectangle"
android:padding="12dp"
android:text="@string/waypointInfo_CameraTrigger" />

<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/picker1"
style="@style/missionItemDetailCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:text="@string/length_label" />
</LinearLayout>

</RelativeLayout>
26 changes: 26 additions & 0 deletions ...ent_editor_detail_cylindrical_mapping.xml → ...gment_editor_detail_structure_scanner.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,32 @@
android:padding="5dp"
android:text="Cross Hatch"
android:textSize="20sp" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<TextView
android:id="@+id/staticText"
style="@style/ModeDetailText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="@string/camera_"
android:textAppearance="?android:attr/textAppearanceMedium" />

<org.droidplanner.android.widgets.spinners.SpinnerSelfSelect
android:id="@+id/cameraFileSpinner"
android:layout_width="196dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/staticText"
android:layout_alignParentRight="true"
android:layout_alignTop="@id/staticText"
android:layout_gravity="center"
android:layout_toRightOf="@id/staticText"
android:entries="@array/ExampleCameraArray" />
</RelativeLayout>

</LinearLayout>
</ScrollView>

Expand Down
62 changes: 29 additions & 33 deletions Android/res/layout/fragment_editor_detail_survey.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,102 +141,98 @@
android:orientation="vertical" >

<HorizontalScrollView
style="@style/missionItemDetailCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/missionItemDetailCard">
android:layout_height="wrap_content" >

<GridLayout
android:id="@+id/myGrid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:columnCount="2">
android:columnCount="2" >

<TextView
android:id="@+id/footprintTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/footprint"/>
android:text="@string/footprint" />

<TextView
android:id="@+id/groundResolutionTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/ground_resolution"/>
android:text="@string/ground_resolution" />

<TextView
android:id="@+id/distanceTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/distance_between_pictures"/>
android:text="@string/distance_between_pictures" />

<TextView
android:id="@+id/distanceBetweenLinesTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/distance_between_lines"/>
android:text="@string/distance_between_lines" />

<TextView
android:id="@+id/areaTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/area"/>
android:text="@string/area" />

<TextView
android:id="@+id/lengthTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/mission_length"/>
android:text="@string/mission_length" />

<TextView
android:id="@+id/numberOfPicturesTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/pictures"/>
android:text="@string/pictures" />

<TextView
android:id="@+id/numberOfStripsTextView"
android:layout_gravity="left"
android:layout_marginLeft="10dp"
android:text="@string/number_of_strips"/>
android:text="@string/number_of_strips" />
</GridLayout>
</HorizontalScrollView>

<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/anglePicker"
style="@style/missionItemDetailCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/hatch_angle"
style="@style/missionItemDetailCard"/>
android:text="@string/hatch_angle" />

<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/altitudePicker"
style="@style/missionItemDetailCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/flight_altitude"
style="@style/missionItemDetailCard"/>
android:text="@string/flight_altitude" />

<LinearLayout
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/overlapPicker"
style="@style/missionItemDetailCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/overlapPicker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:text="@string/overlap"
style="@style/missionItemDetailCard"/>
android:text="@string/overlap" >
</org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView>

<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/sidelapPicker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:text="@string/sidelap"
style="@style/missionItemDetailCard"/>
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
android:id="@+id/sidelapPicker"
style="@style/missionItemDetailCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/sidelap" >
</org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView>

</LinearLayout>
</LinearLayout>

</RelativeLayout>

</ScrollView>
Expand Down
2 changes: 1 addition & 1 deletion Android/res/layout/fragment_setup_mag_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
android:background="@drawable/mode_desc_rectangle"
android:padding="10dp"
android:layout_marginBottom="20dp"
android:text="@string/setup_imu_start"
android:text="@string/setup_mag_start"
/>

<FrameLayout
Expand Down
11 changes: 0 additions & 11 deletions Android/res/menu/menu_navigation_hub.xml
View file

This file was deleted.

6 changes: 6 additions & 0 deletions Android/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
<string name="waypointType_RTL">Return To Launch</string>
<string name="waypointType_Land">Land</string>
<string name="waypointType_Change_Speed">Change Speed</string>
<string name="waypointType_Camera_Trigger">Camera Trigger</string>
<string name="waypointType_Circle">Circle</string>
<string name="waypointType_Loiter">Loiter</string>
<string name="waypointType_ROI">Region of Interest</string>
Expand All @@ -201,6 +202,7 @@
<string name="waypointInfo_CondDistance">Delay mission state machine until within desired distance of next NAV point</string>
<string name="waypointInfo_SetHome">Changes the home location either to the current location or a specified location.</string>
<string name="waypointInfo_SetSpeed">Change vehicle speed until the end of this mission.</string>
<string name="waypointInfo_CameraTrigger">Trigger the camera shutter at regular distance intervals.</string>
<string name="waypointInfo_ROI">Sets a location and altitude to point copter towards and to aim an optional camera.</string>
<string name="waypointInfo_SetJump">Repeat waypoint</string>

Expand Down Expand Up @@ -277,6 +279,7 @@

<!-- Compass Setup Resource Strings -->
<string name="setup_mag_title">Compass Calibration</string>
<string name="setup_mag_start">Press Calibrate to start magnetometer calibration. Perform the calibration outdoors away from metal objects.</string>

<!-- Accelerometer Setup Resource Strings -->
<string name="setup_imu_title">Accelerometer Calibration</string>
Expand All @@ -291,6 +294,7 @@
<string name="setup_imu_step">To start calibration, press Calibrate.</string>
<string name="setup_imu_timeleft">Time left before next orientation:</string>


<!-- Flight Setup Resource Strings -->
<string name="setup_fm_title">Flight Mode Configuration</string>
<string name="setup_fm_side_title">Update Flight Mode</string>
Expand Down Expand Up @@ -339,6 +343,7 @@
<string name="meter_unit">m</string>
<string name="speed_unit">m/s</string>
<string name="speed_label">Speed</string>
<string name="length_label">Length</string>
<string name="ground_speed_label">Ground Speed</string>
<string name="air_speed_label">Air Speed</string>
<string name="default_angle_value">--°</string>
Expand Down Expand Up @@ -515,5 +520,6 @@
<string name="pref_dronie_creation_title">Create dronie?</string>
<string name="pref_dronie_creation_message">Please stand back 8m before starting the
dronie.</string>
<string name="failed_start_calibration_message">Unable to start calibration!</string>

</resources>
2 changes: 1 addition & 1 deletion Android/res/xml/preferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
android:summary="@string/pref_tts_warning_400ft_ceiling_exceeded_summary"
android:title="@string/pref_tts_warning_400ft_ceiling_exceeded" />
<CheckBoxPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="@string/pref_tts_warning_low_signal_key"
android:summary="@string/pref_tts_warning_low_signal_strength_summary"
android:title="@string/pref_tts_warning_low_signal_strength" />
Expand Down
5 changes: 0 additions & 5 deletions Android/src/org/droidplanner/android/activities/ConfigurationActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,4 @@ else if(fragment instanceof ChecklistFragment){
return R.id.navigation_params;
}
}

@Override
public CharSequence[][] getHelpItems() {
return new CharSequence[][] { {}, {} };
}
}
Loading

0 comments on commit f8bde99

Please sign in to comment.