Fix for #758 - template update

inasafe · Feb 15, 2014 · e29e021 · e29e021
1 parent 7ee5ff2
commit e29e021
Show file tree

Hide file tree

Showing 2 changed files with 193 additions and 193 deletions.
diff --git a/safe_qgis/resources/qgis-composer-templates/inasafe-portrait-a4.qpt b/safe_qgis/resources/qgis-composer-templates/inasafe-portrait-a4.qpt
@@ -1,25 +1,25 @@
 <Composer title="Composer 1" visible="1">
  <Composition printResolution="300" paperWidth="210" snapGridOffsetX="0" snapGridResolution="5" snapGridOffsetY="0" alignmentSnap="0" snapping="0" numPages="1" paperHeight="297" alignmentSnapTolerance="0" printAsRaster="0">
-  <ComposerPicture pictureWidth="11.5387" file="." pictureHeight="11.8732" mapId="-1">
-   <ComposerItem width="11.5387" x="187.797" transparency="40" y="26.9237" rotation="0" height="11.8732" positionMode="0" frame="false" outlineWidth="0.3" zValue="9" lastValidViewScaleFactor="5.97987" uuid="{2c35d3f6-2709-4b47-94a9-ec183f96dfc3}" id="" background="true" blendMode="0" positionLock="false" id="north-arrow">
+  <ComposerPicture pictureWidth="30" file="" pictureHeight="30" mapId="-1">
+   <ComposerItem width="30" x="167.744" transparency="0" y="29.8635" rotation="0" height="30" positionMode="0" frame="false" outlineWidth="0.3" zValue="10" lastValidViewScaleFactor="1.57383" uuid="{611437b9-124a-4c73-952b-f4271ca7d0e3}" id="north-arrow" background="false" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
-    <BackgroundColor alpha="170" red="255" blue="255" green="255"/>
+    <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
   </ComposerPicture>
-  <ComposerScaleBar penColor="#000000" style="Line Ticks Up" numMapUnitsPerScaleBarUnit="1000" alignment="2" brushColor="#000000" numSegments="3" segmentMillimeters="50.3168" fontColor="#000000" font="Cantarell,8,-1,5,50,0,0,0,0,0" numUnitsPerSegment="1000" units="1" labelBarSpace="1" outlineWidth="0.26" numSegmentsLeft="0" height="1" mapId="0" boxContentSpace="1" unitLabel="km">
-   <ComposerItem width="159.652" x="40.9742" transparency="0" y="206.908" rotation="0" height="7" positionMode="0" frame="false" outlineWidth="0.3" zValue="8" lastValidViewScaleFactor="5.97987" uuid="{dd3b4156-1745-4219-a682-b51df1cad1f0}" id="" background="true" blendMode="0" positionLock="false">
-    <FrameColor alpha="255" red="0" blue="0" green="0"/>
-    <BackgroundColor alpha="170" red="255" blue="255" green="255"/>
-   </ComposerItem>
-  </ComposerScaleBar>
-  <ComposerPicture pictureWidth="74.8288" file="." pictureHeight="9.31066" mapId="-1">
-   <ComposerItem width="74.8288" x="128.639" transparency="0" y="283.918" rotation="0" height="9.31066" positionMode="0" frame="false" outlineWidth="0.3" zValue="8" lastValidViewScaleFactor="5.25503" uuid="{90f4a132-322f-44c1-8004-d0bb966ce930}" id="organisation-logo" background="true" blendMode="0" positionLock="false">
+  <ComposerPicture pictureWidth="41.4422" file="." pictureHeight="18.1029" mapId="-1">
+   <ComposerItem width="41.4422" x="162.026" transparency="0" y="275.126" rotation="0" height="18.1029" positionMode="0" frame="false" outlineWidth="0.3" zValue="8" lastValidViewScaleFactor="1.57383" uuid="{261cb182-ee27-4287-a1e5-19e40e56a262}" id="organisation-logo" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
   </ComposerPicture>
+  <ComposerScaleBar penColor="#000000" style="Line Ticks Up" numMapUnitsPerScaleBarUnit="1000" alignment="2" brushColor="#000000" numSegments="3" segmentMillimeters="50.5239" fontColor="#000000" font="Cantarell,8,-1,5,50,0,0,0,0,0" numUnitsPerSegment="1000" units="1" labelBarSpace="1" outlineWidth="0.26" numSegmentsLeft="0" height="1" mapId="0" boxContentSpace="1" unitLabel="km">
+   <ComposerItem width="160.292" x="40.9742" transparency="0" y="206.908" rotation="0" height="6.8" positionMode="0" frame="false" outlineWidth="0.3" zValue="8" lastValidViewScaleFactor="5.97987" uuid="{f27fff45-f448-4b7e-8dfa-f0d4833beb61}" id="" background="true" blendMode="0" positionLock="false">
+    <FrameColor alpha="255" red="0" blue="0" green="0"/>
+    <BackgroundColor alpha="170" red="255" blue="255" green="255"/>
+   </ComposerItem>
+  </ComposerScaleBar>
   <ComposerPicture pictureWidth="34.8062" file="/data/samples/inasafe/InaSAFEPackages/Jakarta" pictureHeight="15.0048" mapId="-1">
-   <ComposerItem width="34.8062" x="4.99524" transparency="0" y="4.99524" rotation="0" height="15.0048" positionMode="0" frame="false" outlineWidth="0" zValue="7" lastValidViewScaleFactor="5.25503" uuid="{05dbb19d-730e-4c80-b56f-1d84371a1720}" id="safe-logo" background="true" blendMode="0" positionLock="false">
+   <ComposerItem width="34.8062" x="4.99524" transparency="0" y="4.99524" rotation="0" height="15.0048" positionMode="0" frame="false" outlineWidth="0" zValue="7" lastValidViewScaleFactor="5.25503" uuid="{d4de88b0-7b95-477c-a46f-dd2eb095d3c1}" id="safe-logo" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
@@ -39,7 +39,7 @@
      </layer>
     </symbol>
    </overviewFrame>
-   <Extent ymin="-6.19298" xmin="106.796" ymax="-6.15886" xmax="106.831"/>
+   <Extent ymin="-6.19298" xmin="106.796" ymax="-6.159" xmax="106.831"/>
    <LayerSet/>
    <Grid gridStyle="1" crossLength="3" intervalX="0" offsetX="0" intervalY="0" offsetY="0" gridFrameStyle="0" gridFrameWidth="2" gridBlendMode="0" show="1">
     <symbol alpha="1" type="line" name="">
@@ -61,31 +61,31 @@
      <fontColor red="0" blue="0" green="0"/>
     </Annotation>
    </Grid>
-   <ComposerItem width="195.709" x="6.29137" transparency="0" y="25" rotation="0" height="190" positionMode="0" frame="true" outlineWidth="0" zValue="6" lastValidViewScaleFactor="5.97987" uuid="{da7e0988-2ed9-48a7-b287-059375ae3fd7}" id="impact-map" background="true" blendMode="0" positionLock="false">
+   <ComposerItem width="195.709" x="6.92676" transparency="0" y="26.9062" rotation="0" height="190" positionMode="0" frame="true" outlineWidth="0" zValue="6" lastValidViewScaleFactor="1.57383" uuid="{01017980-b3e4-497a-b7a3-1cb5b5891b74}" id="impact-map" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
   </ComposerMap>
   <ComposerLabel valign="32" labelText="[impact-title]" htmlState="0" halign="1" margin="1">
    <LabelFont description="Droid Sans,20,-1,5,75,0,0,0,0,0"/>
    <FontColor red="0" blue="0" green="0"/>
-   <ComposerItem width="154.126" x="45.4919" transparency="0" y="5.14867" rotation="0" height="16.7351" positionMode="0" frame="false" outlineWidth="0" zValue="4" lastValidViewScaleFactor="3.56376" uuid="{2cb43ea2-0788-48e7-a633-57d958521541}" id="impact-title" background="true" blendMode="0" positionLock="false">
+   <ComposerItem width="154.126" x="45.4919" transparency="0" y="5.14867" rotation="0" height="16.7351" positionMode="0" frame="false" outlineWidth="0" zValue="4" lastValidViewScaleFactor="3.56376" uuid="{1346df60-cbdd-4e68-b5e3-2a7a4466e39d}" id="impact-title" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
   </ComposerLabel>
-  <ComposerLabel valign="128" labelText="[disclaimer]" htmlState="0" halign="1" margin="1">
+  <ComposerLabel valign="128" labelText="&lt;div style=&quot;font-size: 8pt;&quot;>&#xa;&lt;strong>&#xa;&lt;i>[disclaimer]&lt;/i>&#xa;&lt;/div>" htmlState="2" halign="1" margin="1">
    <LabelFont description="Droid Sans,10,-1,5,50,2,0,0,0,0"/>
    <FontColor red="0" blue="0" green="0"/>
-   <ComposerItem width="124.642" x="3.61558" transparency="0" y="282.777" rotation="0" height="11.2235" positionMode="0" frame="false" outlineWidth="0" zValue="3" lastValidViewScaleFactor="5.97987" uuid="{77e1bc8a-6287-4f20-924a-8408b0f1d0c4}" id="" background="true" blendMode="0" positionLock="false">
+   <ComposerItem width="150.15" x="3.61558" transparency="0" y="275.126" rotation="0" height="18.8747" positionMode="0" frame="false" outlineWidth="0" zValue="3" lastValidViewScaleFactor="1.57383" uuid="{292af52a-44f5-4ca3-996f-0a276b2e2f8c}" id="" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
   </ComposerLabel>
   <ComposerLabel valign="32" labelText="&lt;div style=&quot;font-size: 8pt;&quot;>&#xa;&lt;strong>Time stamp:&lt;/strong> &lt;br/>[date] [time]&lt;br/>&lt;/br/>&#xa;&lt;strong>Note:&lt;/strong> This assessment is a guide - we strongly recommend that you ground truth the results shown here before deploying resources and / or personnel.&lt;br/>&lt;br/>&#xa;&lt;i>Assessment carried out using InaSAFE release [safe-version] (QGIS plugin version).&lt;/i>&#xa;&lt;/div>" htmlState="2" halign="1" margin="1">
    <LabelFont description="Droid Sans,6,-1,5,50,2,0,0,0,0"/>
    <FontColor red="0" blue="0" green="0"/>
-   <ComposerItem width="38.4393" x="161.369" transparency="0" y="224.125" rotation="0" height="60.7037" positionMode="0" frame="false" outlineWidth="0" zValue="2" lastValidViewScaleFactor="5.97987" uuid="{7ebc5339-c596-4fb3-98d1-9c2bdf5f07c7}" id="" background="true" blendMode="0" positionLock="false">
+   <ComposerItem width="38.4393" x="161.369" transparency="0" y="224.125" rotation="0" height="60.7037" positionMode="0" frame="false" outlineWidth="0" zValue="2" lastValidViewScaleFactor="1.57383" uuid="{72354793-dad7-4f3e-8f94-7895f8f0ab7d}" id="" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>
@@ -218,7 +218,7 @@
      </VectorClassificationItemNg>
     </LayerItem>
    </Model>
-   <ComposerItem width="151.313" x="4.20904" transparency="0" y="223.166" rotation="0" height="50.0876" positionMode="0" frame="false" outlineWidth="0" zValue="1" lastValidViewScaleFactor="5.97987" uuid="{6059b7b8-9686-4d05-b5b4-c117ddff12c8}" id="impact-legend" background="true" blendMode="0" positionLock="false">
+   <ComposerItem width="62.8" x="4.20904" transparency="0" y="223.166" rotation="0" height="35.6" positionMode="0" frame="false" outlineWidth="0" zValue="1" lastValidViewScaleFactor="1.57383" uuid="{76bd53e0-c3a2-4f2d-9e08-dd52dd96d26b}" id="impact-legend" background="true" blendMode="0" positionLock="false">
     <FrameColor alpha="255" red="0" blue="0" green="0"/>
     <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    </ComposerItem>