Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pingouins
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Felton Samuel
pingouins
Commits
acaca93c
Commit
acaca93c
authored
8 years ago
by
Bariatti Francesco
Browse files
Options
Downloads
Patches
Plain Diff
Small changes in GUI code
parent
b5516699
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gui/src/Case.java
+7
-2
7 additions, 2 deletions
gui/src/Case.java
gui/src/Controller.java
+4
-121
4 additions, 121 deletions
gui/src/Controller.java
with
11 additions
and
123 deletions
gui/src/Case.java
+
7
−
2
View file @
acaca93c
import
javafx.scene.shape.Polygon
;
public
class
Case
{
private
int
rang
;
//N� de la case (bottom right = 0, top left = 59)
private
int
nbFish
;
//Nb de poissons sur la case (0 si vide)
private
boolean
bluePenguin
;
//true s'il y a un pinguin bleu sur la case
private
boolean
redPenguin
;
//true s'il y a un pinguin rouge sur la case
private
Polygon
caseFX
;
public
Case
(
int
rang
,
int
nbFish
,
boolean
bluePenguin
,
boolean
redPenguin
)
{
public
Case
(
int
rang
,
int
nbFish
,
boolean
bluePenguin
,
boolean
redPenguin
,
Polygon
caseFX
)
{
super
();
this
.
rang
=
rang
;
this
.
nbFish
=
nbFish
;
this
.
bluePenguin
=
bluePenguin
;
this
.
redPenguin
=
redPenguin
;
this
.
caseFX
=
caseFX
;
}
public
Case
(
int
rang
)
{
//Constructeur de case vide
public
Case
(
int
rang
,
Polygon
caseFX
)
{
//Constructeur de case vide
super
();
this
.
rang
=
rang
;
this
.
caseFX
=
caseFX
;
nbFish
=
0
;
bluePenguin
=
false
;
redPenguin
=
false
;
...
...
This diff is collapsed.
Click to expand it.
gui/src/Controller.java
+
4
−
121
View file @
acaca93c
...
...
@@ -15,137 +15,20 @@ public class Controller implements Initializable {
private
Process
gameProcess
;
@FXML
private
Polygon
case0
,
case1
;
//@FXML
//private Polygon case1;
@FXML
private
Polygon
case2
;
@FXML
private
Polygon
case3
;
@FXML
private
Polygon
case4
;
@FXML
private
Polygon
case5
;
@FXML
private
Polygon
case6
;
@FXML
private
Polygon
case7
;
@FXML
private
Polygon
case8
;
@FXML
private
Polygon
case9
;
@FXML
private
Polygon
case10
;
@FXML
private
Polygon
case11
;
@FXML
private
Polygon
case12
;
@FXML
private
Polygon
case13
;
@FXML
private
Polygon
case14
;
@FXML
private
Polygon
case15
;
@FXML
private
Polygon
case16
;
@FXML
private
Polygon
case17
;
@FXML
private
Polygon
case18
;
@FXML
private
Polygon
case19
;
@FXML
private
Polygon
case20
;
@FXML
private
Polygon
case21
;
@FXML
private
Polygon
case22
;
@FXML
private
Polygon
case23
;
@FXML
private
Polygon
case24
;
@FXML
private
Polygon
case25
;
@FXML
private
Polygon
case26
;
@FXML
private
Polygon
case27
;
@FXML
private
Polygon
case28
;
@FXML
private
Polygon
case29
;
@FXML
private
Polygon
case30
;
@FXML
private
Polygon
case31
;
@FXML
private
Polygon
case32
;
@FXML
private
Polygon
case33
;
@FXML
private
Polygon
case34
;
@FXML
private
Polygon
case35
;
@FXML
private
Polygon
case36
;
@FXML
private
Polygon
case37
;
@FXML
private
Polygon
case38
;
@FXML
private
Polygon
case39
;
@FXML
private
Polygon
case40
;
@FXML
private
Polygon
case41
;
@FXML
private
Polygon
case42
;
@FXML
private
Polygon
case43
;
@FXML
private
Polygon
case44
;
@FXML
private
Polygon
case45
;
@FXML
private
Polygon
case46
;
@FXML
private
Polygon
case47
;
@FXML
private
Polygon
case48
;
@FXML
private
Polygon
case49
;
@FXML
private
Polygon
case50
;
@FXML
private
Polygon
case51
;
@FXML
private
Polygon
case52
;
@FXML
private
Polygon
case53
;
@FXML
private
Polygon
case54
;
@FXML
private
Polygon
case55
;
@FXML
private
Polygon
case56
;
@FXML
private
Polygon
case57
;
@FXML
private
Polygon
case58
;
@FXML
private
Polygon
case59
;
private
Polygon
case0
,
case1
,
case2
,
case3
,
case4
,
case5
,
case6
,
case7
,
case8
,
case9
,
case10
,
case11
,
case12
,
case13
,
case14
,
case15
,
case16
,
case17
,
case18
,
case19
,
case20
,
case21
,
case22
,
case23
,
case24
,
case25
,
case26
,
case27
,
case28
,
case29
,
case30
,
case31
,
case32
,
case33
,
case34
,
case35
,
case36
,
case37
,
case38
,
case39
,
case40
,
case41
,
case42
,
case43
,
case44
,
case45
,
case46
,
case47
,
case48
,
case49
,
case50
,
case51
,
case52
,
case53
,
case54
,
case55
,
case56
,
case57
,
case58
,
case59
;
@FXML
private
BorderPane
panneauPrincipal
;
@Override
public
void
initialize
(
URL
location
,
ResourceBundle
resources
)
{
try
{
/*
try {
this.gameProcess = new ProcessBuilder("../bin/theturk").start();
} catch (IOException e) {
// TODO Error message and exit
e.printStackTrace();
}
}
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment