1.8 Ecarts & medianes dans INTER

.gitignore

@@ -39,12 +39,14 @@ data Pulve*/
 data Salleboeuf*/
 data Cap*/
 data JH*/
+data_IFV*/
 data/UnProjetPhysiocap*/*
 data/Contour*
 data/PHY_*
 data/*OK
 data/*erreur
 data/test*
+data/CONSO*
 data/TEST*
 data/Exempl*
 data/Doc*

metadata.txt

@@ -1,6 +1,7 @@
 # This file contains metadata for your plugin. 
 
-# This file should be included when you package your plugin.# Mandatory items:
+# This file should be included when you package your plugin.
+# Mandatory items:
 
 [general]
 name=Physiocap
@@ -46,7 +47,7 @@ email=jean@jhemmi.eu
    1.4.0 TIPS : TIPS dans les écrans, Intra pour l'ensemble des indicateurs Physiocap, avrtissement GPS et Intra, corrections de la traduction EN
    1.7.0 CONSOLIDATION : qui permet de modifier des shapefiles de diamètres (données filtrés) ou avec 0 pour les fusionner dans une CONSOLIDATION pour être pris en compte dans Inter et Intra , prise en compte des shapefiles issus de V8, l'amélioration des choix d'affichage, le nommage des thématiques, le nouveau mode de calcul du nombre des isolignes, le choix du répertoire de données cibles, la version Italienne Beta
    1.8.0 Ecart : ajout des ecarts-type dans les moyennes Inter. Correction Traduction Italienne.
-   1.8.1 Mediane : ajout des mediane dans les moyennes Inter.
+   1.8.1 Mediane : ajout des medianes dans les moyennes Inter.
 
 #x.0 LTR : Traduction des TIPS en anglais 
 

modeleQgis/Moyenne Inter.qml

@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="2.8.1-Wien" minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
+<qgis version="2.8.1-Wien" minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
   <edittypes>
     <edittype widgetv2type="TextEdit" name="GID">
       <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
@@ -16,6 +16,9 @@
     <edittype widgetv2type="TextEdit" name="FIN">
       <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
     </edittype>
+    <edittype widgetv2type="TextEdit" name="NOMBRE">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
     <edittype widgetv2type="TextEdit" name="VITESSE">
       <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
     </edittype>
@@ -28,6 +31,75 @@
     <edittype widgetv2type="TextEdit" name="BIOM">
       <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
     </edittype>
+    <edittype widgetv2type="TextEdit" name="BIOMGM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="BIOMGCEP">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="BIOMM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="NBSARMM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="NBSARCEP">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_VITESSE">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_NBSARM">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_DIAM">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_BIOM">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_BIOMGM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_BIOMGCEP">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_BIOMM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_NBSARMM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="E_NBSARCEP">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_VITESSE">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_NBSARM">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_DIAM">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_BIOM">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_BIOMGM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_BIOMGCEP">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_BIOMM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_NBSARMM2">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
+    <edittype widgetv2type="TextEdit" name="M_NBSARCEP">
+      <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
+    </edittype>
   </edittypes>
   <renderer-v2 symbollevels="0" type="singleSymbol">
     <symbols>
@@ -68,16 +140,16 @@
     <property key="labeling/bufferSizeMapUnitMaxScale" value="0"/>
     <property key="labeling/bufferSizeMapUnitMinScale" value="0"/>
     <property key="labeling/bufferTransp" value="0"/>
-    <property key="labeling/centroidInside" value="false"/>
+    <property key="labeling/centroidInside" value="true"/>
     <property key="labeling/centroidWhole" value="false"/>
     <property key="labeling/decimals" value="3"/>
     <property key="labeling/displayAll" value="false"/>
-    <property key="labeling/dist" value="0"/>
+    <property key="labeling/dist" value="5"/>
     <property key="labeling/distInMapUnits" value="false"/>
     <property key="labeling/distMapUnitMaxScale" value="0"/>
     <property key="labeling/distMapUnitMinScale" value="0"/>
     <property key="labeling/enabled" value="true"/>
-    <property key="labeling/fieldName" value="  concat(   &#xa;  &quot;NOM_PHY&quot; , ' Vit: ', &quot;VITESSE&quot; , ' km/h', &#xa;  '~', left(&quot;DEBUT&quot;,16), ' -- ', left( &quot;FIN&quot;,5),  &#xa;  '~Sar/m : ', format_number(&quot;NBSARM&quot;, 2) , &#xa;  ' Diam : ', format_number(&quot;DIAM&quot;, 2), &#xa;  ' Biom ', format_number(&quot;BIOM&quot;,0)&#xa;  )"/>
+    <property key="labeling/fieldName" value="  concat(   &#xa;  ' Ilot : ', &quot;NOM_PHY&quot; , &#xa;  '~ Sarment/m moyen : ', format_number(&quot;NBSARM&quot;, 2) , &#xa;  ' Section moyenne : ', format_number(&quot;DIAM&quot;, 2), &#xa;  '~ Biomasse en g par m2 == ',&#xa;  '~ Moyenne : ' , format_number(&quot;BIOMGM2&quot;,0),&#xa; ' Médiane : ' , format_number(&quot;M_BIOMGM2&quot;,0),&#xa; ' Ecartype : ' , format_number(&quot;E_BIOMGM2&quot;,0)&#xa;  )"/>
     <property key="labeling/fontBold" value="false"/>
     <property key="labeling/fontCapitals" value="0"/>
     <property key="labeling/fontFamily" value="Cantarell"/>