Skip to content

Fix cell font name and error message (#361) #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sethk wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix cell font name and error message (#361) #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/main/java/org/datavyu/util/ConfigProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.awt.*;
import java.io.*;
import java.util.function.Consumer;

/**
* Configuration properties that are loaded from the settings.xml file in the resource folder.
Expand Down Expand Up @@ -254,15 +255,15 @@ public final class ConfigProperties implements Serializable {
configurationProperties.setLastChosenDirectory(DEFAULT_LAST_CHOSEN_DIRECTORY);
}
try {
Font defaultFont = Font.createFont(Font.TRUETYPE_FONT,
configurationProperties.getClass().getResourceAsStream(Constants.DEFAULT_FONT_FILE));
Font defaultCellFont = Font.createFont(Font.TRUETYPE_FONT,
configurationProperties.getClass().getResourceAsStream(Constants.DEFAULT_CELL_FONT_FILE));
configurationProperties.setSpreadSheetDataFont(defaultCellFont.deriveFont(DEFAULT_DATA_FONT_SIZE));
// configurationProperties.setSpreadSheetDataFont(defaultFont.deriveFont(DEFAULT_DATA_FONT_SIZE));
configurationProperties.setSpreadSheetLabelFont(defaultFont.deriveFont(DEFAULT_LABEL_FONT_SIZE));
loadFont(Constants.DEFAULT_FONT_FILE, (font) -> {
configurationProperties.setSpreadSheetLabelFont(font.deriveFont(DEFAULT_LABEL_FONT_SIZE));
//configurationProperties.setSpreadSheetDataFont(font.deriveFont(DEFAULT_DATA_FONT_SIZE));
});
loadFont(Constants.DEFAULT_CELL_FONT_FILE, (font) -> {
configurationProperties.setSpreadSheetDataFont(font.deriveFont(DEFAULT_DATA_FONT_SIZE));
});
} catch (Exception e) {
logger.error("Error, unable to load font " + Constants.DEFAULT_FONT_FILE + ". The error is " + e);
logger.error(e.toString());
}

// In all cases save this setting for the next run
Expand All @@ -285,6 +286,15 @@ public static ConfigProperties getInstance() {
return configurationProperties;
}

private static void loadFont(String fontPath, Consumer<Font> consumer) throws Exception {
try {
consumer.accept(Font.createFont(Font.TRUETYPE_FONT,
configurationProperties.getClass().getResourceAsStream(fontPath)));
} catch (Exception e) {
throw new Exception("Error, unable to load font " + fontPath, e);
}
}

/**
* Saves the configuration properties in local storage using the Swing Application Framework.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/datavyu/util/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public final class Constants {
public static final String DEFAULT_FONT_FILE = "/fonts/DejaVuSansCondensed.ttf";

/** Cell Unicode Font file name */
public static final String DEFAULT_CELL_FONT_FILE = "/fonts/unifont.ttf";
public static final String DEFAULT_CELL_FONT_FILE = "/fonts/unifont-10.0.07.ttf";

/** Buffer size when copying files from streams */
public static final int BUFFER_COPY_SIZE = 16*1024; // 16 kB
Expand Down