noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added loading from dictionary.

Browse source
This commit is contained in:
maj83 2020-04-21 12:49:45 +01:00
parent 4c1eccb458
commit f537f3a25b
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MyController.java
View file

@ -1,6 +1,5 @@
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
@ -12,8 +11,9 @@ public class MyController implements Initializable {
private Random rand = new Random();
public LinkedList<DictionaryEntry> setOfQuestions=new LinkedList<>();
private ArrayList<Integer> temp1 = new ArrayList<>(Arrays.asList(0,1,2,3));
int corAns = 0;
int wrongAns = 0;
private int corAns = 0;
private int wrongAns = 0;
private boolean isDuplicate = false;
@FXML
private ComboBox<String> word1;
@ -77,28 +77,24 @@ public class MyController implements Initializable {
do{
int rand_q=rand.nextInt(dictionary.size()-1);
DictionaryEntry pickedQuestion = dictionary.get(rand_q);
if(setOfQuestions.size()>1){
for(int i=0;i<setOfQuestions.size();i++){
if(setOfQuestions.get(i).equals(pickedQuestion)){
if(setOfQuestions.size()>=1){
for (DictionaryEntry setOfQuestion : setOfQuestions) {
if (setOfQuestion.equals(pickedQuestion)) {
isDuplicate = true;
break;
}else {
setOfQuestions.add(pickedQuestion);
}
}
if(!isDuplicate){
setOfQuestions.add(pickedQuestion);
}
}else{
setOfQuestions.add(pickedQuestion);
}
isDuplicate =false;
}while(setOfQuestions.size()<5);
return setOfQuestions;
}
private void fill(){
setOfQuestions.add(new DictionaryEntry("abbey", "abaty", "nm"));
setOfQuestions.add(new DictionaryEntry("believe", "credu", "verb"));
setOfQuestions.add(new DictionaryEntry("concert", "cyngerdd", "nm"));
setOfQuestions.add(new DictionaryEntry("disease", "clefyd", "nm"));
}
public void checkAnswers(){
int w1 = Integer.parseInt(word1.getValue())-1;
@ -129,7 +125,7 @@ public class MyController implements Initializable {
@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
this.fill();
getQuestions(Main.dictionary);
TestLabel(setOfQuestions,temp1);
}
}