diff --git a/contrib/mobile/Android/res/layout/fragment_postprocessing.xml b/contrib/mobile/Android/res/layout/fragment_postprocessing.xml index e1c674a2a894e611ce1d5855f3d416693d7ee1ba..8954b882e9ae72637c0b7b390069f19f3061d5de 100644 --- a/contrib/mobile/Android/res/layout/fragment_postprocessing.xml +++ b/contrib/mobile/Android/res/layout/fragment_postprocessing.xml @@ -8,7 +8,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Intervals type" /> + android:text="@string/postpro_intervalstype" /> <Spinner android:id="@+id/intervals_type" android:layout_width="match_parent" @@ -17,7 +17,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Intervals" /> + android:text="@string/postpro_intervals" /> <EditText android:id="@+id/intervals" android:layout_width="match_parent" @@ -28,7 +28,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Raise (Z)" /> + android:text="@string/postpro_raizez" /> <SeekBar android:id="@+id/raisez" android:layout_width="match_parent" diff --git a/contrib/mobile/Android/res/layout/model.xml b/contrib/mobile/Android/res/layout/model.xml index f97f162198b3923c8121aaf7ffa824e6e1608166..eed5d6114d265e23235a90828e1d35b12403640e 100644 --- a/contrib/mobile/Android/res/layout/model.xml +++ b/contrib/mobile/Android/res/layout/model.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:adjustViewBounds="true" - android:contentDescription="icon" + android:contentDescription="preview" android:layout_weight="25." android:src="@drawable/ic_launcher" android:paddingRight="10dp" diff --git a/contrib/mobile/Android/res/values/refs.xml b/contrib/mobile/Android/res/values/refs.xml new file mode 100644 index 0000000000000000000000000000000000000000..f6ed1412d47ff1b524751851f50fe1abf289049e --- /dev/null +++ b/contrib/mobile/Android/res/values/refs.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <item type="layout" name="main_activity_layout">@layout/activity_fragment</item> + +</resources> \ No newline at end of file diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java index cd6782ee3902a5365f180cbd764df977bcf46ac7..c3b82a6878e869b3def205920c15f32c4ef832e4 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java @@ -89,7 +89,7 @@ public class OptionsModelFragment extends Fragment{ }); params.add(mParam); if(_listView != null) - _listView.addItem(mParam.getName().split("/")[0], mParam.getView()); + _listView.addItem(mParam.getName().split("/")[0].equals("Parameters")? mParam.getName().split("/")[0] + " > " + mParam.getName().split("/")[1]: mParam.getName().split("/")[0], mParam.getView()); } } } diff --git a/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java b/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java index 3542e046a22ec8e3ece6c7fa636126541adabbb3..98c614c4be2d2186946d504b4834aec14b35ae25 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java @@ -34,17 +34,26 @@ public class Parameter { protected void update(){ if(_label != null && !_label.equals("")) _title.setText(_label); - else { - String tmp[] = _name.split("/"); - _title.setText(tmp[tmp.length-1]); - } + else + _title.setText(getShortName()); if(isReadOnly()) _title.setAlpha(0.423f); } public void setName(String name) {_name = name;this.update();} public void setReadOnly(boolean readOnly) {_readOnly = readOnly;this.update();} - public void setLabel(String label) {_label = label;this.update();} - public String getName() {return _name;} + public void setLabel(String label) { + _label = label; + this.update(); + } + public String getName() { return _name;} + public String getShortName() { + if(_label != null && _label.length() > 0) return _label; + String[] splited = _name.split("/"); + String name = splited[splited.length-1]; + while(name.length() > 0 && name.charAt(0) >= '0' && name.charAt(0) <= '9') + name = name.substring(1); + return name; + } public boolean isReadOnly() {return _readOnly;} public String getLabel() {return _label;} public int fromString(String s){ diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java b/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java index ede4549b335909ec5b8fe31bf69fd40294611535..2170219437a619cedcf1e08a8cd1698bf5b79ead 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java @@ -48,13 +48,8 @@ public class ParameterNumber extends Parameter{ protected void update(){ super.update(); int nDecimal = String.valueOf(this.getStep()).length() - String.valueOf(this.getStep()).lastIndexOf('.') - 1; // hack for double round - if(_bar != null){ - if(_label != null && !_label.equals("")) - _title.setText(_label + " (" + Math.round(_value*Math.pow(10, nDecimal))/Math.pow(10, nDecimal) + ")"); - else { - String tmp[] = _name.split("/"); - _title.setText(tmp[tmp.length-1] + " (" + Math.round(_value*Math.pow(10, nDecimal))/Math.pow(10, nDecimal) + ")"); - } + if(_bar != null) { + _title.setText(getShortName() + " (" + Math.round(_value*Math.pow(10, nDecimal))/Math.pow(10, nDecimal) + ")"); _bar.setProgress((int) ((_value-_min)/_step)); _bar.setMax((int) ((_max-_min)/_step)); _bar.setEnabled(!this.isReadOnly()); @@ -67,8 +62,7 @@ public class ParameterNumber extends Parameter{ } else if(_checkbox != null) { - if(_label != null) _checkbox.setText(_label); - else _checkbox.setText(_name); + _checkbox.setText(getShortName()); _checkbox.setChecked((_value == 0)? false : true); } else if(_edittext != null)