Merge branch 'devel'

cdeldon · Nov 8, 2017 · ebc4291 · ebc4291
2 parents b3410bc + ceae60d
commit ebc4291
Show file tree

Hide file tree

Showing 67 changed files with 5,700 additions and 478 deletions.
diff --git a/.gitignore b/.gitignore
@@ -101,3 +101,13 @@ ENV/
 
 # mypy
 .mypy_cache/
+
+# Log directory
+logs/*
+!logs/.gitkeep
+
+# Resource directory
+resources/*
+!resources/.gitkeep
+resources/weights/*
+!resources/weights/.gitkeep
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+
 sudo: required
 language: python
 

diff --git a/gui/__init__.py b/gui/__init__.py
@@ -1 +1 @@
-from .dialogs import ThermoGUI
+from .dialogs import ThermoGUI, CreateDatasetGUI
diff --git a/gui/about/about_rich_text.html b/gui/about/about_rich_text.html
@@ -1,24 +1,24 @@
 <html>
 <body>
-    <img src="{logo_path}" alt="ThermoGUI logo">
-    <br/>
-    <h2>About ThermoGUI</h2>
-    <p>This application has been developed as a feasibility study<br/>
-        for automatic detection of damaged/not functional solar<br/>
-        panel modules at SUPSI - ISAAC in Canobbio, Lugano (CH).
-    </p>
-    <h2>Autor</h2>
-    <p>The project was implemented by the following authors<br/>
-        listed in temporal order:
-        <ul>
-          <li><i>Carlo Del Don</i> ([email protected])</li>
-        </ul>
-    </p>
+<img src="{logo_path}" alt="ThermoGUI logo">
+<br/>
+<h2>About ThermoGUI</h2>
+<p>This application has been developed as a feasibility study<br/>
+    for automatic detection of damaged/not functional solar<br/>
+    panel modules at SUPSI - ISAAC in Canobbio, Lugano (CH).
+</p>
+<h2>Autor</h2>
+<p>The project was implemented by the following authors<br/>
+    listed in temporal order:
+<ul>
+    <li><i>Carlo Del Don</i> ([email protected])</li>
+</ul>
+</p>
 
-    <br/>
+<br/>
 
-    <h4>
-        Logo created on <a href="https://logomakr.com">logomakr</a>.
-    </h4>
+<h4>
+    Logo created on <a href="https://logomakr.com">logomakr</a>.
+</h4>
 </body>
 </html>
diff --git a/gui/design/__init__.py b/gui/design/__init__.py
@@ -1,2 +1,4 @@
 from .thermo_gui_design import Ui_ThermoGUI_main_window
-from .webcam_dialog_design import Ui_WebCam
+from .create_dataset_gui import Ui_CreateDataset_main_window
+from .webcam_dialog_design import Ui_WebCam
+from .image_saving_gui import Ui_Save_images_dialog
diff --git a/gui/design/create_dataset_gui.py b/gui/design/create_dataset_gui.py