Skip to content

Commit f8bde99

Browse files
arthurbenemannarthurbenemann
committed
Merge branch 'master' into beta
2 parents 5a71ca6 + eeeb1e6 commit f8bde99

File tree

71 files changed

+3086
-858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3086
-858
lines changed

‎Android/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="org.droidplanner"
5-
android:versionCode="106"
5+
android:versionCode="107"
66
android:versionName="please run version.sh to get the version name">
77

88
<uses-sdk

‎Android/assets/CameraInfo/Canon SX260 SX280 HS.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Android/assets/CameraInfo/RX100_M3_24mm.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<cameraInfo>
3+
<Name>RX100_M3 24mm</Name>
4+
<SensorWidth>13.2</SensorWidth>
5+
<SensorHeight>8.8</SensorHeight>
6+
<SensorResolution>20.2</SensorResolution>
7+
<FocalLength>24.0</FocalLength>
8+
</cameraInfo>

‎Android/assets/CameraInfo/RX100_M3_70mm.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<cameraInfo>
3+
<Name>RX100_M3 70mm</Name>
4+
<SensorWidth>13.2</SensorWidth>
5+
<SensorHeight>8.8</SensorHeight>
6+
<SensorResolution>20.2</SensorResolution>
7+
<FocalLength>70.0</FocalLength>
8+
</cameraInfo>

‎Android/res/layout-land/fragment_setup_mag_main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
android:background="@drawable/mode_desc_rectangle"
4242
android:padding="10dp"
4343
android:layout_marginBottom="20dp"
44-
android:text="@string/setup_imu_start"
44+
android:text="@string/setup_mag_start"
4545
/>
4646

4747
<Button

‎Android/res/layout/fragment_editor_detail_camera_trigger.xml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
style="@style/missionItemDetailLayout" >
5+
6+
<org.droidplanner.android.widgets.spinners.SpinnerSelfSelect
7+
android:id="@+id/spinnerWaypointType"
8+
android:layout_width="match_parent"
9+
android:layout_height="wrap_content"
10+
android:layout_alignParentTop="true"
11+
android:layout_margin="5dp"
12+
android:entries="@array/ExampleWaypointType" />
13+
14+
<RelativeLayout
15+
android:id="@+id/title_rect"
16+
android:layout_width="match_parent"
17+
android:layout_height="64dp"
18+
android:layout_alignParentTop="true"
19+
android:background="@drawable/wp_title_rectangle" >
20+
21+
<TextView
22+
android:id="@+id/WaypointIndex"
23+
style="@style/largeMissionDetailText"
24+
android:layout_width="64dp"
25+
android:layout_height="wrap_content"
26+
android:layout_centerVertical="true"
27+
tools:text="22" />
28+
29+
<View
30+
android:id="@+id/title_div"
31+
android:layout_width="1dp"
32+
android:layout_height="54dp"
33+
android:layout_alignParentTop="true"
34+
android:layout_marginTop="5dp"
35+
android:layout_toRightOf="@id/WaypointIndex"
36+
android:background="@drawable/wp_title_div" />
37+
38+
<RelativeLayout
39+
android:id="@+id/title_content"
40+
android:layout_width="match_parent"
41+
android:layout_height="wrap_content"
42+
android:layout_centerVertical="true"
43+
android:layout_toRightOf="@id/title_div"
44+
android:orientation="vertical" >
45+
46+
<TextView
47+
android:id="@+id/WaypointType"
48+
style="@style/missionHeaderTitle"
49+
android:layout_width="wrap_content"
50+
android:layout_height="wrap_content"
51+
android:layout_marginLeft="12dp"
52+
android:text="@string/waypointType_Camera_Trigger" />
53+
54+
<TextView
55+
android:id="@+id/DistanceLabel"
56+
style="@style/missionHeaderlabel"
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:layout_alignLeft="@id/WaypointType"
60+
android:layout_below="@id/WaypointType" />
61+
</RelativeLayout>
62+
</RelativeLayout>
63+
64+
<ImageView
65+
android:id="@+id/menuHint"
66+
android:layout_width="wrap_content"
67+
android:layout_height="wrap_content"
68+
android:layout_alignBottom="@id/title_rect"
69+
android:layout_alignParentRight="true"
70+
android:layout_margin="10dp"
71+
android:src="@drawable/ic_menu_hint"
72+
tools:ignore="ContentDescription" />
73+
74+
<LinearLayout
75+
android:layout_width="match_parent"
76+
android:layout_height="wrap_content"
77+
android:layout_below="@id/title_rect"
78+
android:orientation="vertical"
79+
android:paddingBottom="5dp" >
80+
81+
<TextView
82+
style="@style/ModeDetailText"
83+
android:layout_width="wrap_content"
84+
android:layout_height="wrap_content"
85+
android:background="@drawable/mode_desc_rectangle"
86+
android:padding="12dp"
87+
android:text="@string/waypointInfo_CameraTrigger" />
88+
89+
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
90+
android:id="@+id/picker1"
91+
style="@style/missionItemDetailCard"
92+
android:layout_width="match_parent"
93+
android:layout_height="wrap_content"
94+
android:orientation="vertical"
95+
android:text="@string/length_label" />
96+
</LinearLayout>
97+
98+
</RelativeLayout>

‎Android/res/layout/fragment_editor_detail_cylindrical_mapping.xml‎ renamed to ‎Android/res/layout/fragment_editor_detail_structure_scanner.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,32 @@
137137
android:padding="5dp"
138138
android:text="Cross Hatch"
139139
android:textSize="20sp" />
140+
141+
<RelativeLayout
142+
android:layout_width="match_parent"
143+
android:layout_height="wrap_content" >
144+
145+
<TextView
146+
android:id="@+id/staticText"
147+
style="@style/ModeDetailText"
148+
android:layout_width="wrap_content"
149+
android:layout_height="wrap_content"
150+
android:layout_gravity="left"
151+
android:text="@string/camera_"
152+
android:textAppearance="?android:attr/textAppearanceMedium" />
153+
154+
<org.droidplanner.android.widgets.spinners.SpinnerSelfSelect
155+
android:id="@+id/cameraFileSpinner"
156+
android:layout_width="196dp"
157+
android:layout_height="wrap_content"
158+
android:layout_alignBottom="@id/staticText"
159+
android:layout_alignParentRight="true"
160+
android:layout_alignTop="@id/staticText"
161+
android:layout_gravity="center"
162+
android:layout_toRightOf="@id/staticText"
163+
android:entries="@array/ExampleCameraArray" />
164+
</RelativeLayout>
165+
140166
</LinearLayout>
141167
</ScrollView>
142168

‎Android/res/layout/fragment_editor_detail_survey.xml‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -141,102 +141,98 @@
141141
android:orientation="vertical" >
142142

143143
<HorizontalScrollView
144+
style="@style/missionItemDetailCard"
144145
android:layout_width="match_parent"
145-
android:layout_height="wrap_content"
146-
style="@style/missionItemDetailCard">
146+
android:layout_height="wrap_content" >
147147

148148
<GridLayout
149149
android:id="@+id/myGrid"
150150
android:layout_width="wrap_content"
151151
android:layout_height="wrap_content"
152-
android:columnCount="2">
152+
android:columnCount="2" >
153153

154154
<TextView
155155
android:id="@+id/footprintTextView"
156156
android:layout_gravity="left"
157157
android:layout_marginLeft="10dp"
158-
android:text="@string/footprint"/>
158+
android:text="@string/footprint" />
159159

160160
<TextView
161161
android:id="@+id/groundResolutionTextView"
162162
android:layout_gravity="left"
163163
android:layout_marginLeft="10dp"
164-
android:text="@string/ground_resolution"/>
164+
android:text="@string/ground_resolution" />
165165

166166
<TextView
167167
android:id="@+id/distanceTextView"
168168
android:layout_gravity="left"
169169
android:layout_marginLeft="10dp"
170-
android:text="@string/distance_between_pictures"/>
170+
android:text="@string/distance_between_pictures" />
171171

172172
<TextView
173173
android:id="@+id/distanceBetweenLinesTextView"
174174
android:layout_gravity="left"
175175
android:layout_marginLeft="10dp"
176-
android:text="@string/distance_between_lines"/>
176+
android:text="@string/distance_between_lines" />
177177

178178
<TextView
179179
android:id="@+id/areaTextView"
180180
android:layout_gravity="left"
181181
android:layout_marginLeft="10dp"
182-
android:text="@string/area"/>
182+
android:text="@string/area" />
183183

184184
<TextView
185185
android:id="@+id/lengthTextView"
186186
android:layout_gravity="left"
187187
android:layout_marginLeft="10dp"
188-
android:text="@string/mission_length"/>
188+
android:text="@string/mission_length" />
189189

190190
<TextView
191191
android:id="@+id/numberOfPicturesTextView"
192192
android:layout_gravity="left"
193193
android:layout_marginLeft="10dp"
194-
android:text="@string/pictures"/>
194+
android:text="@string/pictures" />
195195

196196
<TextView
197197
android:id="@+id/numberOfStripsTextView"
198198
android:layout_gravity="left"
199199
android:layout_marginLeft="10dp"
200-
android:text="@string/number_of_strips"/>
200+
android:text="@string/number_of_strips" />
201201
</GridLayout>
202202
</HorizontalScrollView>
203+
203204
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
204205
android:id="@+id/anglePicker"
206+
style="@style/missionItemDetailCard"
205207
android:layout_width="match_parent"
206208
android:layout_height="wrap_content"
207-
android:text="@string/hatch_angle"
208-
style="@style/missionItemDetailCard"/>
209+
android:text="@string/hatch_angle" />
209210

210211
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
211212
android:id="@+id/altitudePicker"
213+
style="@style/missionItemDetailCard"
212214
android:layout_width="match_parent"
213215
android:layout_height="wrap_content"
214-
android:text="@string/flight_altitude"
215-
style="@style/missionItemDetailCard"/>
216+
android:text="@string/flight_altitude" />
216217

217-
<LinearLayout
218+
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
219+
android:id="@+id/overlapPicker"
220+
style="@style/missionItemDetailCard"
218221
android:layout_width="match_parent"
219222
android:layout_height="wrap_content"
220-
android:orientation="horizontal" >
221-
222-
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
223-
android:id="@+id/overlapPicker"
224-
android:layout_width="0dp"
225-
android:layout_height="wrap_content"
226-
android:layout_weight="0.5"
227-
android:text="@string/overlap"
228-
style="@style/missionItemDetailCard"/>
223+
android:text="@string/overlap" >
224+
</org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView>
229225

230-
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
231-
android:id="@+id/sidelapPicker"
232-
android:layout_width="0dp"
233-
android:layout_height="wrap_content"
234-
android:layout_weight="0.5"
235-
android:text="@string/sidelap"
236-
style="@style/missionItemDetailCard"/>
226+
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
227+
android:id="@+id/sidelapPicker"
228+
style="@style/missionItemDetailCard"
229+
android:layout_width="match_parent"
230+
android:layout_height="wrap_content"
231+
android:text="@string/sidelap" >
232+
</org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView>
237233

238-
</LinearLayout>
239234
</LinearLayout>
235+
240236
</RelativeLayout>
241237

242238
</ScrollView>

‎Android/res/layout/fragment_setup_mag_main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
android:background="@drawable/mode_desc_rectangle"
3636
android:padding="10dp"
3737
android:layout_marginBottom="20dp"
38-
android:text="@string/setup_imu_start"
38+
android:text="@string/setup_mag_start"
3939
/>
4040

4141
<FrameLayout

‎Android/res/menu/menu_navigation_hub.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)