Merge branch 'develop' into 'master'

Develop See merge request !1

Merge branch 'develop' into 'master'
Develop See merge request !1
2f458987 · Commandre Benjamin · e899ce5c · f66dc771 · 2f458987 · 2f458987
Commit 2f458987 authored 6 years ago by Commandre Benjamin
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 190 additions and 1155 deletions
+190 -1155
--- a/.gitignore
+++ b/.gitignore
+*.pyc
+*.log*
--- a/Archive.py
+++ b/Archive.py
--- a/Constantes.py
+++ b/Constantes.py
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import logging
+
+NIVEAU_DEFAUT = logging.DEBUG
+
+SIMPLE_MODE = 0
+EXPERT_MODE = 1
+
+MULTIPROCESSING_ENABLE = True
+MULTIPROCESSING_DISABLE = False
+
+CLOUD_THRESHOLD = 0.4
+
+EPSG_PHYMOBAT = 2154
--- a/Documentation/API.html
+++ b/Documentation/API.html
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = Phymobat
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
--- a/Documentation/PHYMOBAT_documentation.html
+++ b/Documentation/PHYMOBAT_documentation.html
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Documentation de PHYMOBAT &#8212; documentation PHYMOBAT 3.0</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '3.0',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true,
-        SOURCELINK_SUFFIX: '.txt'
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <script type="text/javascript" src="_static/translations.js"></script>
-    <script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-    <link rel="index" title="Index" href="genindex.html" />
-    <link rel="search" title="Recherche" href="search.html" />
-    <link rel="next" title="Installation" href="install.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Index général"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="py-modindex.html" title="Index des modules Python"
-             >modules</a> |</li>
-        <li class="right" >
-          <a href="install.html" title="Installation"
-             accesskey="N">suivant</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">documentation PHYMOBAT 3.0</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="documentation-de-phymobat">
-<h1>Documentation de PHYMOBAT<a class="headerlink" href="#documentation-de-phymobat" title="Lien permanent vers ce titre">¶</a></h1>
-<p>Chaîne de traintement du Fond blanc PHYsionomique des Milieux Ouverts de Basse Altitude par Télédétection (PHYMOBAT).</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Outil compatible sur linux.</p>
-</div>
-<p>Contents:</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="install.html">Installation</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="install.html#installation-sig-open-source">Installation SIG open source</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#modules-python">Modules python</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="methode_tuto.html">Processus utilisées et tutoriels API</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="methode_tuto.html#processus-algorithmiques-utilisees">Processus algorithmiques utilisées</a></li>
-<li class="toctree-l2"><a class="reference internal" href="methode_tuto.html#tutoriels-interface">Tutoriels interface</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="package.html">CarHab Phy MOBA package</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="package.html#image-processing">Image processing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="package.html#vector-processing">Vector processing</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="API.html">Graphical User Interface package</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="API.html#module-PHYMOBAT">Interface command</a></li>
-<li class="toctree-l2"><a class="reference internal" href="API.html#module-Processing">Control processing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="API.html#module-ui_PHYMOBATs_tab">Interface element</a></li>
-<li class="toctree-l2"><a class="reference internal" href="API.html#module-ui_A_propos_PHYMOBAT_window">Popup about and warming</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<div class="section" id="indices-and-tables">
-<h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Lien permanent vers ce titre">¶</a></h1>
-<ul class="simple">
-<li><a class="reference internal" href="genindex.html"><span class="std std-ref">Index</span></a></li>
-<li><a class="reference internal" href="py-modindex.html"><span class="std std-ref">Index du module</span></a></li>
-<li><a class="reference internal" href="search.html"><span class="std std-ref">Page de recherche</span></a></li>
-</ul>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="#">Table des Matières</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Documentation de PHYMOBAT</a></li>
-<li><a class="reference internal" href="#indices-and-tables">Indices and tables</a></li>
-</ul>
-
-  <h4>Sujet suivant</h4>
-  <p class="topless"><a href="install.html"
-                        title="Chapitre suivant">Installation</a></p>
-  <div role="note" aria-label="source link">
-    <h3>Cette page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/PHYMOBAT_documentation.rst.txt"
-            rel="nofollow">Montrer le code source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Recherche rapide</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Index général"
-             >index</a></li>
-        <li class="right" >
-          <a href="py-modindex.html" title="Index des modules Python"
-             >modules</a> |</li>
-        <li class="right" >
-          <a href="install.html" title="Installation"
-             >suivant</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">documentation PHYMOBAT 3.0</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; Copyright 2017, LAVENTURE Sylvio (UMR TETIS/IRSTEA).
-      Créé avec <a href="http://sphinx-doc.org/">Sphinx</a> 1.5.3.
-    </div>
-  </body>
-</html>
\ No newline at end of file
--- a/Documentation/_build/doctrees/_sources/API.doctree
+++ b/Documentation/_build/doctrees/_sources/API.doctree
--- a/Documentation/_build/doctrees/_sources/install.doctree
+++ b/Documentation/_build/doctrees/_sources/install.doctree
--- a/Documentation/_build/doctrees/_sources/methode_tuto.doctree
+++ b/Documentation/_build/doctrees/_sources/methode_tuto.doctree
--- a/Documentation/_build/doctrees/_sources/package.doctree
+++ b/Documentation/_build/doctrees/_sources/package.doctree
--- a/Documentation/_build/doctrees/environment.pickle
+++ b/Documentation/_build/doctrees/environment.pickle
--- a/Documentation/_build/doctrees/index.doctree
+++ b/Documentation/_build/doctrees/index.doctree
--- a/Documentation/_build/latex/API.png
+++ b/Documentation/_build/latex/API.png
--- a/Documentation/_build/latex/API_0.png
+++ b/Documentation/_build/latex/API_0.png
--- a/Documentation/_build/latex/API_01.png
+++ b/Documentation/_build/latex/API_01.png
--- a/Documentation/_build/latex/API_20.png
+++ b/Documentation/_build/latex/API_20.png
--- a/Documentation/_build/latex/API_class.png
+++ b/Documentation/_build/latex/API_class.png
--- a/Documentation/_build/latex/API_class_10.png
+++ b/Documentation/_build/latex/API_class_10.png
--- a/Documentation/_build/latex/API_class_11.png
+++ b/Documentation/_build/latex/API_class_11.png
--- a/Documentation/_build/latex/API_class_12.png
+++ b/Documentation/_build/latex/API_class_12.png