lkrsnik/list
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Some fixes + changed multiple names for clarification

Browse Source
This commit is contained in:
Luka
2018-12-13 14:12:05 +01:00
parent 5e686ff681
commit 3889b834e3
12 changed files with 430 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/gui/CharacterAnalysisTab.java
View File

@@ -61,6 +61,27 @@ public class CharacterAnalysisTab {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label stringLengthLH;
@FXML
public Label calculateForLH;
@FXML
public Label displayTaxonomyLH;
@FXML
public Label msdLH;
@FXML
public Label taxonomyLH;
@FXML
public Label minimalOccurrencesLH;
@FXML
public Label minimalTaxonomyLH;
@FXML
public Label solarFilters;
@@ -484,6 +505,15 @@ public class CharacterAnalysisTab {
taxonomyL.textProperty().bind(I18N.createStringBinding("label.taxonomy"));
minimalOccurrencesL.textProperty().bind(I18N.createStringBinding("label.minimalOccurrences"));
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
stringLengthLH.textProperty().bind(I18N.createStringBinding("label.letter.stringLengthH"));
calculateForLH.textProperty().bind(I18N.createStringBinding("label.letter.calculateForH"));
displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.letter.displayTaxonomyH"));
msdLH.textProperty().bind(I18N.createStringBinding("label.letter.msdH"));
taxonomyLH.textProperty().bind(I18N.createStringBinding("label.letter.taxonomyH"));
minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.letter.minimalOccurrencesH"));
minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.letter.minimalTaxonomyH"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));

41
src/main/java/gui/OneWordAnalysisTab.java
View File

@@ -69,6 +69,30 @@ public class OneWordAnalysisTab {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label calculateForLH;
@FXML
public Label alsoVisualizeLH;
@FXML
public Label displayTaxonomyLH;
@FXML
public Label writeMsdAtTheEndLH;
@FXML
public Label msdLH;
@FXML
public Label taxonomyLH;
@FXML
public Label minimalOccurrencesLH;
@FXML
public Label minimalTaxonomyLH;
@FXML
private TextField msdTF;
private ArrayList<Pattern> msd;
@@ -350,7 +374,11 @@ public class OneWordAnalysisTab {
};
alsoVisualizeCCB.getCheckModel().clearChecks();
alsoVisualizeCCB.getItems().removeAll();
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_LEMMA));
if (corpus.getCorpusType() != CorpusType.GOS){
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_WORDS));
} else {
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_WORDS_GOS));
}
alsoVisualizeCCB.getCheckModel().getCheckedItems().addListener(alsoVisualizeListener);
@@ -591,6 +619,17 @@ public class OneWordAnalysisTab {
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
calculateForLH.textProperty().bind(I18N.createStringBinding("label.word.calculateForH"));
alsoVisualizeLH.textProperty().bind(I18N.createStringBinding("label.word.alsoVisualizeH"));
displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.word.displayTaxonomyH"));
writeMsdAtTheEndLH.textProperty().bind(I18N.createStringBinding("label.word.writeMsdAtTheEndH"));
msdLH.textProperty().bind(I18N.createStringBinding("label.word.msdH"));
taxonomyLH.textProperty().bind(I18N.createStringBinding("label.word.taxonomyH"));
minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.word.minimalOccurrencesH"));
minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.word.minimalTaxonomyH"));
}
/**

122
src/main/java/gui/StringAnalysisTabNew2.java
View File

@@ -86,6 +86,38 @@ public class StringAnalysisTabNew2 {
@FXML
public Label collocabilityL;
@FXML
public Label calculateForLH;
@FXML
public Label alsoVisualizeLH;
@FXML
public Label displayTaxonomyLH;
@FXML
public Label msdLH;
@FXML
public Label taxonomyLH;
@FXML
public Label minimalOccurrencesLH;
@FXML
public Label minimalTaxonomyLH;
@FXML
public Label skipValueLH;
@FXML
public Label ngramValueLH;
@FXML
public Label notePunctuationsLH;
@FXML
public Label collocabilityLH;
@FXML
private TextField msdTF;
@@ -99,14 +131,14 @@ public class StringAnalysisTabNew2 {
@FXML
private CheckComboBox<String> taxonomyCCB;
private ArrayList<Taxonomy> taxonomy;
//
// @FXML
// private CheckBox calculatecvvCB;
// private boolean calculateCvv;
@FXML
private CheckBox calculatecvvCB;
private boolean calculateCvv;
@FXML
private TextField stringLengthTF;
private Integer stringLength;
// @FXML
// private TextField stringLengthTF;
// private Integer stringLength;
@FXML
private ComboBox<String> calculateForCB;
@@ -143,9 +175,6 @@ public class StringAnalysisTabNew2 {
@FXML
private Pane paneWords;
@FXML
private Pane paneLetters;
@FXML
private Button computeNgramsB;
@@ -477,7 +506,11 @@ public class StringAnalysisTabNew2 {
};
alsoVisualizeCCB.getCheckModel().clearChecks();
alsoVisualizeCCB.getItems().removeAll();
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_LEMMA));
if (corpus.getCorpusType() != CorpusType.GOS){
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_WORDS));
} else {
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_WORDS_GOS));
}
alsoVisualizeCCB.getCheckModel().getCheckedItems().addListener(alsoVisualizeListener);
@@ -535,31 +568,31 @@ public class StringAnalysisTabNew2 {
skipValue = 0;
// cvv
calculatecvvCB.selectedProperty().addListener((observable, oldValue, newValue) -> {
calculateCvv = newValue;
logger.info("calculate cvv: " + calculateCvv);
});
// calculatecvvCB.selectedProperty().addListener((observable, oldValue, newValue) -> {
// calculateCvv = newValue;
// logger.info("calculate cvv: " + calculateCvv);
// });
calculatecvvCB.setSelected(false);
// calculatecvvCB.setSelected(false);
// string length
stringLengthTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (!newValue) {
// focus lost
String value = stringLengthTF.getText();
if (!ValidationUtil.isEmpty(value)) {
if (!ValidationUtil.isNumber(value)) {
logAlert("stringlengthTf: " + I18N.get("message.WARNING_ONLY_NUMBERS_ALLOWED"));
GUIController.showAlert(Alert.AlertType.ERROR, I18N.get("message.WARNING_ONLY_NUMBERS_ALLOWED"));
}
stringLength = Integer.parseInt(value);
} else {
GUIController.showAlert(Alert.AlertType.ERROR, I18N.get("message.WARNING_MISSING_STRING_LENGTH"));
stringLengthTF.setText("1");
logAlert(I18N.get("message.WARNING_MISSING_STRING_LENGTH"));
}
}
});
// stringLengthTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
// if (!newValue) {
// // focus lost
// String value = stringLengthTF.getText();
// if (!ValidationUtil.isEmpty(value)) {
// if (!ValidationUtil.isNumber(value)) {
// logAlert("stringlengthTf: " + I18N.get("message.WARNING_ONLY_NUMBERS_ALLOWED"));
// GUIController.showAlert(Alert.AlertType.ERROR, I18N.get("message.WARNING_ONLY_NUMBERS_ALLOWED"));
// }
// stringLength = Integer.parseInt(value);
// } else {
// GUIController.showAlert(Alert.AlertType.ERROR, I18N.get("message.WARNING_MISSING_STRING_LENGTH"));
// stringLengthTF.setText("1");
// logAlert(I18N.get("message.WARNING_MISSING_STRING_LENGTH"));
// }
// }
// });
minimalOccurrencesTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (!newValue) {
@@ -745,6 +778,19 @@ public class StringAnalysisTabNew2 {
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
calculateForLH.textProperty().bind(I18N.createStringBinding("label.wordSet.calculateForH"));
alsoVisualizeLH.textProperty().bind(I18N.createStringBinding("label.wordSet.alsoVisualizeH"));
displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordSet.displayTaxonomyH"));
skipValueLH.textProperty().bind(I18N.createStringBinding("label.wordSet.skipValueH"));
ngramValueLH.textProperty().bind(I18N.createStringBinding("label.wordSet.ngramValueH"));
notePunctuationsLH.textProperty().bind(I18N.createStringBinding("label.wordSet.notePunctuationsH"));
collocabilityLH.textProperty().bind(I18N.createStringBinding("label.wordSet.collocabilityH"));
msdLH.textProperty().bind(I18N.createStringBinding("label.wordSet.msdH"));
taxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordSet.taxonomyH"));
minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.wordSet.minimalOccurrencesH"));
minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordSet.minimalTaxonomyH"));
}
/**
@@ -762,7 +808,7 @@ public class StringAnalysisTabNew2 {
if (mode == MODE.WORD) {
paneWords.setVisible(true);
paneLetters.setVisible(false);
// paneLetters.setVisible(false);
// if (corpus.getCorpusType() == CorpusType.GOS)
// calculateForCB.getItems().setAll(N_GRAM_COMPUTE_FOR_WORDS_GOS);
// else
@@ -794,7 +840,7 @@ public class StringAnalysisTabNew2 {
filter.setDisplayTaxonomy(displayTaxonomy);
filter.setAl(AnalysisLevel.STRING_LEVEL);
filter.setSkipValue(skipValue);
filter.setIsCvv(calculateCvv);
// filter.setIsCvv(calculateCvv);
filter.setSolarFilters(solarFiltersMap);
filter.setNotePunctuations(notePunctuations);
filter.setMultipleKeys(alsoVisualize);
@@ -805,9 +851,9 @@ public class StringAnalysisTabNew2 {
filter.setMinimalTaxonomy(minimalTaxonomy);
filter.setCollocability(collocability);
if (ngramValue != null && ngramValue == 0) {
filter.setStringLength(stringLength);
}
// if (ngramValue != null && ngramValue == 0) {
// filter.setStringLength(stringLength);
// }
String message = Validation.validateForStringLevel(filter);
if (message == null) {

54
src/main/java/gui/WordLevelTab.java
View File

@@ -81,6 +81,40 @@ public class WordLevelTab {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label calculateForLH;
@FXML
public Label alsoVisualizeLH;
@FXML
public Label displayTaxonomyLH;
@FXML
public Label prefixLengthLH;
@FXML
public Label suffixLengthLH;
@FXML
public Label prefixListLH;
@FXML
public Label suffixListLH;
@FXML
public Label msdLH;
@FXML
public Label taxonomyLH;
@FXML
public Label minimalOccurrencesLH;
@FXML
public Label minimalTaxonomyLH;
@FXML
private TextField msdTF;
private ArrayList<Pattern> msd;
@@ -466,7 +500,11 @@ public class WordLevelTab {
alsoVisualizeCCB.getCheckModel().clearChecks();
alsoVisualizeCCB.getItems().removeAll();
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_LEMMA));
if (corpus.getCorpusType() != CorpusType.GOS){
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_WORDS));
} else {
alsoVisualizeCCB.getItems().setAll(I18N.translatedObservableList(ALSO_VISUALIZE_ITEMS_WORDS_GOS));
}
alsoVisualizeCCB.getCheckModel().getCheckedItems().addListener(alsoVisualizeListener);
@@ -716,6 +754,20 @@ public class WordLevelTab {
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
calculateForLH.textProperty().bind(I18N.createStringBinding("label.wordPart.calculateForH"));
alsoVisualizeLH.textProperty().bind(I18N.createStringBinding("label.wordPart.alsoVisualizeH"));
displayTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordPart.displayTaxonomyH"));
prefixLengthLH.textProperty().bind(I18N.createStringBinding("label.wordPart.prefixLengthH"));
suffixLengthLH.textProperty().bind(I18N.createStringBinding("label.wordPart.suffixLengthH"));
prefixListLH.textProperty().bind(I18N.createStringBinding("label.wordPart.prefixListH"));
suffixListLH.textProperty().bind(I18N.createStringBinding("label.wordPart.suffixListH"));
msdLH.textProperty().bind(I18N.createStringBinding("label.wordPart.msdH"));
taxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordPart.taxonomyH"));
minimalOccurrencesLH.textProperty().bind(I18N.createStringBinding("label.wordPart.minimalOccurrencesH"));
minimalTaxonomyLH.textProperty().bind(I18N.createStringBinding("label.wordPart.minimalTaxonomyH"));
}
/**