From 19c59a8a034ee7a24647c6b36e4b239b2d2955af Mon Sep 17 00:00:00 2001
From: berradag3u <louise.berrada1@etu.univ-lorraine.fr>
Date: Tue, 30 May 2023 18:48:08 +0200
Subject: [PATCH] Remise barre profs
---
shukan/ShukanView.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/shukan/ShukanView.java b/shukan/ShukanView.java
index 1b73030..ae1e69d 100644
--- a/shukan/ShukanView.java
+++ b/shukan/ShukanView.java
@@ -223,8 +223,8 @@ public class ShukanView extends JPanel
nbModules = data.numberOfModules();
// Height
- textHeight = (int) (height / (3.0f * nbModules));
- appliHeight = textHeight * 3 * nbModules;
+ textHeight = (int) (height / (3.0f * nbModules +1));
+ appliHeight = textHeight * 3 * (nbModules +1);
// Width
activWidth = width / (ShukanModule.MAX_ACTIV_PER_WEEK * (nbWeeks + 2));
@@ -304,18 +304,18 @@ public class ShukanView extends JPanel
// Texts : semester and load name
drawText (g2, 0, appliHeight - textHeight,
2 * weekWidth, textHeight, data.cursusName ());
- // drawText (g2, 0, textHeight,
- // 2 * weekWidth, textHeight, data.loadName ());
+ drawText (g2, 0, textHeight,
+ 2 * weekWidth, textHeight, data.loadName ());
// Texts : weeks
int[] weekNumbers = data.weekNumbers ();
for (int i = 0; i < nbWeeks; i++)
{
drawText (g2, (i + 2) * weekWidth, appliHeight - textHeight,
weekWidth, textHeight, "S" + weekNumbers[i]);
- // drawText (g2, (i + 2) * weekWidth, textHeight,
- // weekWidth, textHeight, "" + data.computeLoad (i));
- // drawText (g2, (2 + i) * weekWidth, 0,
- // weekWidth, textHeight, "/" + durations[i]);
+ drawText (g2, (i + 2) * weekWidth, textHeight,
+ weekWidth, textHeight, "" + data.computeLoad (i));
+ drawText (g2, (2 + i) * weekWidth, 0,
+ weekWidth, textHeight, "/" + durations[i]);
}
// Texts : modules
String[] modNames = data.moduleNames ();
--
GitLab