Skip to content
Snippets Groups Projects
Commit 19c59a8a authored by BERRADA Louise's avatar BERRADA Louise
Browse files

Remise barre profs

parent 3d6fa8db
No related branches found
No related tags found
No related merge requests found
...@@ -223,8 +223,8 @@ public class ShukanView extends JPanel ...@@ -223,8 +223,8 @@ public class ShukanView extends JPanel
nbModules = data.numberOfModules(); nbModules = data.numberOfModules();
// Height // Height
textHeight = (int) (height / (3.0f * nbModules)); textHeight = (int) (height / (3.0f * nbModules +1));
appliHeight = textHeight * 3 * nbModules; appliHeight = textHeight * 3 * (nbModules +1);
// Width // Width
activWidth = width / (ShukanModule.MAX_ACTIV_PER_WEEK * (nbWeeks + 2)); activWidth = width / (ShukanModule.MAX_ACTIV_PER_WEEK * (nbWeeks + 2));
...@@ -304,18 +304,18 @@ public class ShukanView extends JPanel ...@@ -304,18 +304,18 @@ public class ShukanView extends JPanel
// Texts : semester and load name // Texts : semester and load name
drawText (g2, 0, appliHeight - textHeight, drawText (g2, 0, appliHeight - textHeight,
2 * weekWidth, textHeight, data.cursusName ()); 2 * weekWidth, textHeight, data.cursusName ());
// drawText (g2, 0, textHeight, drawText (g2, 0, textHeight,
// 2 * weekWidth, textHeight, data.loadName ()); 2 * weekWidth, textHeight, data.loadName ());
// Texts : weeks // Texts : weeks
int[] weekNumbers = data.weekNumbers (); int[] weekNumbers = data.weekNumbers ();
for (int i = 0; i < nbWeeks; i++) for (int i = 0; i < nbWeeks; i++)
{ {
drawText (g2, (i + 2) * weekWidth, appliHeight - textHeight, drawText (g2, (i + 2) * weekWidth, appliHeight - textHeight,
weekWidth, textHeight, "S" + weekNumbers[i]); weekWidth, textHeight, "S" + weekNumbers[i]);
// drawText (g2, (i + 2) * weekWidth, textHeight, drawText (g2, (i + 2) * weekWidth, textHeight,
// weekWidth, textHeight, "" + data.computeLoad (i)); weekWidth, textHeight, "" + data.computeLoad (i));
// drawText (g2, (2 + i) * weekWidth, 0, drawText (g2, (2 + i) * weekWidth, 0,
// weekWidth, textHeight, "/" + durations[i]); weekWidth, textHeight, "/" + durations[i]);
} }
// Texts : modules // Texts : modules
String[] modNames = data.moduleNames (); String[] modNames = data.moduleNames ();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment