Skip to content
This repository has been archived by the owner on Nov 12, 2020. It is now read-only.

Commit

Permalink
Update release version 0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
hungthuanmk committed Sep 25, 2019
1 parent 8f86959 commit 26f28de
Show file tree
Hide file tree
Showing 31 changed files with 70 additions and 300 deletions.
181 changes: 4 additions & 177 deletions .idea/artifacts/SmartParking_jar.xml

Large diffs are not rendered by default.

Binary file removed opencv_java341.dll
Binary file not shown.
22 changes: 1 addition & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,16 @@
<artifactId>jfx-asynctask</artifactId>
<version>1.0.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bytedeco/javacpp -->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>javacv-platform</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.hid4java</groupId>
<artifactId>hid4java</artifactId>
<version>0.5.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.13</version>
</dependency>

<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>3.11.0</version>
</dependency>

<dependency>
<groupId>com.fazecast</groupId>
<artifactId>jSerialComm</artifactId>
<version>[2.0.0,3.0.0)</version>
<version>[2.0.0, 3.0.0)</version>
</dependency>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-vision</artifactId>
Expand Down
Binary file removed release/installer/CH34x_Install_Windows_v3_4.zip
Binary file not shown.
9 changes: 0 additions & 9 deletions src/main/java/main/Database.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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()).
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/main/Domain/ParkingSession.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/main/ImageProcessor/ImageTypeUtils.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/main/JavaFxGui/Controller/MainController.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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

Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
9 changes: 2 additions & 7 deletions src/main/resources/MainForm.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXComboBox?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>

<AnchorPane prefHeight="708.0" prefWidth="1142.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.JavaFxGui.Controller.MainController">
<children>
<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="425.0" prefWidth="456.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down
14 changes: 4 additions & 10 deletions src/main/resources/TrackingConfigForm.fxml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXComboBox?>
<?import com.jfoenix.controls.JFXSlider?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<?import com.jfoenix.controls.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane prefHeight="464.0" prefWidth="424.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.JavaFxGui.Controller.TrackingConfigController">
<children>
<VBox prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down
17 changes: 5 additions & 12 deletions src/main/resources/TrackingForm.fxml
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXTextField?>
<?import com.jfoenix.controls.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.Line?>
<?import javafx.scene.text.Font?>

<?import javafx.scene.text.*?>
<AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="924.0" prefWidth="846.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.JavaFxGui.Controller.TrackingController">
<children>
<VBox prefHeight="924.0" prefWidth="846.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down
9 changes: 2 additions & 7 deletions target/classes/MainForm.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXComboBox?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>

<AnchorPane prefHeight="708.0" prefWidth="1142.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.JavaFxGui.Controller.MainController">
<children>
<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="425.0" prefWidth="456.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down
14 changes: 4 additions & 10 deletions target/classes/TrackingConfigForm.fxml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXComboBox?>
<?import com.jfoenix.controls.JFXSlider?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<?import com.jfoenix.controls.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane prefHeight="464.0" prefWidth="424.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.JavaFxGui.Controller.TrackingConfigController">
<children>
<VBox prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down
19 changes: 6 additions & 13 deletions target/classes/TrackingForm.fxml
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXTextField?>
<?import com.jfoenix.controls.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.Line?>
<?import javafx.scene.text.Font?>

<?import javafx.scene.text.*?>
<AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="924.0" prefWidth="846.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.JavaFxGui.Controller.TrackingController">
<children>
<VBox prefHeight="924.0" prefWidth="846.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down Expand Up @@ -151,7 +144,7 @@
<buttons>
<JFXButton onAction="#onConfig" prefHeight="36.0" prefWidth="407.0" text="Config" />
<JFXButton onAction="#onTest" prefHeight="36.0" prefWidth="82.0" text="Open picture" />
<JFXButton onAction="#onTestAll" prefHeight="36.0" prefWidth="110.0" text="Start camera" />
<JFXButton onAction="#onStartCam" prefHeight="36.0" prefWidth="110.0" text="Start camera" />
<JFXButton fx:id="btn_cancel" disable="true" onAction="#cancelSession" text="Cancel" />
</buttons>
</ButtonBar>
Expand Down
Binary file modified target/classes/main/Database.class
Binary file not shown.
Binary file modified target/classes/main/Domain/ParkingSession.class
Binary file not shown.
Binary file modified target/classes/main/ImageProcessor/ImageTypeUtils.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified target/classes/main/JavaFxGui/Controller/MainController.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Binary file removed test.jpg
Binary file not shown.

0 comments on commit 26f28de

Please sign in to comment.