Commit 829857e5 authored by IT18109290_Fernando W.S.D's avatar IT18109290_Fernando W.S.D

Merge branch 'IT18109290_Dewmal' into 'master'

V1.22

See merge request !95
parents 174f40bd 58038887
...@@ -61,7 +61,7 @@ $('#submit-button').on("click", function () { ...@@ -61,7 +61,7 @@ $('#submit-button').on("click", function () {
title: 'Successfully Registered!', title: 'Successfully Registered!',
text: 'Please wait Criminals images are Training!', text: 'Please wait Criminals images are Training!',
html: 'Training will Complete with in <b><b> Minutes.', html: 'Training will Complete with in <b><b> Minutes.',
timer: 60000, timer: 30000,
showConfirmButton: false, showConfirmButton: false,
timerProgressBar: true, timerProgressBar: true,
allowOutsideClick: false, allowOutsideClick: false,
...@@ -84,7 +84,7 @@ $('#submit-button').on("click", function () { ...@@ -84,7 +84,7 @@ $('#submit-button').on("click", function () {
} }
}, setTimeout(function () { }, setTimeout(function () {
window.location.href = 'home.html'; window.location.href = 'home.html';
}, 60000)); }, 30000));
} }
}) })
......
...@@ -110,7 +110,7 @@ def weaponDetection(): ...@@ -110,7 +110,7 @@ def weaponDetection():
count += 1 count += 1
# Create and save in a CSV File # Create and save in a CSV File
type = "Abnormal Activity" type = "Stabbing Attack"
weapon = "The Knife was used as a weapon" weapon = "The Knife was used as a weapon"
with open('E:/BACKBONE/abnormal_behavior_detection/CSV/Abnormal Activity.csv', 'w', newline='') as file: with open('E:/BACKBONE/abnormal_behavior_detection/CSV/Abnormal Activity.csv', 'w', newline='') as file:
Num += 1 Num += 1
......
...@@ -523,4 +523,4 @@ def SaveFigureData(): ...@@ -523,4 +523,4 @@ def SaveFigureData():
""" End of the figure recognition function """ """ End of the figure recognition function """
if __name__ == "__main__": if __name__ == "__main__":
app.run(debug=True) app.run(debug=False)
...@@ -12,7 +12,7 @@ function createWindow() { ...@@ -12,7 +12,7 @@ function createWindow() {
mainWindow.maximize(); mainWindow.maximize();
mainWindow.loadFile(__dirname + '/UI/loading.html') mainWindow.loadFile(__dirname + '/UI/loading.html')
mainWindow.webContents.openDevTools() // mainWindow.webContents.openDevTools()
mainWindow.setAutoHideMenuBar(true) mainWindow.setAutoHideMenuBar(true)
// let menu = Menu.buildFromTemplate([{ // let menu = Menu.buildFromTemplate([{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment