Skip to content
Snippets Groups Projects
Commit 67529b24 authored by tompotio's avatar tompotio
Browse files

Push final

parent 372106fe
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 141 additions and 7 deletions
ModeleCreation/app/src/main/java/Modele/ModeleManager.java
+ 1
− 1
View file @ 67529b24
......@@ -224,7 +224,7 @@ public class ModeleManager implements Iterable<Modele> {
* @return
*/
public Result piecePeutEtreCree(String nom) {
if(TextUtils.isEmpty(nom)) return new Result("La pièce n'a pas de nom !", false);
if(TextUtils.isEmpty(nom) || (nom == "tempNom")) return new Result("La pièce n'a pas de nom !", false);
if(modeCreationPiece) {
for (Piece piece : modeleActuel) {
if (Objects.equals(piece.getNom(), nom))
......
ModeleCreation/app/src/main/java/com/example/modelecreation/ActiviteCustomPicture.java
+ 2
− 2
View file @ 67529b24
......@@ -188,9 +188,9 @@ public class ActiviteCustomPicture extends AppCompatActivity {
if (Objects.equals(cardinalite,"N"))
modeleManager.creerNouveauMur(0);
else if (Objects.equals(cardinalite,"S")) {
modeleManager.creerNouveauMur(1);
}else if (Objects.equals(cardinalite,"E")) {
modeleManager.creerNouveauMur(2);
}else if (Objects.equals(cardinalite,"E")) {
modeleManager.creerNouveauMur(1);
}else if (Objects.equals(cardinalite,"O")) {
modeleManager.creerNouveauMur(3);
}
......
ModeleCreation/app/src/main/java/com/example/modelecreation/CreationAcces.java
+ 27
− 0
View file @ 67529b24
......@@ -16,6 +16,8 @@ import android.os.Bundle;
import static android.graphics.PixelFormat.TRANSLUCENT;
import java.util.Objects;
/**
* Activité qui permet de créer les rectangles (accès) sur les photos prises précédemment.
*/
......@@ -27,6 +29,7 @@ public class CreationAcces extends AppCompatActivity {
private SurfaceView surfaceView;
private boolean isDrawing;
private Paint paint;
private String cardinalite;
@SuppressLint("ClickableViewAccessibility")
@Override
......@@ -42,6 +45,9 @@ public class CreationAcces extends AppCompatActivity {
ModeleManager modeleManager = ModeleManager.getInstance();
mur = modeleManager.getMurActuel();
cardinalite = modeleManager.getCardinalite();
setMurParCardinalite();
Button confBut = findViewById(R.id.confirmerBut3);
......@@ -172,6 +178,27 @@ public class CreationAcces extends AppCompatActivity {
}
}
/**
* Indique à l'activité sur quel mur elle doit travailler, afin de faciliter les choses.
*/
private void setMurParCardinalite(){
ModeleManager modeleManager = ModeleManager.getInstance();
cardinalite = modeleManager.getCardinalite();
if (Objects.equals(cardinalite,"N"))
modeleManager.creerNouveauMur(0);
else if (Objects.equals(cardinalite,"S")) {
modeleManager.creerNouveauMur(2);
}else if (Objects.equals(cardinalite,"E")) {
modeleManager.creerNouveauMur(1);
}else if (Objects.equals(cardinalite,"O")) {
modeleManager.creerNouveauMur(3);
}
mur = modeleManager.getMurActuel();
if (mur == null){
Log.e("MUR NULL", "Le mur est null");
}
}
/**
* Dessine et colorie le rectangle créé.
* @param rect
......
ModeleCreation/app/src/main/java/com/example/modelecreation/MenuCreationPiece.java
+ 63
− 4
View file @ 67529b24
......@@ -28,6 +28,10 @@ public class MenuCreationPiece extends AppCompatActivity {
private ImageView eSelectPic;
private ModeleManager modeleManager;
private boolean modeCreation;
private ImageView plusN;
private ImageView plusS;
private ImageView plusE;
private ImageView plusO;
@SuppressLint("ClickableViewAccessibility")
@Override
......@@ -58,6 +62,16 @@ public class MenuCreationPiece extends AppCompatActivity {
oSelectPic = findViewById(R.id.OselectedPic);
eSelectPic = findViewById(R.id.EselectedPic);
plusE = findViewById(R.id.plusE);
plusN = findViewById(R.id.plusN);
plusO = findViewById(R.id.plusO);
plusS = findViewById(R.id.plusS);
plusE.setVisibility(View.INVISIBLE);
plusN.setVisibility(View.INVISIBLE);
plusO.setVisibility(View.INVISIBLE);
plusS.setVisibility(View.INVISIBLE);
int resId = getResources().getIdentifier("nopic", "drawable", getPackageName());
nSelectPic.setImageResource(resId);
sSelectPic.setImageResource(resId);
......@@ -65,10 +79,22 @@ public class MenuCreationPiece extends AppCompatActivity {
eSelectPic.setImageResource(resId);
if (!modeCreation){
if (!Objects.equals(pieceTravaillee.getMur(0).getImagePath(), null)) nSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(0).getImagePath()));
if (!Objects.equals(pieceTravaillee.getMur(2).getImagePath(), null)) sSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(2).getImagePath()));
if (!Objects.equals(pieceTravaillee.getMur(3).getImagePath(), null)) oSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(3).getImagePath()));
if (!Objects.equals(pieceTravaillee.getMur(1).getImagePath(), null)) eSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(1).getImagePath()));
if (!Objects.equals(pieceTravaillee.getMur(0).getImagePath(), null)) {
nSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(0).getImagePath()));
plusN.setVisibility(View.VISIBLE);
}
if (!Objects.equals(pieceTravaillee.getMur(2).getImagePath(), null)) {
sSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(2).getImagePath()));
plusS.setVisibility(View.VISIBLE);
}
if (!Objects.equals(pieceTravaillee.getMur(3).getImagePath(), null)){
oSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(3).getImagePath()));
plusO.setVisibility(View.VISIBLE);
}
if (!Objects.equals(pieceTravaillee.getMur(1).getImagePath(), null)) {
eSelectPic.setImageBitmap(BitmapFactory.decodeFile(pieceTravaillee.getMur(1).getImagePath()));
plusE.setVisibility(View.VISIBLE);
}
creerBut.setText("Modifier");
nom.setText(pieceTravaillee.getNom());
title.setText("Modifier la pièce");
......@@ -119,6 +145,39 @@ public class MenuCreationPiece extends AppCompatActivity {
sSelectPic.setOnClickListener(picOnClickListener);
oSelectPic.setOnClickListener(picOnClickListener);
eSelectPic.setOnClickListener(picOnClickListener);
plusS.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
}
});
Intent creationAcces = new Intent(this,CreationAcces.class);
plusE.setOnClickListener(v->{
if(!Objects.equals(pieceTravaillee.getMur(1).getImagePath(), null)){
modeleManager.setCardinalite("E");
startActivity(creationAcces);
}
});
plusN.setOnClickListener(v->{
if(!Objects.equals(pieceTravaillee.getMur(0).getImagePath(), null)){
modeleManager.setCardinalite("N");
startActivity(creationAcces);
}
});
plusO.setOnClickListener(v->{
if(!Objects.equals(pieceTravaillee.getMur(3).getImagePath(), null)){
modeleManager.setCardinalite("O");
startActivity(creationAcces);
}
});
plusS.setOnClickListener(v->{
if(!Objects.equals(pieceTravaillee.getMur(2).getImagePath(), null)){
modeleManager.setCardinalite("S");
startActivity(creationAcces);
}
});
}
/**
......
ModeleCreation/app/src/main/res/layout/activity_menu_creation_piece.xml
+ 48
− 0
View file @ 67529b24
......@@ -111,4 +111,52 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintEnd_toStartOf="@+id/textView9" app:layout_constraintTop_toBottomOf="@+id/textView2"
app:layout_constraintVertical_bias="0.5" app:layout_constraintBottom_toTopOf="@+id/NselectedPic"/>
<ImageView
android:id="@+id/plusE"
android:layout_width="30dp"
android:layout_height="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.892"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.467"
app:srcCompat="@drawable/plus" />
<ImageView
android:id="@+id/plusN"
android:layout_width="30dp"
android:layout_height="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.414"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.467"
app:srcCompat="@drawable/plus" />
<ImageView
android:id="@+id/plusO"
android:layout_width="34dp"
android:layout_height="33dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.419"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.707"
app:srcCompat="@drawable/plus" />
<ImageView
android:id="@+id/plusS"
android:layout_width="30dp"
android:layout_height="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.892"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.704"
app:srcCompat="@drawable/plus" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment