Hochschulprojekte
/
CSPARQL-Carsimulation
0
0
Fork 0
Code Issues Pull Requests Activity

[TASK] Remove autoscroll checkbox.

This commit is contained in:
Jan Philipp Timme 2016-10-09 18:26:45 +02:00
parent 1a3598920f
commit 8939a75ff2
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/lu/jpt/csparqlproject/gui/FancyTextObserverWindow.java
View File

@ -208,7 +208,8 @@ public class FancyTextObserverWindow extends JFrame implements Observer {
textObserverWindow.setAutoScrollToBottom(checkBox.isSelected()); textObserverWindow.setAutoScrollToBottom(checkBox.isSelected());
} }
}); });
bottomPanel.add(autoscrollCheckbox); // TODO: Fix the feature first!
//bottomPanel.add(autoscrollCheckbox);
// Add a checkbox to toggle uri shortening using PrefixManager // Add a checkbox to toggle uri shortening using PrefixManager
JCheckBox usePrefixManagerCheckbox = new JCheckBox(); JCheckBox usePrefixManagerCheckbox = new JCheckBox();

15
src/main/java/lu/jpt/csparqlproject/rentacar/Car.java
View File

@ -235,20 +235,29 @@ public class Car {
if(this.isCurrentActionHard && this.currentActionTicksLeft == 3) rpmBonus = 200; if(this.isCurrentActionHard && this.currentActionTicksLeft == 3) rpmBonus = 200;
this.motorRpm += RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus); this.motorRpm += RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus);
this.speed += RandomHelper.getRandomNumberWithin(5, 20); this.speed += RandomHelper.getRandomNumberWithin(5, 20);
if(this.isCurrentActionHard) this.speed += 30; if(this.isCurrentActionHard) {
this.speed += 40;
this.motorRpm += RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus);
}
break; break;
case BRAKING: case BRAKING:
if(this.isCurrentActionHard && this.currentActionTicksLeft == 3) rpmBonus = 200; if(this.isCurrentActionHard && this.currentActionTicksLeft == 3) rpmBonus = 200;
this.motorRpm -= RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus); this.motorRpm -= RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus);
this.speed -= RandomHelper.getRandomNumberWithin(5, 20); this.speed -= RandomHelper.getRandomNumberWithin(5, 20);
if(this.isCurrentActionHard) this.speed -= 30; if(this.isCurrentActionHard) {
this.speed -= 40;
this.motorRpm -= RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus);
}
if(this.speed < 0) this.speed = 0; if(this.speed < 0) this.speed = 0;
if(this.motorRpm < 0) this.motorRpm = Car.MIN_RPM[this.CAR_TYPE]; if(this.motorRpm < 0) this.motorRpm = Car.MIN_RPM[this.CAR_TYPE];
break; break;
case HALTING: case HALTING:
this.motorRpm -= RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus); this.motorRpm -= RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus);
this.speed -= RandomHelper.getRandomNumberWithin(5, 20); this.speed -= RandomHelper.getRandomNumberWithin(5, 20);
if(this.isCurrentActionHard) this.speed -= 30; if(this.isCurrentActionHard) {
this.speed -= 40;
this.motorRpm -= RandomHelper.getRandomNumberWithin(100, 350 + rpmBonus);
}
if(this.speed < 0) this.speed = 0; if(this.speed < 0) this.speed = 0;
if(this.motorRpm < 0) this.motorRpm = Car.MIN_RPM[this.CAR_TYPE]; if(this.motorRpm < 0) this.motorRpm = Car.MIN_RPM[this.CAR_TYPE];
// Halt on last tick of halting action // Halt on last tick of halting action

9
src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
View File

@ -505,11 +505,10 @@ public class RentACarSimulation implements Runnable {
+ "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> " + "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> "
+ "PREFIX car: <"+RentACarSimulation.BASE_ONTOLOGY_IRI+"> " + "PREFIX car: <"+RentACarSimulation.BASE_ONTOLOGY_IRI+"> "
+ "SELECT ?e ?car ?types " + "SELECT ?e ?car ?types "
+ "FROM STREAM <"+RentACarSimulation.CAR_STREAM_IRI+"> [RANGE 3s STEP 1s] " + "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getEngineWear> [RANGE 5s STEP 1s] "
+ "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getEngineWear> [RANGE 3s STEP 1s] " + "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getBrakeWear> [RANGE 5s STEP 1s] "
+ "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getBrakeWear> [RANGE 3s STEP 1s] " + "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getHandbrakeWear> [RANGE 5s STEP 1s] "
+ "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getHandbrakeWear> [RANGE 3s STEP 1s] " + "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getTireWear> [RANGE 5s STEP 1s] "
+ "FROM STREAM <"+RentACarSimulation.BASE_STREAM_IRI+"/getTireWear> [RANGE 3s STEP 1s] "
+ "WHERE { " + "WHERE { "
+ " ?e rdf:type car:CarWearEvent . " + " ?e rdf:type car:CarWearEvent . "
+ " ?e rdf:type ?types . " + " ?e rdf:type ?types . "