|
|
|
@ -305,10 +305,16 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
// set
|
|
|
|
|
notePunctuationsChB.selectedProperty().addListener((observable, oldValue, newValue) -> {
|
|
|
|
|
notePunctuations = newValue;
|
|
|
|
|
if(skipValue > 0 || notePunctuations){
|
|
|
|
|
collocabilityCCB.setDisable(true);
|
|
|
|
|
} else {
|
|
|
|
|
collocabilityCCB.setDisable(false);
|
|
|
|
|
}
|
|
|
|
|
logger.info("note punctuations: ", notePunctuations);
|
|
|
|
|
});
|
|
|
|
|
notePunctuationsChB.setSelected(false);
|
|
|
|
|
notePunctuationsChB.setTooltip(new Tooltip(I18N.get("message.TOOLTIP_readNotePunctuationsChB")));
|
|
|
|
|
notePunctuationsChB.setDisable(false);
|
|
|
|
|
|
|
|
|
|
displayTaxonomy = false;
|
|
|
|
|
displayTaxonomyChB.setSelected(false);
|
|
|
|
@ -439,6 +445,13 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
checkedItems.add(Collocability.factory(el));
|
|
|
|
|
}
|
|
|
|
|
collocability.addAll(checkedItems);
|
|
|
|
|
if(collocability.size() > 0) {
|
|
|
|
|
notePunctuationsChB.setDisable(true);
|
|
|
|
|
skipValueCB.setDisable(true);
|
|
|
|
|
} else {
|
|
|
|
|
notePunctuationsChB.setDisable(false);
|
|
|
|
|
skipValueCB.setDisable(false);
|
|
|
|
|
}
|
|
|
|
|
logger.info(String.format("Selected collocabilities: %s", StringUtils.join(collocabilityCCB.getCheckModel().getCheckedItems(), ",")));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
@ -446,6 +459,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
collocabilityCCB.getCheckModel().clearChecks();
|
|
|
|
|
collocabilityCCB.getItems().removeAll();
|
|
|
|
|
collocabilityCCB.getItems().setAll(FXCollections.observableArrayList(COLLOCABILITY_ITEMS));
|
|
|
|
|
collocabilityCCB.setDisable(false);
|
|
|
|
|
|
|
|
|
|
collocabilityCCB.getCheckModel().getCheckedItems().addListener(collocabilityListener);
|
|
|
|
|
// collocabilityCCB.getCheckModel().getCheckedItems().addListener((ListChangeListener<String>) c -> {
|
|
|
|
@ -566,9 +580,15 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
// skip
|
|
|
|
|
skipValueCB.valueProperty().addListener((observable, oldValue, newValue) -> {
|
|
|
|
|
skipValue = Integer.valueOf(newValue);
|
|
|
|
|
if(skipValue > 0 || notePunctuations) {
|
|
|
|
|
collocabilityCCB.setDisable(true);
|
|
|
|
|
} else {
|
|
|
|
|
collocabilityCCB.setDisable(false);
|
|
|
|
|
}
|
|
|
|
|
logger.info("Skip " + skipValue);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
skipValueCB.setDisable(false);
|
|
|
|
|
skipValueCB.getSelectionModel().select(0);
|
|
|
|
|
skipValue = 0;
|
|
|
|
|
|
|
|
|
@ -973,7 +993,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
}
|
|
|
|
|
xml_processing.isCancelled = isCancelled();
|
|
|
|
|
updateProgress((iFinal * 100) + ((ReadOnlyDoubleWrapper) observable).get() + 1, corpusSize * 100);
|
|
|
|
|
updateMessage(String.format(I18N.get("message.ONGOING_NOTIFICATION_ANALYZING_FILE_X_OF_Y"), iFinal + 1, corpusSize, f.getName(), remainingSeconds));
|
|
|
|
|
updateMessage(String.format(I18N.get("message.ONGOING_NOTIFICATION_ANALYZING_FILE_X_OF_Y"), 1, 1, f.getName(), remainingSeconds));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -1037,7 +1057,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
ngramProgressBar.progressProperty().unbind();
|
|
|
|
|
ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
// ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
progressLabel.textProperty().unbind();
|
|
|
|
|
progressLabel.setText("");
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
@ -1048,7 +1068,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
logger.error("Error while executing", e);
|
|
|
|
|
ngramProgressBar.progressProperty().unbind();
|
|
|
|
|
ngramProgressBar.setProgress(0.0);
|
|
|
|
|
ngramProgressBar.setStyle(Settings.FX_ACCENT_NOK);
|
|
|
|
|
// ngramProgressBar.setStyle(Settings.FX_ACCENT_NOK);
|
|
|
|
|
progressLabel.textProperty().unbind();
|
|
|
|
|
progressLabel.setText("");
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
@ -1058,7 +1078,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
showAlert(Alert.AlertType.INFORMATION, I18N.get("message.NOTIFICATION_ANALYSIS_CANCELED"));
|
|
|
|
|
ngramProgressBar.progressProperty().unbind();
|
|
|
|
|
ngramProgressBar.setProgress(0.0);
|
|
|
|
|
ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
// ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
progressLabel.textProperty().unbind();
|
|
|
|
|
progressLabel.setText("");
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
@ -1135,7 +1155,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
}
|
|
|
|
|
xml_processing.isCancelled = isCancelled();
|
|
|
|
|
updateProgress((iFinal * 100) + ((ReadOnlyDoubleWrapper) observable).get() + 1, corpusSize * 100);
|
|
|
|
|
updateMessage(String.format(I18N.get("message.ONGOING_NOTIFICATION_ANALYZING_FILE_X_OF_Y"), iFinal + 1, corpusSize, f.getName(), remainingSeconds));
|
|
|
|
|
updateMessage(String.format(I18N.get("message.ONGOING_NOTIFICATION_ANALYZING_FILE_X_OF_Y"), 1, 1, f.getName(), remainingSeconds));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -1202,7 +1222,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
logger.error("Out of memory error", e1);
|
|
|
|
|
}
|
|
|
|
|
ngramProgressBar.progressProperty().unbind();
|
|
|
|
|
ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
// ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
progressLabel.textProperty().unbind();
|
|
|
|
|
progressLabel.setText("");
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
@ -1216,7 +1236,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
logger.error("Error while executing", e);
|
|
|
|
|
ngramProgressBar.progressProperty().unbind();
|
|
|
|
|
ngramProgressBar.setProgress(0.0);
|
|
|
|
|
ngramProgressBar.setStyle(Settings.FX_ACCENT_NOK);
|
|
|
|
|
// ngramProgressBar.setStyle(Settings.FX_ACCENT_NOK);
|
|
|
|
|
progressLabel.textProperty().unbind();
|
|
|
|
|
progressLabel.setText("");
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
@ -1226,7 +1246,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
showAlert(Alert.AlertType.INFORMATION, I18N.get("message.NOTIFICATION_ANALYSIS_CANCELED"));
|
|
|
|
|
ngramProgressBar.progressProperty().unbind();
|
|
|
|
|
ngramProgressBar.setProgress(0.0);
|
|
|
|
|
ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
// ngramProgressBar.setStyle(Settings.FX_ACCENT_OK);
|
|
|
|
|
progressLabel.textProperty().unbind();
|
|
|
|
|
progressLabel.setText("");
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
|