diff --git a/src/classes/GenerateData.java b/src/classes/GenerateData.java deleted file mode 100644 index 9ca60d9..0000000 --- a/src/classes/GenerateData.java +++ /dev/null @@ -1,56 +0,0 @@ -package classes; - -import port.PortReader; - -import java.util.ArrayList; -import java.util.Random; - -public class GenerateData { - - private boolean stop=false; - Random generator = new Random(); - - private static volatile GenerateData GenerateINSTANCE; - - public boolean stopGenerating(){ - return stop=true; - - } - public static GenerateData getInstance() { - if (null == GenerateINSTANCE) { - synchronized (GenerateData.class) { - if (null == GenerateINSTANCE) { - GenerateINSTANCE = new GenerateData(); - } - } - } - return GenerateINSTANCE; - } - - private void generateData() throws InterruptedException { - ArrayList data=new ArrayList<>(); - data.clear(); - - for(int i=0; i<8;i++){ - data.add(generator.nextInt(100)); - } - Frame frame=new Frame(data); - PortReader.getInstance().getFrameBuffer().put(frame); - } - public void startGenerating(){ - Thread generateThread=new Thread(()->{ - - while(!stop) { - try { - generateData(); - wait(1000); - } - catch (Exception e) { - break; - } - } - }); - generateThread.start(); - - } -} diff --git a/src/mainwindow/Chart.java b/src/mainwindow/Chart.java index ab2ba28..80892db 100644 --- a/src/mainwindow/Chart.java +++ b/src/mainwindow/Chart.java @@ -1,17 +1,13 @@ package mainwindow; import classes.DateAxis; -import classes.GenerateData; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.chart.*; import javafx.scene.control.CheckBox; import javafx.scene.control.ChoiceBox; -import plot.Plot; import java.net.URL; -import java.util.Calendar; import java.util.Date; import java.util.ResourceBundle; @@ -73,10 +69,4 @@ public void initialize(URL location, ResourceBundle resources) { } - public void onGenerateData(ActionEvent actionEvent) { - //Do usuniecia - GenerateData.getInstance().startGenerating(); - Plot.getInstance().startPlotting(); - //Koniec - } } \ No newline at end of file diff --git a/src/mainwindow/chart.fxml b/src/mainwindow/chart.fxml index 1a605d7..a8775fa 100644 --- a/src/mainwindow/chart.fxml +++ b/src/mainwindow/chart.fxml @@ -58,7 +58,6 @@ -