Git commit 53993f72e8f869f0e0f54025b35bd2f0ae16caa8 by Gilles Caulier.
Committed on 24/08/2016 at 09:14.
Pushed by cgilles into branch 'master'.

Camera section review

R  +-    --    digikam/using-camera-download.png [from: 
digikam/cameraclientdownload.png - 100% similarity]
R  +-    --    digikam/using-camera-folderselectiondialog.png [from: 
digikam/camerafolderselectiondialog.png - 100% similarity]
R  +-    --    digikam/using-camera-handheldgps.png [from: 
digikam/handheld_gps.png - 100% similarity]
R  +-    --    digikam/using-camera-identity.png [from: 
digikam/cameraclientidentity.png - 100% similarity]
R  +-    --    digikam/using-camera-itemproperties.png [from: 
digikam/cameraclientitemproperties.png - 100% similarity]
R  +-    --    digikam/using-camera-maininterface.png [from: 
digikam/cameraclient.png - 100% similarity]
R  +-    --    digikam/using-camera-setting1.png [from: 
digikam/cameraclientsetting1.png - 100% similarity]
R  +-    --    digikam/using-camera-setting2.png [from: 
digikam/cameraclientsetting2.png - 100% similarity]
R  +-    --    digikam/using-camera-setting3.png [from: 
digikam/cameraclientsetting3.png - 100% similarity]
R  +-    --    digikam/using-camera-targetalbumdialog.png [from: 
digikam/cameratargetalbumdialog.png - 100% similarity]
M  +37   -14   digikam/using-camera.docbook

http://commits.kde.org/digikam-doc/53993f72e8f869f0e0f54025b35bd2f0ae16caa8

diff --git a/digikam/cameraclientdownload.png 
b/digikam/using-camera-download.png
similarity index 100%
rename from digikam/cameraclientdownload.png
rename to digikam/using-camera-download.png
diff --git a/digikam/camerafolderselectiondialog.png 
b/digikam/using-camera-folderselectiondialog.png
similarity index 100%
rename from digikam/camerafolderselectiondialog.png
rename to digikam/using-camera-folderselectiondialog.png
diff --git a/digikam/handheld_gps.png b/digikam/using-camera-handheldgps.png
similarity index 100%
rename from digikam/handheld_gps.png
rename to digikam/using-camera-handheldgps.png
diff --git a/digikam/cameraclientidentity.png 
b/digikam/using-camera-identity.png
similarity index 100%
rename from digikam/cameraclientidentity.png
rename to digikam/using-camera-identity.png
diff --git a/digikam/cameraclientitemproperties.png 
b/digikam/using-camera-itemproperties.png
similarity index 100%
rename from digikam/cameraclientitemproperties.png
rename to digikam/using-camera-itemproperties.png
diff --git a/digikam/cameraclient.png b/digikam/using-camera-maininterface.png
similarity index 100%
rename from digikam/cameraclient.png
rename to digikam/using-camera-maininterface.png
diff --git a/digikam/cameraclientsetting1.png 
b/digikam/using-camera-setting1.png
similarity index 100%
rename from digikam/cameraclientsetting1.png
rename to digikam/using-camera-setting1.png
diff --git a/digikam/cameraclientsetting2.png 
b/digikam/using-camera-setting2.png
similarity index 100%
rename from digikam/cameraclientsetting2.png
rename to digikam/using-camera-setting2.png
diff --git a/digikam/cameraclientsetting3.png 
b/digikam/using-camera-setting3.png
similarity index 100%
rename from digikam/cameraclientsetting3.png
rename to digikam/using-camera-setting3.png
diff --git a/digikam/cameratargetalbumdialog.png 
b/digikam/using-camera-targetalbumdialog.png
similarity index 100%
rename from digikam/cameratargetalbumdialog.png
rename to digikam/using-camera-targetalbumdialog.png
diff --git a/digikam/using-camera.docbook b/digikam/using-camera.docbook
index f0490c0..7536bd7 100644
--- a/digikam/using-camera.docbook
+++ b/digikam/using-camera.docbook
@@ -1,7 +1,7 @@
-<sect1 id="using-camera">             <title>Using a Digital Camera With 
&digikam;</title>
-<anchor id="camerainterface.anchor"/>
+<sect1 id="using-camera"> <title>Using a Digital Camera With &digikam;</title>
+    <anchor id="camerainterface.anchor"/>
 
-    <sect2>        <title>Introduction to Camera Interface</title>
+    <sect2> <title>Introduction to Camera Interface</title>
 
         <para>
         The Camera Tool allows you to download your photographs directly from 
your camera into a &digikam; Album. You can access the Camera Tool by clicking 
on the Camera menu and selecting from the list of configured cameras. See the 
<link linkend="setup-camera">Setup Camera Section</link> of the manual for 
instructions on how to setup &digikam; to work with your camera. If you want to 
have more information about how &digikam; supports digital cameras, please a 
take a look at <link linkend="intro-camerasupport">this section</link>.
@@ -20,7 +20,7 @@
         </para>
 
         <example>   <title>The Camera Client Window</title>
-            <screenshot><screeninfo>The Camera Client Window</screeninfo> 
<mediaobject><imageobject><imagedata fileref="&path;cameraclient.png" 
format="PNG" /> </imageobject></mediaobject></screenshot>
+            <screenshot><screeninfo>The Camera Client Window</screeninfo> 
<mediaobject><imageobject><imagedata 
fileref="&path;using-camera-maininterface.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
         </example>
 
     </sect2>
@@ -34,7 +34,7 @@
         </para>
 
         <example>  <title>The Camera Item Properties Sidebar Tab</title>
-            <screenshot><screeninfo>The camera item properties sidebar 
Tab</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;cameraclientitemproperties.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+            <screenshot><screeninfo>The camera item properties sidebar 
Tab</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-camera-itemproperties.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
         </example>
 
         <para>
@@ -73,7 +73,7 @@
         </para>
 
         <example>   <title>The Target Album Selection Dialog</title>
-            <screenshot><screeninfo>The Target Album Selection 
Dialog</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;cameratargetalbumdialog.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+            <screenshot><screeninfo>The Target Album Selection 
Dialog</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-camera-targetalbumdialog.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
         </example>
 
         <para>
@@ -85,7 +85,7 @@
         </para>
 
         <para>
-            <inlinemediaobject><imageobject><imagedata 
fileref="&path;cameraclientdownload.png" format="PNG" /> 
</imageobject><textobject><phrase>The Downloading in 
Progress</phrase></textobject></inlinemediaobject>
+            <inlinemediaobject><imageobject><imagedata 
fileref="&path;using-camera-download.png" format="PNG" /> 
</imageobject><textobject><phrase>The Downloading in 
Progress</phrase></textobject></inlinemediaobject>
         </para>
 
     </sect2>
@@ -118,23 +118,29 @@
         </para>
 
         <example> <title>Files Renaming Options</title>
-            <screenshot><screeninfo>Files Renaming 
Options</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;cameraclientsetting1.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+            <screenshot><screeninfo>Files Renaming 
Options</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-camera-setting1.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
         </example>
 
         <para>
         &digikam; can automatically rename your photographs using the date and 
time information included by the camera in the photograph. To use this feature, 
click the <guilabel>Settings</guilabel> button on the Camera Interface. The 
Camera Interface window will expand to reveal some extra features. Select 
<guilabel>Customize</guilabel> and then enter any filename prefix you would 
like. As an option you can add many information independently or by combination 
including : date, time, original file name, file extension, directory, owner, 
group, camera name, a sequence number or any other metadata from the photograph.
         </para>
+        
     <para>
+        
     </para>
+    
         <para>
             In the next box you find the options for rotating/flipping the 
image and for date based subalbums. If you check the latter option, folder per 
day will be automatically generated.
         </para>
+        
         <para>
             The 'On the fly operations' open three more options that act on 
the photos before storing them on disk. The first two relate to the authors 
data in <link linkend="author-identity">Default Author Identity</link> 
settings. If checked, the respective items will be copied into the EXIF tags 
and IPTC fields. The last option allows a date &amp; time for all downloaded 
photographs to be set.
         </para>
 
         <tip>
+            
             <para>
+                
             <itemizedlist>
 
                 <listitem><para>The sequence number may be needed if you have 
a camera with a very fast multi-shoot mode where it is possible to get two 
photographs with exactly the same data and time.
@@ -145,7 +151,9 @@
                 <listitem><para>When you select <guilabel>Camera 
filenames</guilabel>, you have the option to change the filenames to lowercase 
when downloading. Or use uppercase if you prefer.</para></listitem>
 
             </itemizedlist>
+            
             </para>
+            
         </tip>
 
         <para>
@@ -165,7 +173,7 @@
             </para>
 
             <example> <title>On the fly Operations Options</title>
-                <screenshot><screeninfo>On the fly Operations 
Options</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;cameraclientsetting2.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><screeninfo>On the fly Operations 
Options</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-camera-setting2.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
             </example>
 
             <para>
@@ -185,7 +193,7 @@
             </para>
 
             <example> <title>Albums Auto-creation Options</title>
-                <screenshot><screeninfo>Albums Auto-creation 
Options</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;cameraclientsetting3.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><screeninfo>Albums Auto-creation 
Options</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-camera-setting3.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
             </example>
 
             <para>
@@ -211,7 +219,7 @@
         </para>
 
         <example>  <title>The Camera Folder Selection Dialog</title>
-            <screenshot><screeninfo>The Camera Folder Selection 
Dialog</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;camerafolderselectiondialog.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+            <screenshot><screeninfo>The Camera Folder Selection 
Dialog</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-camera-folderselectiondialog.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
         </example>
 
         <note><para>
@@ -220,53 +228,66 @@
 
     </sect2>
 
-    <sect2 id="using-gps">
-    <title>How to use a GPS device with &digikam;</title>
+    <sect2 id="using-gps"> <title>How to use a GPS device with 
&digikam;</title>
+    
         <note><para>
                 <inlinemediaobject>
-                <imageobject><imagedata fileref="&path;handheld_gps.png" 
format="PNG"/></imageobject>
+                <imageobject><imagedata 
fileref="&path;using-camera-handheldgps.png" format="PNG"/></imageobject>
                 </inlinemediaobject>GPS (global positioning system) is used as 
a generic term throughout this document. It just means a location in latitude 
and longitude global coordinates that can be displayed on a map. The actual 
technical implementation that provides the data can be the American GPS, the 
Russian GLONAS, the European GALILEO or any other system.
         </para></note>
 
         <para>
             Not only for professional photographers can it be interesting to 
link an image to a precise geographical location. Not everybody uses an 
airplane to overfly and scan a certain area with automatic GPS data recording. 
Environmental planners, military, police, construction bureaus, real estate 
agencies, all will have an immediate application.
         </para>
+        
         <para>
             But if, after some time, one has forgotten where the image was 
taken, if one loves the nice feature to open with a simple click a browser 
displaying a zoom of the area, if you like to send your image as a postcard to 
another &digikam; user (who is then able to locate your shot), or if you simply 
need the documentation aspect of it - having position data stored in a photo is 
great.
         </para>
+        
         <para>
             Now, how do we get GPS data into the images?  <ulink 
url="http://www.exiv2.org/tags.html";>exiv2</ulink> supports many kinds of the 
GPS data fields, even bearing, satellite and map references. So the question is 
really how to get the data into those fields? There are at least three ways to 
do this: directly with the appropriate hardware, per post-treatment of GPS and 
image files using the Geolocation Kipi-plugin (<ulink 
url="help:/kipi-plugins/geolocalization.html">Manual</ulink>) and per 'manual' 
insertion of known locations.
         </para>
+        
         <itemizedlist>
 
             <listitem><para>Direct GPS data insertion into the image 
files</para>
+                
                 <para>
                     To our knowledge there is at the time of writing no camera 
that integrates a GPS unit. But there are a few that combine with GPS 
receivers, either as a plug-in card or by data transmission through cable or 
Bluetooth.
                 </para>
+                
                 <para><ulink 
url="http://www.engadget.com.nyud.net:8090/2004/09/17/diy-black-box-tagging-photos-with-gps-coordinates/";>Selfmade
 Howto</ulink>
                 </para>
+                
             </listitem>
 
             <listitem><para>Post-treatment of GPS data and image files</para>
                 <para>
                     Using the Geolocation Kipi-plugin (<ulink 
url="help:/kipi-plugins/geolocalization.html">Manual</ulink> if Kipi-plugins 
are already installed).
                 </para>
+                
                 <para>
                     This approach is dead easy: while taking your pictures 
just keep a GPS device running and carry it around with the camera. Once you 
are done, download the pictures and the GPS tracks, and run the above plugin. 
It will correlate the data in the time domain; so it is important that the 
camera be accurate in its clock setting (the GPS device is always accurate 
through the satellites). The positional accuracy interpolated from the track 
points can be as good as 20 meters. Of course, this approach only works if your 
camera can record EXIF data.
                 </para>
+                
                 <para>The GPS track download from a device can be managed with 
the <ulink url="http://gpsman.sourceforge.net/";>gpsman</ulink> or <ulink 
url="http://www.gpsbabel.org";>gpsbabel</ulink>. It is important that the 
downloaded tracks are being stored in gpx format, which is the only one 
compatible with the Geolocation plugin.
                 </para>
+                
                 <para>
                     Several programs exist for &Windows; and MacOS that are 
able to extract and correlate data from images and GPS data tracks. The 
following site provides the same functionality for &Linux;:
                     <ulink 
url="http://freefoote.dview.net/linux_gpscorr.html";>gpsCorr</ulink> or
                     <ulink 
url="http://www.carto.net/projects/photoTools/gpsPhoto/";>gpsPhoto</ulink>
                 </para>
+                
             </listitem>
 
             <listitem>
+                
                 <para>'Manual' insertion of known locations</para>
+                
                 <para>If you happen to know the latitude/longitude or other 
data you can use the this script which is a GPS wrapper for Phil Harvey's 
<ulink url="http://www.sno.phy.queensu.ca/~phil/exiftool";>ExifTool</ulink> that 
uses the signed floating number coordinate notation as produced by maps.google.
                 </para>
+                
             </listitem>
 
         </itemizedlist>
@@ -276,7 +297,9 @@
             <ulink 
url="http://www.letsgodigital.org/en/9323/sony_gps_photography/";>GPS tracker 
from Sony </ulink> and
             <ulink 
url="http://www.emtac.com/products/bluetooth/index.html#btgps";>EMTAC bluetooth 
GPS </ulink>
         </para>
+        
     </sect2>
+    
 </sect1>
  
 <!--

Reply via email to