- updated help page

- removed input and output gates
- circuit generator uses toggles instead of input gates

Author: wojtekkw10

.idea/gradle.xml

@@ -1,14 +1,17 @@
 run:
-	gradle shadowjar
-	java -jar build/libs/LogicCircuitSimulator-all.jar
+	./gradlew run
+
+check:
+	./gradlew shadowjar
+	java -jar build/libs/LogicCircuitSimulator-all.jar Simulator.jar
 
 install:
-	gradle shadowjar
+	./gradlew shadowjar
 	cp build/libs/LogicCircuitSimulator-all.jar Simulator.jar
 	chmod +x Simulator.jar
 
 install_win:
-	gradle createExe
+	./gradlew createExe
 	cp build/launch4j/Simulator.exe Simulator.exe
 
 install_jlink:

Makefile

@@ -61,7 +61,7 @@ java {
 
 application {
     // Define the main class for the application.
-    mainClassName = 'LogicCircuitSimulator/LogicCircuitSimulator.Launcher'
+    mainClassName = 'LogicCircuitSimulator.Launcher'
 }
 
 javafx{
@@ -81,4 +81,4 @@ jlink {
     launcher {
         name = 'simulator'
     }
-}
+}

build.gradle

@@ -27,8 +27,6 @@ public void start(Stage stage) {
         primaryStage = stage;
         app = this;
 
-
-        //System.out.println(app.getClass());
         primaryStage.setTitle(stageTitle);
         stage.getIcons().add(new Image("file:resources/other/logo_grey.png"));
         loadAndSetNewScene("/FXML/StartMenu.fxml");

src/main/java/LogicCircuitSimulator/App.java

@@ -68,7 +68,7 @@ private void addInputs(NodeHandler nodeHandler, LogicElementHandler logicElement
             }
             alreadyShifted = false;
             connectIdentifiers(nodeHandler, output, inputs, shift);
-            logicElementHandler.add(new InputGate(-neededSpace-1, i, Rotation.RIGHT));
+            logicElementHandler.add(new ToggleOff(-neededSpace-1, i, Rotation.RIGHT));
         }
     }
 

src/main/java/LogicCircuitSimulator/BooleanExpressionParser/CircuitGenerator/SimpleCircuitGenerator.java

@@ -118,14 +118,6 @@ public void onOneButtonAction(ActionEvent actionEvent) {
         simulationController.setLogicGateDragged(new LogicOne(0,0, Rotation.RIGHT));
     }
 
-    public void onInButtonAction(ActionEvent actionEvent) {
-        simulationController.setLogicGateDragged(new InputGate(0,0, Rotation.RIGHT));
-    }
-
-    public void onOutButtonAction(ActionEvent actionEvent) {
-        simulationController.setLogicGateDragged(new OutputGate(0,0, Rotation.RIGHT));
-    }
-
     public void onFromBooleanExpressionAction(ActionEvent actionEvent) {
         Dialog<String> dialog = new Dialog<>();
         dialog.setResizable(true);

src/main/java/LogicCircuitSimulator/FxGUI/Board/BoardController.java

@@ -82,16 +82,6 @@ public void visit(ButtonLogicElement buttonLogicElement) {
         drawGate(buttonLogicElement, "BTN");
     }
 
-    @Override
-    public void visit(InputGate inputGate) {
-        drawGate(inputGate, "IN");
-    }
-
-    @Override
-    public void visit(OutputGate outputGate) {
-        drawGate(outputGate, "OUT");
-    }
-
     void drawGate(LogicElement le, String text){
         graphicsContext.setLineWidth(1);
         double scale = projection2D.getScale();

src/main/java/LogicCircuitSimulator/FxGUI/CircuitGrid/Drawing/DrawSquareLogicElementVisitor.java

@@ -22,7 +22,7 @@ public class BoardDTO {
     private final double MAX_ZOOM = 50;
     private final double MIN_ZOOM = 1;
 
-    private IntegerProperty TARGET_UPS = new SimpleIntegerProperty(25);
+    private IntegerProperty TARGET_UPS = new SimpleIntegerProperty(2);
     private final AtomicInteger updatesSinceLastFrame = new AtomicInteger();
 
     private final Canvas canvas;

src/main/java/LogicCircuitSimulator/FxGUI/CircuitGrid/FXMLController/BoardDTO.java

@@ -14,6 +14,4 @@ public interface LogicElementVisitor {
     void visit(ToggleOn toggleOn);
     void visit(ToggleOff toggleOff);
     void visit(ButtonLogicElement buttonLogicElement);
-    void visit(OutputGate outputGate);
-    void visit(InputGate inputGate);
 }