Skip to content

Commit

Permalink
changes to the staff/guest badges for 2023 + code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
administrator committed Nov 5, 2023
1 parent 3e4f590 commit 2254b46
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 291 deletions.
75 changes: 0 additions & 75 deletions ...java/org/kumoricon/registration/print/formatter/badgeimage/BadgeCreatorStaff2018Back.java
View file

This file was deleted.

69 changes: 0 additions & 69 deletions ...ava/org/kumoricon/registration/print/formatter/badgeimage/BadgeCreatorStaff2018Front.java
View file

This file was deleted.

3 changes: 1 addition & 2 deletions ...ain/java/org/kumoricon/registration/print/formatter/badgeimage/BadgeCreatorStaffBack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ public byte[] createBadge(StaffBadgeDTO staff) {
drawPositionsStripe(b, staff);
drawLargeName(b, staff);
drawPronouns(b, staff);
//drawBadgeAgeImage(b, staff);
drawBadgeNumber(b, staff);

return b.writePNGToByteArray();
}
}
131 changes: 14 additions & 117 deletions ...ain/java/org/kumoricon/registration/print/formatter/badgeimage/BadgeCreatorStaffBase.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.kumoricon.registration.print.formatter.badgeimage;

import org.kumoricon.registration.model.staff.StaffBadgeDTO;

import java.awt.*;
import java.util.ArrayList;

Expand All @@ -21,22 +19,16 @@ public BadgeCreatorStaffBase(Font boldFont, Font plainFont) {
}

// For 2023, an age image is not used (background color instead)
void drawBadgeAgeImage(BadgeImage b, StaffBadgeDTO staff) {
// Rectangle badgeImageLocation = new Rectangle(250, 290, 165, 413);
Rectangle badgeImageLocation = new Rectangle(160, 292, 165, 113);
// b.fillRect(badgeImageLocation, Color.RED);
b.drawImage(staff.getAgeImage(), badgeImageLocation);
}
// void drawBadgeAgeImage(BadgeImage b, StaffBadgeDTO staff) {
// Rectangle badgeImageLocation = new Rectangle(160, 292, 165, 113);
// b.drawImage(staff.getAgeImage(), badgeImageLocation);
// }

void drawPositionsStripe(BadgeImage b, StaffBadgeDTO staff) {
// Guests don't have a department color stripe, but we have to fill in the background color this
// year. (In past years, it was part of the badge background)
Color fgColor = positionForeground(staff.getDepartmentBackgroundColor());
Color bgColor = positionBackground(staff.getDepartmentBackgroundColor());
// if (staff.getDepartmentBackgroundColor() != null && !staff.getDepartmentBackgroundColor().isBlank()) {
// bgColor = Color.decode(staff.getDepartmentBackgroundColor());
// fgColor = BadgeImage.getInverseColor(bgColor);
// }

Rectangle positionsBackground = new Rectangle(0, 625, 1200, 207);
b.fillRect(positionsBackground, bgColor);
Expand All @@ -46,15 +38,12 @@ void drawPositionsStripe(BadgeImage b, StaffBadgeDTO staff) {
if (staffPositions != null) {
Rectangle textBounds = null;

if (staffPositions.length == 1) {
textBounds = new Rectangle(80, 625, 1040, 207);
}

if (staffPositions.length == 2) {
textBounds = new Rectangle(80, 625, 1040, 207);
textBounds = new Rectangle(80, 605, 1040, 207);
} else {
textBounds = new Rectangle(80, 605, 1040, 207);
}

// b.fillRect(textBounds, Color.CYAN);
float maxFontSize = 72f;
boolean yAxisCentering = true;
b.drawCenteredStrings(staffPositions, textBounds, boldFont, fgColor, 1, maxFontSize, yAxisCentering);
Expand All @@ -66,149 +55,57 @@ static Color positionForeground(String departmentBackgroundColor) {
return Color.WHITE;
} else {
return Color.WHITE;
//return BadgeImage.getInverseColor(Color.decode(departmentBackgroundColor));
}
}

static Color positionBackground(String departmentBackgroundColor) {
if (departmentBackgroundColor == null || departmentBackgroundColor.isEmpty()) {
return Color.decode("#E79B2");
return Color.decode("#E69826");
} else {
return Color.decode(departmentBackgroundColor);
}
}

// This is version "B", see below for the original
void drawLargeName(BadgeImage b, StaffBadgeDTO staff) {
// Staff don't have fan names, but guests do, so add that to the list if it's not null.
// Also, some guests apparently don't have a last name entered.

// Draw the background with the age color
Color bgColor = Color.decode(staff.getAgeBackgroundColor());
// if (staff.getDepartmentBackgroundColor() != null && !staff.getDepartmentBackgroundColor().isBlank()) {
// bgColor = positionBackground(staff.getDepartmentBackgroundColor());
// }
Rectangle positionsBackground = new Rectangle(0, 1512, 1200, 150);
if (staff.getDepartment() == null) {
//guest badge
b.fillRect(positionsBackground, Color.decode("#A63439"));
} else {
b.fillRect(positionsBackground, Color.decode("#463161"));
}


Rectangle positionsBackground2 = new Rectangle(0, 1662, 1200, 150);
b.fillRect(positionsBackground2, bgColor);

Color fgColor = foregroundColorForName(staff);
String[] names = buildNameList(staff);
Rectangle line1 = null;
//Rectangle line2 = null;

//if (staff.getPreferredPronoun() == null || staff.getPreferredPronoun().isBlank()) {
// No pronoun

if (names.length == 1) {
line1 = new Rectangle(80, 1515, 1020, 200);
float maxFontSize = 0.0f;
b.drawStretchedCenteredString(names[0], line1, boldFont, fgColor, 1, maxFontSize);
} else if (names.length == 2) {
line1 = new Rectangle(80, 1515, 1020, 200);
//line2 = new Rectangle(80, 1630, 1000, 140);
float maxFontSize = 0.0f;
b.drawStretchedCenteredString(names[0] + ' ' + names[1], line1, boldFont, fgColor, 1, maxFontSize);
//b.drawStretchedCenteredString(names[1], line2, boldFont, fgColor, 1);
}

//}
// else {
// // Pronouns
// if (names.length == 1) {
// line1 = new Rectangle(80, 1530, 1020, 200);
// float maxFontSize = 0.0f;
// b.drawStretchedCenteredString(names[0], line1, boldFont, fgColor, 1, maxFontSize);
// } else if (names.length == 2) {
// line1 = new Rectangle(80, 1530, 1020, 200);
// //line2 = new Rectangle(80, 1630, 1000, 140);
// float maxFontSize = 0.0f;
// b.drawStretchedCenteredString(names[0] + ' ' + names[1], line1, boldFont, fgColor, 0, maxFontSize);
// //b.drawStretchedCenteredString(names[1], line2, boldFont, fgColor, 1);
// }
// }
// if (line1 != null) b.fillRect(line1, Color.RED);
// if (line2 != null) b.fillRect(line2, Color.ORANGE);
}

void drawLargeNameA(BadgeImage b, StaffBadgeDTO staff) {
// Staff don't have fan names, but guests do, so add that to the list if it's not null.
// Also, some guests apparently don't have a last name entered.

// Draw the background with the age color
Color bgColor = Color.decode(staff.getAgeBackgroundColor());
// if (staff.getDepartmentBackgroundColor() != null && !staff.getDepartmentBackgroundColor().isBlank()) {
// bgColor = positionBackground(staff.getDepartmentBackgroundColor());
// }
Rectangle positionsBackground = new Rectangle(0, 1513, 1200, 390);
b.fillRect(positionsBackground, bgColor);

Color fgColor = foregroundColorForName(staff);
String[] names = buildNameList(staff);
Rectangle line1 = null;
//Rectangle line2 = null;

//if (staff.getPreferredPronoun() == null || staff.getPreferredPronoun().isBlank()) {
// No pronoun

if (names.length == 1) {
line1 = new Rectangle(80, 1530, 1020, 200);
line1 = new Rectangle(80, 1495, 1020, 200);
float maxFontSize = 0.0f;
b.drawStretchedCenteredString(names[0], line1, boldFont, fgColor, 1, maxFontSize);
} else if (names.length == 2) {
line1 = new Rectangle(80, 1530, 1020, 200);
//line2 = new Rectangle(80, 1630, 1000, 140);
line1 = new Rectangle(80, 1495, 1020, 200);
float maxFontSize = 0.0f;
b.drawStretchedCenteredString(names[0] + ' ' + names[1], line1, boldFont, fgColor, 1, maxFontSize);
//b.drawStretchedCenteredString(names[1], line2, boldFont, fgColor, 1);
}

//}
// else {
// // Pronouns
// if (names.length == 1) {
// line1 = new Rectangle(80, 1530, 1020, 200);
// float maxFontSize = 0.0f;
// b.drawStretchedCenteredString(names[0], line1, boldFont, fgColor, 1, maxFontSize);
// } else if (names.length == 2) {
// line1 = new Rectangle(80, 1530, 1020, 200);
// //line2 = new Rectangle(80, 1630, 1000, 140);
// float maxFontSize = 0.0f;
// b.drawStretchedCenteredString(names[0] + ' ' + names[1], line1, boldFont, fgColor, 0, maxFontSize);
// //b.drawStretchedCenteredString(names[1], line2, boldFont, fgColor, 1);
// }
// }
// if (line1 != null) b.fillRect(line1, Color.RED);
// if (line2 != null) b.fillRect(line2, Color.ORANGE);
}

private static Color foregroundColorForName(StaffBadgeDTO staff) {
Color fgColor;
if (staff.getDepartment() == null) {
// No department == Guest of Honor
fgColor = Color.WHITE; //Color.decode("#39296c");
fgColor = Color.WHITE;
} else {
// Regular staff
fgColor = Color.WHITE; //Color.decode("#c3c2fe");
fgColor = Color.WHITE;
}
return fgColor;
}

void drawPronouns(BadgeImage b, StaffBadgeDTO staff) {
if (staff.getPreferredPronoun() != null && !staff.getPreferredPronoun().isBlank()) {
//Color fgColor = foregroundColorForName(staff);
Color bgColor = Color.decode(staff.getAgeBackgroundColor());
Color fgColor = BadgeImage.getInverseColor(bgColor);
Color fgColor = Color.WHITE;
Rectangle background = new Rectangle(810, 1675, 300, 70);
// b.fillRect(background,f Color.RED);
Font pronounFont = plainFont.deriveFont(56f);
b.drawRightAlignedString(staff.getPreferredPronoun(), background, pronounFont, fgColor, 0);
}
Expand All @@ -224,7 +121,7 @@ void drawBadgeNumber(BadgeImage b, StaffBadgeDTO staff) {
bgColor = Color.decode(staff.getAgeBackgroundColor());
}

Color fgColor = BadgeImage.getInverseColor(bgColor);
Color fgColor = Color.WHITE; //BadgeImage.getInverseColor(bgColor);
if (staff.getBadgeNumber() != null && !staff.getBadgeNumber().isBlank()) {
Rectangle background = new Rectangle(70, 1685, 200, 60);
b.drawStretchedCenteredString(staff.getBadgeNumber(), background, plainFont, fgColor, 0);
Expand Down
6 changes: 2 additions & 4 deletions ...in/java/org/kumoricon/registration/print/formatter/badgeimage/BadgeCreatorStaffFront.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@ public byte[] createBadge(StaffBadgeDTO staff) {
drawLargeName(b, staff);
drawPositionsStripe(b, staff);
drawPronouns(b, staff);
//drawBadgeAgeImage(b, staff); // Not used for 2023
drawBadgeNumber(b, staff);
drawBadgeImage(b, staff);

return b.writePNGToByteArray();
}

private void drawBadgeImage(BadgeImage b, StaffBadgeDTO staff) {
Rectangle badgeImageLocation = new Rectangle(380, 850, 450, 510);
// b.fillRect(badgeImageLocation, Color.CYAN);
private void drawBadgeImage(BadgeImage b, StaffBadgeDTO staff) {
Rectangle badgeImageLocation = new Rectangle(80, 850, 1040, 510);
b.drawStretchedImage(staff.getBadgeImage(), badgeImageLocation);
}
}
Loading

0 comments on commit 2254b46

Please sign in to comment.