Skip to content
Snippets Groups Projects
Commit 9254d26d authored by SCHILLING Juliette's avatar SCHILLING Juliette
Browse files

amelioration conception textView Orientation

parent 5f56ebed
Branches
No related tags found
No related merge requests found
......@@ -152,8 +152,14 @@ public class ModeConceptionActivity extends AppCompatActivity {
}
}
});
TextView textViewOrientation = new TextView(getBaseContext());
textViewOrientation.setText(mur.getOrientation().toString());
ll.addView(textViewOrientation);
llMur.addView(imageButton);
ll.addView(llMur);
}
Button supprimer = new Button(getBaseContext());
supprimer.setText("Supprimer la pièce");
......
......@@ -33,7 +33,7 @@ public class ModeImmersionActivity extends AppCompatActivity implements SensorEv
Piece pieceEnCours;
private SensorManager sensorManager;
private ImageView imageViewBoussole;
private float debut = 0f;
private float debut = 0;
private ImageView imageViewMur;
@Override
......@@ -121,26 +121,6 @@ public class ModeImmersionActivity extends AppCompatActivity implements SensorEv
}
}
public void afficheSud(View view){
murEnCours = pieceEnCours.getMurOrientation(Orientation.SUD);
afficheMur();
}
public void afficheNord(View view){
murEnCours = pieceEnCours.getMurOrientation(Orientation.NORD);
afficheMur();
}
public void afficheEst(View view){
murEnCours = pieceEnCours.getMurOrientation(Orientation.EST);
afficheMur();
}
public void afficheOuest(View view){
murEnCours = pieceEnCours.getMurOrientation(Orientation.OUEST);
afficheMur();
}
@Override
public void onSensorChanged(SensorEvent event) {
// On récupère l'angle
......@@ -155,35 +135,34 @@ public class ModeImmersionActivity extends AppCompatActivity implements SensorEv
if(imageViewBoussole == null) {
imageViewBoussole = findViewById(R.id.imageViewBoussole);
}
imageViewBoussole.startAnimation(rotateAnimation);
if(angle<(-45) && angle>=(-135)){
murEnCours = pieceEnCours.getMurOrientation(Orientation.EST);
} else if (angle<(-135) && angle>=(-225)) {
murEnCours = pieceEnCours.getMurOrientation(Orientation.SUD);
} else if (angle<(-225) && angle>=(-315)) {
murEnCours = pieceEnCours.getMurOrientation(Orientation.OUEST);
}else{
murEnCours = pieceEnCours.getMurOrientation(Orientation.NORD);
}
afficheMur();
Toast.makeText(getBaseContext(), murEnCours.getOrientation().toString(), Toast.LENGTH_SHORT).show();
runOnUiThread(new Runnable() {
@Override
public void run() {
imageViewBoussole.startAnimation(rotateAnimation);
if(angle<(-45) && angle>=(-135)){
murEnCours = pieceEnCours.getMurOrientation(Orientation.EST);
} else if (angle<(-135) && angle>=(-225)) {
murEnCours = pieceEnCours.getMurOrientation(Orientation.SUD);
} else if (angle<(-225) && angle>=(-315)) {
murEnCours = pieceEnCours.getMurOrientation(Orientation.OUEST);
}else{
murEnCours = pieceEnCours.getMurOrientation(Orientation.NORD);
}
afficheMur();
}
});
//Maj de l'angle de depart
debut = angle;
Log.i("testRotationBoussole", "rotation = " + angle);
/*
try {
Thread.sleep(200);
Thread.sleep(10);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
*/
}
@Override
......
package outils;
public class GestionnaireBoussole {
public GestionnaireBoussole() {
}
}
app/src/main/res/drawable/boussole.png

170 KiB | W: | H:

app/src/main/res/drawable/boussole.png

3.48 KiB | W: | H:

app/src/main/res/drawable/boussole.png
app/src/main/res/drawable/boussole.png
app/src/main/res/drawable/boussole.png
app/src/main/res/drawable/boussole.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -17,54 +17,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintHorizontal_bias="0.495"
app:layout_constraintVertical_bias="0.406"/>
<Button
android:text="NORD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button2"
android:onClick="afficheNord"
app:layout_constraintTop_toBottomOf="@+id/imageViewMur"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="20dp"
app:layout_constraintHorizontal_bias="0.501"/>
<Button
android:text="EST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button3"
android:onClick="afficheEst"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="40dp"
app:layout_constraintTop_toBottomOf="@+id/button2"
app:layout_constraintBottom_toTopOf="@+id/button5"/>
<Button
android:text="OUEST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button4"
android:onClick="afficheOuest"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/button3"
app:layout_constraintHorizontal_bias="0.221"
app:layout_constraintTop_toBottomOf="@+id/button2"
app:layout_constraintBottom_toTopOf="@+id/button5"/>
<Button
android:text="SUD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button5"
android:onClick="afficheSud"
app:layout_constraintTop_toBottomOf="@+id/button2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.863"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintVertical_bias="0.69"/>
<ImageView
android:layout_width="154dp"
......@@ -72,5 +25,9 @@
app:srcCompat="@drawable/boussole"
android:id="@+id/imageViewBoussole"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="52dp"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginBottom="117dp"
app:layout_constraintBottom_toTopOf="@+id/imageViewMur"/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment