diff --git a/.idea/artifacts/SmartParking_jar.xml b/.idea/artifacts/SmartParking_jar.xml index e1bfbe4..d86025f 100644 --- a/.idea/artifacts/SmartParking_jar.xml +++ b/.idea/artifacts/SmartParking_jar.xml @@ -3,183 +3,10 @@ $PROJECT_DIR$/out/artifacts/SmartParking_jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/opencv_java341.dll b/opencv_java341.dll deleted file mode 100644 index ea58b83..0000000 Binary files a/opencv_java341.dll and /dev/null differ diff --git a/pom.xml b/pom.xml index d48bac4..769ee98 100644 --- a/pom.xml +++ b/pom.xml @@ -29,36 +29,16 @@ jfx-asynctask 1.0.1 - - - org.bytedeco - javacv-platform - 1.4.3 - - - org.hid4java - hid4java - 0.5.0 - - - - mysql - mysql-connector-java - 8.0.13 - - org.mongodb mongodb-driver-sync 3.11.0 - com.fazecast jSerialComm - [2.0.0,3.0.0) + [2.0.0, 3.0.0) - com.google.cloud google-cloud-vision diff --git a/release/installer/CH34x_Install_Windows_v3_4.zip b/release/installer/CH34x_Install_Windows_v3_4.zip deleted file mode 100644 index eede55e..0000000 Binary files a/release/installer/CH34x_Install_Windows_v3_4.zip and /dev/null differ diff --git a/src/main/java/main/Database.java b/src/main/java/main/Database.java index ed2c4f5..3c0ddba 100644 --- a/src/main/java/main/Database.java +++ b/src/main/java/main/Database.java @@ -1,7 +1,5 @@ package main; -import com.google.gson.Gson; -import com.mongodb.DBObject; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; @@ -62,13 +60,6 @@ public void insert2ActiveSessions(ParkingSession parkingSession) { } public Document createDocumentFromVehicle(ParkingSession parkingSession) { - -// Document document = new Document(); -// Gson gson = new Gson(); -// String json = gson.toJson(parkingSession); -// System.out.println(json); -// return null; -// this.activeParkingCollection.createIndex() return new Document(RFIDNUMBER, parkingSession.getRfidNumber()). append(PLATENUMBER, parkingSession.getPlateNumber()). append(TIMEIN, parkingSession.getTimeIn()). diff --git a/src/main/java/main/Domain/ParkingSession.java b/src/main/java/main/Domain/ParkingSession.java index aadc79a..20884ae 100644 --- a/src/main/java/main/Domain/ParkingSession.java +++ b/src/main/java/main/Domain/ParkingSession.java @@ -1,14 +1,10 @@ package main.Domain; -import com.google.gson.Gson; -import com.google.gson.annotations.Expose; import javafx.scene.image.Image; import main.ImageProcessor.EmotionalProcessing.EnumEmotion; import main.MainProgram; import org.bson.Document; -import org.bson.conversions.Bson; -import java.util.Arrays; import java.util.Date; public class ParkingSession { diff --git a/src/main/java/main/ImageProcessor/ImageTypeUtils.java b/src/main/java/main/ImageProcessor/ImageTypeUtils.java index f470974..f5d9c81 100644 --- a/src/main/java/main/ImageProcessor/ImageTypeUtils.java +++ b/src/main/java/main/ImageProcessor/ImageTypeUtils.java @@ -1,7 +1,6 @@ package main.ImageProcessor; import javafx.embed.swing.SwingFXUtils; -import javafx.embed.swt.SWTFXUtils; import javafx.scene.image.Image; import javax.imageio.ImageIO; diff --git a/src/main/java/main/ImageProcessor/PlateNumberProcessing/DataPacket.java b/src/main/java/main/ImageProcessor/PlateNumberProcessing/DataPacket.java index db4514c..8e24988 100644 --- a/src/main/java/main/ImageProcessor/PlateNumberProcessing/DataPacket.java +++ b/src/main/java/main/ImageProcessor/PlateNumberProcessing/DataPacket.java @@ -1,7 +1,6 @@ package main.ImageProcessor.PlateNumberProcessing; import com.google.gson.Gson; -import main.ImageProcessor.PlateNumberProcessing.ImageProcessing; import org.opencv.core.Mat; import org.opencv.imgcodecs.Imgcodecs; diff --git a/src/main/java/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.java b/src/main/java/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.java index adbb404..4152086 100644 --- a/src/main/java/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.java +++ b/src/main/java/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.java @@ -1,18 +1,7 @@ package main.ImageProcessor.PlateNumberProcessing; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; - -import javax.imageio.ImageIO; - import javafx.application.Platform; +import javafx.scene.image.Image; import javafx.scene.image.ImageView; import main.Constants; import org.opencv.core.*; @@ -22,10 +11,19 @@ import org.opencv.ml.Ml; import org.opencv.ml.SVM; import org.opencv.objdetect.HOGDescriptor; - -import javafx.scene.image.Image; import org.opencv.videoio.VideoCapture; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; + public class ImageProcessing { private static ImageProcessing instance; diff --git a/src/main/java/main/JavaFxGui/Controller/MainController.java b/src/main/java/main/JavaFxGui/Controller/MainController.java index d2fb761..826e882 100644 --- a/src/main/java/main/JavaFxGui/Controller/MainController.java +++ b/src/main/java/main/JavaFxGui/Controller/MainController.java @@ -1,11 +1,5 @@ package main.JavaFxGui.Controller; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.ResourceBundle; - import com.fazecast.jSerialComm.SerialPort; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXComboBox; @@ -19,11 +13,17 @@ import javafx.scene.control.SplitPane; import main.Constants; import main.Database; -import main.JavaFxGui.DatetimeUpdater; import main.ImageProcessor.PlateNumberProcessing.ImageProcessing; +import main.JavaFxGui.DatetimeUpdater; import main.MainProgram; import main.RfidProcessor.JSerial; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.ResourceBundle; + public class MainController implements Initializable { //region Properties @@ -169,8 +169,8 @@ public void closePort() { private void start() { Runnable RFIDrunner = () -> { - System.out.println(cancelled); - System.out.println(portStatus); +// System.out.println(cancelled); +// System.out.println(portStatus); while (!cancelled && portStatus) { String s = ""; try { diff --git a/src/main/java/main/JavaFxGui/Controller/TrackingController.java b/src/main/java/main/JavaFxGui/Controller/TrackingController.java index b6faada..a55d2d2 100644 --- a/src/main/java/main/JavaFxGui/Controller/TrackingController.java +++ b/src/main/java/main/JavaFxGui/Controller/TrackingController.java @@ -20,7 +20,6 @@ import javafx.stage.FileChooser; import javafx.stage.Stage; import main.Constants; -import main.Database; import main.Domain.ParkingSession; import main.Domain.SessionParkingServices; import main.ImageProcessor.EmotionalProcessing.EmotionDetector; @@ -29,11 +28,7 @@ import main.ImageProcessor.PlateNumberProcessing.ImageProcessing; import main.MainProgram; import main.RfidProcessor.RFIDHandler; -import org.opencv.core.Mat; -import org.opencv.imgcodecs.Imgcodecs; -import org.opencv.videoio.VideoCapture; -import javax.xml.crypto.Data; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/src/main/resources/MainForm.fxml b/src/main/resources/MainForm.fxml index ac82866..0a1ad9d 100644 --- a/src/main/resources/MainForm.fxml +++ b/src/main/resources/MainForm.fxml @@ -3,14 +3,9 @@ - - - - - - + + - diff --git a/src/main/resources/TrackingConfigForm.fxml b/src/main/resources/TrackingConfigForm.fxml index c9fae30..d533035 100644 --- a/src/main/resources/TrackingConfigForm.fxml +++ b/src/main/resources/TrackingConfigForm.fxml @@ -1,15 +1,9 @@ - - - - - - - - - - + + + + diff --git a/src/main/resources/TrackingForm.fxml b/src/main/resources/TrackingForm.fxml index 708605c..4d9e34f 100644 --- a/src/main/resources/TrackingForm.fxml +++ b/src/main/resources/TrackingForm.fxml @@ -1,19 +1,12 @@ - - + - - - - - - - - + + + - - + diff --git a/target/classes/MainForm.fxml b/target/classes/MainForm.fxml index ac82866..0a1ad9d 100644 --- a/target/classes/MainForm.fxml +++ b/target/classes/MainForm.fxml @@ -3,14 +3,9 @@ - - - - - - + + - diff --git a/target/classes/TrackingConfigForm.fxml b/target/classes/TrackingConfigForm.fxml index c9fae30..d533035 100644 --- a/target/classes/TrackingConfigForm.fxml +++ b/target/classes/TrackingConfigForm.fxml @@ -1,15 +1,9 @@ - - - - - - - - - - + + + + diff --git a/target/classes/TrackingForm.fxml b/target/classes/TrackingForm.fxml index fd6bfff..4d9e34f 100644 --- a/target/classes/TrackingForm.fxml +++ b/target/classes/TrackingForm.fxml @@ -1,19 +1,12 @@ - - + - - - - - - - - + + + - - + @@ -151,7 +144,7 @@ - + diff --git a/target/classes/main/Database.class b/target/classes/main/Database.class index fca2569..2f6e248 100644 Binary files a/target/classes/main/Database.class and b/target/classes/main/Database.class differ diff --git a/target/classes/main/Domain/ParkingSession.class b/target/classes/main/Domain/ParkingSession.class index 15d3966..1a064c6 100644 Binary files a/target/classes/main/Domain/ParkingSession.class and b/target/classes/main/Domain/ParkingSession.class differ diff --git a/target/classes/main/ImageProcessor/ImageTypeUtils.class b/target/classes/main/ImageProcessor/ImageTypeUtils.class index 1e425a1..a092aa8 100644 Binary files a/target/classes/main/ImageProcessor/ImageTypeUtils.class and b/target/classes/main/ImageProcessor/ImageTypeUtils.class differ diff --git a/target/classes/main/ImageProcessor/PlateNumberProcessing/CharacterBox.class b/target/classes/main/ImageProcessor/PlateNumberProcessing/CharacterBox.class index 005a25f..098c951 100644 Binary files a/target/classes/main/ImageProcessor/PlateNumberProcessing/CharacterBox.class and b/target/classes/main/ImageProcessor/PlateNumberProcessing/CharacterBox.class differ diff --git a/target/classes/main/ImageProcessor/PlateNumberProcessing/DataPacket.class b/target/classes/main/ImageProcessor/PlateNumberProcessing/DataPacket.class index 90bf9c8..916c752 100644 Binary files a/target/classes/main/ImageProcessor/PlateNumberProcessing/DataPacket.class and b/target/classes/main/ImageProcessor/PlateNumberProcessing/DataPacket.class differ diff --git a/target/classes/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.class b/target/classes/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.class index 602c370..144ae24 100644 Binary files a/target/classes/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.class and b/target/classes/main/ImageProcessor/PlateNumberProcessing/ImageProcessing.class differ diff --git a/target/classes/main/JavaFxGui/Controller/MainController.class b/target/classes/main/JavaFxGui/Controller/MainController.class index 6b846cb..861255a 100644 Binary files a/target/classes/main/JavaFxGui/Controller/MainController.class and b/target/classes/main/JavaFxGui/Controller/MainController.class differ diff --git a/target/classes/main/JavaFxGui/Controller/TrackingConfigController.class b/target/classes/main/JavaFxGui/Controller/TrackingConfigController.class index ca45f99..2e9f320 100644 Binary files a/target/classes/main/JavaFxGui/Controller/TrackingConfigController.class and b/target/classes/main/JavaFxGui/Controller/TrackingConfigController.class differ diff --git a/target/classes/main/JavaFxGui/Controller/TrackingController$1$1.class b/target/classes/main/JavaFxGui/Controller/TrackingController$1$1.class index b6acbfd..aefab1a 100644 Binary files a/target/classes/main/JavaFxGui/Controller/TrackingController$1$1.class and b/target/classes/main/JavaFxGui/Controller/TrackingController$1$1.class differ diff --git a/target/classes/main/JavaFxGui/Controller/TrackingController$1.class b/target/classes/main/JavaFxGui/Controller/TrackingController$1.class index d535880..750c387 100644 Binary files a/target/classes/main/JavaFxGui/Controller/TrackingController$1.class and b/target/classes/main/JavaFxGui/Controller/TrackingController$1.class differ diff --git a/target/classes/main/JavaFxGui/Controller/TrackingController.class b/target/classes/main/JavaFxGui/Controller/TrackingController.class index b24d274..634312b 100644 Binary files a/target/classes/main/JavaFxGui/Controller/TrackingController.class and b/target/classes/main/JavaFxGui/Controller/TrackingController.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..64351b7 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,21 @@ +D:\IT\IdeaProjects\SmartParking\src\main\java\main\ImageProcessor\PlateNumberProcessing\DataPacket.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\JavaFxGui\TrackingConfigure.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\Domain\ParkingSession.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\RfidProcessor\JSerialTest.java +D:\IT\IdeaProjects\SmartParking\src\main\java\Camera\CameraStreamer.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\RfidProcessor\RFIDHandler.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\Domain\SessionParkingServices.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\ImageProcessor\ImageTypeUtils.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\JavaFxGui\Controller\TrackingController.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\MainProgram.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\RfidProcessor\JSerial.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\JavaFxGui\DatetimeUpdater.java +D:\IT\IdeaProjects\SmartParking\src\main\java\com\JsonFileUtils.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\JavaFxGui\Controller\MainController.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\ImageProcessor\EmotionalProcessing\EnumEmotion.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\JavaFxGui\Controller\TrackingConfigController.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\Constants.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\ImageProcessor\PlateNumberProcessing\ImageProcessing.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\Database.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\ImageProcessor\EmotionalProcessing\EmotionDetector.java +D:\IT\IdeaProjects\SmartParking\src\main\java\main\CipherUtils.java diff --git a/test.jpg b/test.jpg deleted file mode 100644 index 9d148cb..0000000 Binary files a/test.jpg and /dev/null differ