Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
EXO2_TP3_ALGO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
AREZKI Celia
EXO2_TP3_ALGO
Commits
f396f51c
Commit
f396f51c
authored
8 months ago
by
AREZKI Celia
Browse files
Options
Downloads
Patches
Plain Diff
fix Rectangle class
parent
c0f55dcd
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/shape/Rectangle.java
+14
-8
14 additions, 8 deletions
src/main/java/shape/Rectangle.java
with
14 additions
and
8 deletions
src/main/java/shape/Rectangle.java
+
14
−
8
View file @
f396f51c
package
shape
;
import
javafx.geometry.Point2D
;
import
javafx.scene.canvas.GraphicsContext
;
import
javafx.scene.paint.Color
;
public
class
Rectangle
implements
Shape
{
private
Color
color
;
private
Point2D
point0
,
point1
;
private
Point2D
point0
;
private
Point2D
point1
;
public
Rectangle
(
Color
color
,
Point2D
point0
,
Point2D
point1
)
{
this
.
color
=
color
;
...
...
@@ -16,24 +16,30 @@ public class Rectangle implements Shape {
@Override
public
int
pointsCount
()
{
return
2
;
return
0
;
return
2
;
// Un rectangle est défini par deux points
}
@Override
public
Point2D
point
(
int
index
)
{
return
null
;
if
(
index
==
0
)
{
return
point0
;
}
else
if
(
index
==
1
)
{
return
point1
;
}
else
{
throw
new
IndexOutOfBoundsException
(
"Un rectangle n'a que deux points."
);
}
throw
new
IndexOutOfBoundsException
(
"Rectangle has only 2 points."
);
}
@Override
public
void
draw
(
GraphicsContext
context
)
{
context
.
setStroke
(
color
);
context
.
strokeRect
(
point0
.
getX
(),
point0
.
getY
(),
point1
.
getX
()
-
point0
.
getX
(),
point1
.
getY
()
-
point0
.
getY
());
context
.
setFill
(
color
);
double
x
=
Math
.
min
(
point0
.
getX
(),
point1
.
getX
());
double
y
=
Math
.
min
(
point0
.
getY
(),
point1
.
getY
());
double
width
=
Math
.
abs
(
point0
.
getX
()
-
point1
.
getX
());
double
height
=
Math
.
abs
(
point0
.
getY
()
-
point1
.
getY
());
context
.
fillRect
(
x
,
y
,
width
,
height
);
}
}
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