Git commit 9dd28b3a3616e2691173874dde7c6797f2fbe520 by Gilles Caulier, on 
behalf of Wolfgang Scheffner.
Committed on 08/01/2017 at 14:01.
Pushed by cgilles into branch 'master'.

Apply patch from Wolfgang to introcde last changes done by Simon, Mario, about 
face tags ordinary fixes and similarity search improvements.

M  +6    -5    digikam/using-mainwindow-albumsview.docbook
M  +-    --    digikam/using-mainwindow-duplicates-albumsfilter.png
M  +9    -5    digikam/using-mainwindow-fuzzysearches.docbook
M  +7    -1    digikam/using-mainwindow-peopleview.docbook

https://commits.kde.org/digikam-doc/9dd28b3a3616e2691173874dde7c6797f2fbe520

diff --git a/digikam/using-mainwindow-albumsview.docbook 
b/digikam/using-mainwindow-albumsview.docbook
index 6cda314..3050da3 100644
--- a/digikam/using-mainwindow-albumsview.docbook
+++ b/digikam/using-mainwindow-albumsview.docbook
@@ -70,13 +70,14 @@
             Album Properties can help you remember which kind of photographs 
are in an Album and can also help you to organize the <quote>Albums</quote> 
tree. To access the Album Properties right-click on an Album and select 
<guilabel>Properties</guilabel> (Alt+Return) from the context menu.
         </para>
 
+        <para>
+            <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;using-mainwindow-albumproperties.png" 
format="PNG"/></imageobject>
+            </inlinemediaobject>
+        </para>
+        
         <para>The Album Properties dialog allows you to set:</para>
 
-        <example>
-            <title>The Album Properties Dialog</title>
-            <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-albumproperties.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
-        </example>
-
         <itemizedlist>
 
             <listitem><para>The Album <guilabel>Title</guilabel> : Name of the 
Album, identical with the name of the folder on your hard disk. If you edit it 
here, the folder will also be renamed.
diff --git a/digikam/using-mainwindow-duplicates-albumsfilter.png 
b/digikam/using-mainwindow-duplicates-albumsfilter.png
index de42d48..c096408 100644
Binary files a/digikam/using-mainwindow-duplicates-albumsfilter.png and 
b/digikam/using-mainwindow-duplicates-albumsfilter.png differ
diff --git a/digikam/using-mainwindow-fuzzysearches.docbook 
b/digikam/using-mainwindow-fuzzysearches.docbook
index 928689d..f801232 100644
--- a/digikam/using-mainwindow-fuzzysearches.docbook
+++ b/digikam/using-mainwindow-fuzzysearches.docbook
@@ -9,25 +9,29 @@
 
         <listitem>
             <para>
-                Duplicates: before you can have &digikam; finding duplicates 
the signatures (or fingerprints) have to be calculated. You can start that 
process with the button <guilabel>Update fingerprints</guilabel> which 
initiates a total rebuild of the image signatures (may take hours if you have a 
large collection, an estimate is 2 hours for 10'000 images). Once the 
fingerprints are calculated you can use <guilabel>Find duplicates</guilabel>, 
but it will take a long time too as it has to compare every image with any 
other image. So the way to go in both cases is to confine your search to 
certain albums and/or tags. With the Similarity range you can narrow down or 
enlarge the search result.
+                Duplicates: before you can have &digikam; finding duplicates 
the signatures (or fingerprints) have to be calculated. You can start that 
process with the button <guilabel>Update fingerprints</guilabel> which 
initiates a total rebuild of the image signatures (may take hours if you have a 
large collection, an estimate is 2 hours for 10'000 images). Once the 
fingerprints are calculated you can use <guilabel>Find duplicates</guilabel>, 
but it will take a long time too as it has to compare every image with any 
other image. So the way to go in both cases is to confine your search to 
certain albums and/or tags. With the Similarity range you can narrow down or 
enlarge the search result. Note that by lowering the upper threshold a little 
bit below 100 % you can keep things like exact copies, images from series shots 
etc. out of the search result if you want.
             </para>
 
             <example>
                 <title>Find duplicates while restricting to an album</title>
                 <mediaobject>
-                    <imageobject><imagedata 
fileref="&path;using-mainwindow-duplicates-albumsfilter.png" format="PNG" 
/></imageobject>
+                    <imageobject><imagedata 
fileref="&path;using-mainwindow-duplicates-albumsfilter.png" 
format="PNG"/></imageobject>
                 </mediaobject>
             </example>
+            
+            <para>
+                An overview of the result will be given in the Left Sidebar. 
The first column shows the reference images of each single result. The Items 
column tells you how many images belong to each result including the reference 
image. The last column shows the average similarity which gives you an idea 
about how similar the images of every result might be. The reference image with 
its 100 % is <emphasis>not</emphasis> included in the average. Note that the 
results can be sorted by clicking on one of the column headers.
+            </para>
         </listitem>
 
         <listitem>
             <para id="find-similar">
-                Image (Similar items): This is a drag&amp;drop zone where you 
can drop any image to find a similar one. Drag an image from anywhere over the 
fuzzy search icon in the left sidebar, it will open and you drop it there or 
use <guilabel>Find Similar...</guilabel> from the context menu of a thumbnail 
in any other view. You can narrow down or enlarge the resulting selection with 
the similarity range here as well. In the field below you can enter a name for 
the search and save it. In the searches list below you find your saved 
searches. Clicking on the title bar of that list toggles the sorting order 
between ascending and descending. At the bottom you find an adaptive search 
field which can help you to find a particular search.
+                Image (Similar items): This is a drag&amp;drop zone where you 
can drop any image to find a similar one. Drag an image from anywhere, even 
from outside &digikam; (file manager, other programs), over the fuzzy search 
icon in the left sidebar, it will open and you drop it there or use 
<guilabel>Find Similar...</guilabel> from the context menu of a thumbnail in 
any other view. You can narrow down or enlarge the resulting selection with the 
similarity range here as well. In the field below you can enter a name for the 
search and save it. In the searches list below you find your saved searches. 
Clicking on the title bar of that list toggles the sorting order between 
ascending and descending. At the bottom you find an adaptive search field which 
can help you to find a particular search.
             </para>
 
             <example>
                 <title>Fuzzy search for similar image</title>
-                <mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-searchsimilar.png" format="PNG" 
/></imageobject></mediaobject>
+                <mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-searchsimilar.png" 
format="PNG"/></imageobject></mediaobject>
             </example>
         </listitem>
 
@@ -39,7 +43,7 @@
             <example>
                 <title>Fuzzy search by sketch</title>
                 <mediaobject>
-                    <imageobject><imagedata 
fileref="&path;using-mainwindow-searchsketch.png" format="PNG" /></imageobject>
+                    <imageobject><imagedata 
fileref="&path;using-mainwindow-searchsketch.png" format="PNG"/></imageobject>
                 </mediaobject>
             </example>
         </listitem>
diff --git a/digikam/using-mainwindow-peopleview.docbook 
b/digikam/using-mainwindow-peopleview.docbook
index bea3963..80cbfb4 100644
--- a/digikam/using-mainwindow-peopleview.docbook
+++ b/digikam/using-mainwindow-peopleview.docbook
@@ -81,12 +81,18 @@
             (Show Face Tags) button. Now you should see the face tags of that 
photograph. Those which have a people (or other) tag already assigned will 
simply show the name of that tag. The others, showing <quote>unknown</quote> 
faces, will show a field and two buttons as in the screenshot of the previous 
article. In the field labeled "Who is this?" you can either type in the name of 
an existing People tag out of your tag tree or use the drop down function to 
show your tag tree and select a tag. With <guilabel>Confirm</guilabel> you can 
save that to the database.
         </para>
 
+        <note>
+            <para>
+                If you use the context menu item <guilabel>Assign 
Tag</guilabel> instead of the procedure described above that will 
<emphasis>not</emphasis> assign a face tag. It will assign an ordinary tag and 
it will assign it to the whole image.
+            </para>
+        </note>
+
         <para>
             If a face tag is confirmed and thus showing only the name of the 
tag but not the buttons to remove, edit or confirm it, but you need this 
buttons because &eg; it's wrong and you want to edit or remove it, just 
double-click on the name and the buttons will re-appear.
         </para>
 
         <para>
-            Once you have a tag assigned to a few photographs you can have 
&digikam; looking if it can find more photographs showing the same face. To 
prepare that process you click <guilabel>Scan collection for faces</guilabel> 
but his time you select <guilabel>Recognize faces</guilabel>. 
+            Once you have a tag assigned to a few photographs you can have 
&digikam; looking if it can find more photographs showing the same face. To 
prepare that process you click <guilabel>Scan collection for faces</guilabel> 
but this time you select <guilabel>Recognize faces</guilabel>. 
         </para>
 
         <note>

Reply via email to