From d97143003beb84c7c302d1e0bab2ec23cb39d51d Mon Sep 17 00:00:00 2001 From: FatBaz Date: Sat, 17 Jun 2017 14:39:00 +0200 Subject: [PATCH] Change Map + the way to put the map marker on the Map (X is still to fix but is almost good) --- app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java | 39 ++++++++++++--------------------------- app/src/main/java/fr/utbm/lo53/p2017/positionningapp/TranslateCoordinate.java | 19 +++++++++++++++++++ app/src/main/res/drawable/map.png | Bin 4655 -> 0 bytes app/src/main/res/drawable/map2.png | Bin 0 -> 4655 bytes app/src/main/res/layout/activity_calibration.xml | 8 -------- app/src/main/res/layout/content_calibration.xml | 55 +++++++++++++++++++++++++++++++------------------------ 6 files changed, 62 insertions(+), 59 deletions(-) create mode 100644 app/src/main/java/fr/utbm/lo53/p2017/positionningapp/TranslateCoordinate.java create mode 100644 app/src/main/res/drawable/map2.png diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java index 87ea794..4e7f1ac 100644 --- a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java +++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java @@ -14,7 +14,7 @@ import android.widget.Button; import android.widget.ImageView; public class Calibration extends BaseActivity { - + float height,width; @Override protected void onCreate(Bundle savedInstanceState) { @@ -23,15 +23,6 @@ public class Calibration extends BaseActivity { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Salut ! :) Ce bouton ne sert à rien.", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); - final ImageView Map = (ImageView) findViewById(R.id.Map); final ImageView MapMarker = (ImageView) findViewById(R.id.MapMarker); final Button setPointButton = (Button) findViewById(R.id.setPointButton); @@ -42,16 +33,20 @@ public class Calibration extends BaseActivity { cancelButton.setVisibility(cancelButton.INVISIBLE); measureButton.setVisibility(measureButton.INVISIBLE); + //Map.setMaxHeight(50); + Map.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View view, MotionEvent motionEvent) { /*motionEvent.getAction()==motionEvent.ACTION_MOVE &&*/ if( setPointButton.getVisibility() == setPointButton.INVISIBLE && motionEvent.getX() <= Map.getWidth() && motionEvent.getY() <= Map.getHeight() && motionEvent.getX() >= 0 && motionEvent.getY() >= 0) { MapMarker.setVisibility(MapMarker.VISIBLE); - Snackbar.make(view, " X : " + motionEvent.getX() + " Y : " + motionEvent.getY(), Snackbar.LENGTH_LONG) + height = motionEvent.getX(); + width = motionEvent.getY(); + Snackbar.make(view, " X : " + height + " Y : " + width, Snackbar.LENGTH_LONG) .setAction("Action", null).show(); - MapMarker.setX(motionEvent.getX()-(MapMarker.getWidth()/4)); - MapMarker.setY(motionEvent.getY()); + MapMarker.setX(motionEvent.getX()- (view.getWidth()- Map.getWidth())/2 -40);//- MapMarker.getWidth()/2); + MapMarker.setY(motionEvent.getY()+ (view.getHeight()/5));//+(MapMarker.getWidth()/(5/4))); } return true; } @@ -84,7 +79,7 @@ public class Calibration extends BaseActivity { } }); } - + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); @@ -93,18 +88,8 @@ public class Calibration extends BaseActivity { return true; } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); + public void sendCalibrateRequest(View v) { + Snackbar.make(v, "Coucou, X :" + height + " Y : " + width, Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); } } diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/TranslateCoordinate.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/TranslateCoordinate.java new file mode 100644 index 0000000..28fc63e --- /dev/null +++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/TranslateCoordinate.java @@ -0,0 +1,19 @@ +package fr.utbm.lo53.p2017.positionningapp; + +/** + * Created by Valentin on 14/06/2017. + */ + +public class TranslateCoordinate { + private int mapWidth, mapHeight; + public class Point { + float x,y; + } + public Point PointToGeo(float xA, float yA) + { + Point p = new Point(); + p.x = (xA/mapWidth)*100; + p.y = (yA/mapWidth)*100; + return p; + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/map.png b/app/src/main/res/drawable/map.png index cc161de..8a4c95b 100644 Binary files a/app/src/main/res/drawable/map.png and b/app/src/main/res/drawable/map.png differ diff --git a/app/src/main/res/drawable/map2.png b/app/src/main/res/drawable/map2.png new file mode 100644 index 0000000..cc161de Binary files /dev/null and b/app/src/main/res/drawable/map2.png differ diff --git a/app/src/main/res/layout/activity_calibration.xml b/app/src/main/res/layout/activity_calibration.xml index ec54ca5..af5342a 100644 --- a/app/src/main/res/layout/activity_calibration.xml +++ b/app/src/main/res/layout/activity_calibration.xml @@ -23,12 +23,4 @@ - - diff --git a/app/src/main/res/layout/content_calibration.xml b/app/src/main/res/layout/content_calibration.xml index 6e089d0..e0c22be 100644 --- a/app/src/main/res/layout/content_calibration.xml +++ b/app/src/main/res/layout/content_calibration.xml @@ -12,78 +12,85 @@ android:id="@+id/Map" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginBottom="6dp" + android:layout_marginEnd="8dp" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" - android:layout_marginTop="50dp" - android:paddingLeft="0dp" - android:paddingTop="0dp" - android:scaleType="fitXY" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:adjustViewBounds="true" + app:layout_constraintBottom_toTopOf="@+id/measureButton" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/map" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" /> + app:layout_constraintVertical_bias="0.505" + app:srcCompat="@drawable/map" /> + android:layout_marginBottom="8dp" />