Git commit be3c24598c3772916e8486e152abddece0a7808f by Gilles Caulier. Committed on 03/11/2016 at 22:33. Pushed by cgilles into branch 'master'.
apply mix of patches 13 and 14 from Wolfgang M +1 -0 digikam/index.docbook M +3 -3 digikam/using-setup-editor-iface.docbook M +171 -94 digikam/using-setup-editor-raw.docbook M +2 -2 digikam/using-setup-editor-save.docbook M +23 -3 digikam/using-setup-editor-version.docbook A +17 -0 digikam/using-setup-editor.docbook M +1 -4 digikam/using-setup.docbook M +10 -4 showfoto/index.docbook http://commits.kde.org/digikam-doc/be3c24598c3772916e8486e152abddece0a7808f diff --git a/digikam/index.docbook b/digikam/index.docbook index ffad037..4ca6846 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -72,6 +72,7 @@ <!ENTITY doc-using-setup-metadata-views SYSTEM "using-setup-metadata-views.docbook"> <!ENTITY doc-using-setup-templates SYSTEM "using-setup-templates.docbook"> + <!ENTITY doc-using-setup-editor SYSTEM "using-setup-editor.docbook"> <!ENTITY doc-using-setup-editor-iface SYSTEM "using-setup-editor-iface.docbook"> <!ENTITY doc-using-setup-editor-save SYSTEM "using-setup-editor-save.docbook"> <!ENTITY doc-using-setup-editor-version SYSTEM "using-setup-editor-version.docbook"> diff --git a/digikam/using-setup-editor-iface.docbook b/digikam/using-setup-editor-iface.docbook index c33b78e..6c23c48 100644 --- a/digikam/using-setup-editor-iface.docbook +++ b/digikam/using-setup-editor-iface.docbook @@ -1,5 +1,5 @@ -<sect2 id="using-setup-editor-iface"> - <title>Image Editor Settings</title> +<sect3 id="using-setup-editor-iface"> + <title>Editor Window Settings</title> <para> By default the Image Editor will use a black background behind photographs when they are displayed. If you prefer a different background color you can choose one here. You can also turn off the ToolBar when the Image Editor is in full screen mode. @@ -15,7 +15,7 @@ </imageobject></inlinemediaobject> </para> -</sect2> +</sect3> <!-- Local Variables: diff --git a/digikam/using-setup-editor-raw.docbook b/digikam/using-setup-editor-raw.docbook index 008139c..643c5ae 100644 --- a/digikam/using-setup-editor-raw.docbook +++ b/digikam/using-setup-editor-raw.docbook @@ -1,8 +1,8 @@ -<sect2 id="using-setup-raw"> +<sect3 id="using-setup-raw"> <title>RAW Decoding Settings</title> <para> - In the early versions of &digikam; the Image Editor was just a viewer for photographs, but it is rapidly developing into a very useful photo manipulation tool. This dialog allows you to control how the Image Editor will behave. + In the early versions of &digikam; the Image Editor was just a viewer for photographs, but it is rapidly developing into a very useful photo manipulation tool. This dialog allows you to control how the Image Editor will behave when opening RAW files. </para> <para> @@ -12,114 +12,191 @@ </para> <para> - <guilabel>16-bit color depth</guilabel> + <guilabel>Fast and simple, as 8 bit image</guilabel> </para> <para> - If enabled, all RAW files will be decoded to 16-bit color depth using a linear gamma curve. To prevent dark image rendering in the editor, it is recommended to use Color Management in this mode. If disabled, all RAW files will be decoded to 8-bit color depth with a BT.709 gamma curve and a 99th-percentile white point. This mode is faster than 16-bit decoding. In 8-bit mode only will the <guilabel>brightness</guilabel> setting be taken into account (dcraw limitation). + RAW files will be decoded to 8-bit color depth with a BT.709 gamma curve and a 99th-percentile white point. This mode is faster than 16-bit decoding. In 8-bit mode only the <guilabel>Auto Brightness</guilabel> setting will be taken into account (dcraw limitation). </para> - - <para> - <guilabel>Interpolate RGB as four colors</guilabel> - </para> - - <para> - The default is to assume that all green pixels are the same. If even-row green pixels of the CCD sensor are more sensitive to ultraviolet light than odd-row this difference causes a mesh pattern in the output; using this option solves this problem with minimal loss of detail. To resume, this option blurs the image a little, but it eliminates false 2x2 mesh patterns with VNG quality method or mazes with AHD quality method. - </para> - - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-editor-raw-settings.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> - - <para> - <guilabel>Use camera white balance</guilabel> - </para> - - <para> - Use the camera's custom white-balance settings if set. Otherwise apply <guilabel>Automatic color balance</guilabel> if this option is set. - </para> - - <para> - <guilabel>Automatic color balance</guilabel> - </para> - - <para> - Only used if camera white balance is not set. The default is to use a fixed color balance based on a white card photographed in sunlight. - </para> - - <para> - <guilabel>Use Super CCD secondary sensors</guilabel> - </para> - - <para> - For Fuji Super CCD SLR cameras only. Use the secondary sensors, in effect underexposing the image by four stops to reveal detail in the highlights. For all other camera types this option is being ignored. - </para> - - <para> - <guilabel>Highlights</guilabel> - </para> - + <para> - This is the story of the three highlight options, courtesy of Nicolas Vilars: + <guilabel>Use the default settings, in 16 bit</guilabel> </para> - + <para> - Default is here to consider highlights (read: part of your images that are burned due to the inability of your camera to capture the highlights) as plain / solid white (<guilabel>solid white</guilabel> option). You can get some fancy results with the <guilabel>unclip</guilabel> option which will paint the highlights in various pinks. At last you can try to consider recovering some parts of the missing information from the highlights (<guilabel>reconstruct</guilabel> option). + If enabled, all RAW files will be decoded to 16-bit color depth using a linear gamma curve and according to the settings in the <guilabel>RAW Default Settings</guilabel> tab. To prevent dark image rendering in the editor, it is recommended to use Color Management in this mode. </para> - + <para> - This is possible because the blue pixels tends to saturate less quickly than the greens and the reds. &digikam;/dcraw will try to reconstruct the missing green and red colors from the remaining none saturated blue pixels. Of course here everything is a question of tradeoff between how much color or white you want. + <guilabel>Always open the Raw Import Tool to customize settings</guilabel> </para> - + <para> - If you select <guilabel>Reconstruct</guilabel> as the option, you will be given the choice to set a level. A value of 3 is a compromise and can/should be adapted on a per image basis. + With this option checked the Raw Import Tool will open at the Right Side Bar in the Inage Editor so that you can set individual parameters for every image you open. </para> + +</sect3> - <note><para> - A small warning here, for the few curious that have read the man pages of Dcraw, the author says that 5 is the compromise, 0 is solid white and 1 unclip. This is because in &digikam; 0 and 1 are the "solid white" and "unclip" options in the drop down menu (if you select these, the level slider will be grayed out). Therefore, the slider in &digikam; with the "reconstruct" option will let you choose between 0 to 7 (instead of 0 to 9 in Dcraw command line) where 3 is the compromise instead of 5 in "native" Dcraw command line tool. - </para></note> +<sect3 id="using-setup-raw-default"> + + <title>RAW Default Settings</title> <para> - <guilabel>Brightness</guilabel> (works in 8 bit mode only) - </para> - - <para> - Set the luminosity to your taste, you probably need to go a little higher than the default = 1. But this can be adjusted later with the image options in the &digikam; image editor. Given the cost in time for demosaicing, stay conservative. - </para> - - <para> - <guilabel>Quality</guilabel> - </para> - - <para> - A <ulink url="http://en.wikipedia.org/wiki/Demosaicing";>demosaicing</ulink> algorithm is a digital image process used to interpolate a complete image from the partial raw data received from the color-filtered image sensor internal to many digital cameras in form of a matrix of colored pixels. Also known as CFA interpolation or color reconstruction. - </para> - - <para> - &digikam; and Dcraw offer us three alternatives: bi-linear, VNG interpolation, AHD interpolation. It seems that <emphasis>AHD interpolation</emphasis> (for Adaptive Homogeneity-Directed) is the best choice for quality according to some test that I have performed and the paper of the person that implemented it. <emphasis>VNG interpolation</emphasis> (Variable Number of Gradients) was the first algorithm used by Dcraw but suffers from color artifacts on the edge. <emphasis>Bilinear</emphasis> is interesting if you are looking for speed with a acceptable result. - </para> - - <para> - <guilabel>Enable Noise Reduction</guilabel> - </para> - - <para> - While demosaicing your image you can additionally ask for noise reduction (at a slight speed penalty). This option applies a noise reduction algorithm while the image still is in CIE Lab color space. Because the noise is only applied to the Luminosity layer (the "L" of the Lab), it should not blur your image as traditional noise reduction algorithms do in RGB mode. So, if you converted an image from RAW and it appears noisy, rather than applying a denoiser, go back and re-convert with this option enabled. The defaults are: <emphasis>Threshold</emphasis> = 100. Higher values will increase the smoothing, lower will decrease smoothing. - </para> - - <anchor id="CA.anchor"/> - - <para> - <guilabel>Enable chromatic aberration (CA) correction</guilabel> - </para> - - <para> - If you know the CA of your lenses you can set the red and blue correction values here. This is certainly the optimal method for CA correction as it is done during RAW conversion. + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-editor-raw-settings.png" format="PNG" /> + </imageobject></inlinemediaobject> </para> - -</sect2> + + <para> + Demosaicing + </para> + + <para> + A <ulink url="http://en.wikipedia.org/wiki/Demosaicing";>demosaicing</ulink> algorithm is a digital image process used to interpolate a complete image from the partial raw data received from the color-filtered image sensor internal to many digital cameras in form of a matrix of colored pixels. Also known as CFA interpolation or color reconstruction. + </para> + + <para> + <guilabel>Interpolate RGB as four colors</guilabel> + </para> + + <para> + The default is to assume that all green pixels are the same. If even-row green pixels of the CCD sensor are more sensitive to ultraviolet light than odd-row this difference causes a mesh pattern in the output; using this option solves this problem with minimal loss of detail. To resume, this option blurs the image a little, but it eliminates false 2x2 mesh patterns with VNG quality method or mazes with AHD quality method. + </para> + + <para> + <guilabel>Do not stretch or rotate pixels</guilabel> + </para> + + <para> + TODO + </para> + <para> </para> + + + <para> + <guilabel>Quality:</guilabel> + </para> + + <para> + TODO + &digikam; and Dcraw offer us three alternatives: bi-linear, VNG interpolation, AHD interpolation. It seems that <emphasis>AHD interpolation</emphasis> (for Adaptive Homogeneity-Directed) is the best choice for quality according to some test that I have performed and the paper of the person that implemented it. <emphasis>VNG interpolation</emphasis> (Variable Number of Gradients) was the first algorithm used by Dcraw but suffers from color artifacts on the edge. <emphasis>Bilinear</emphasis> is interesting if you are looking for speed with a acceptable result. + </para> + <para> </para> + + + <para> + <guilabel>Pass:</guilabel> + </para> + + <para> + TODO + </para> + <para> </para> + + + <para> + <guilabel>Refine interpolation</guilabel> + </para> + + <para> + This option is available only for DCB and VCD/AHD. + TODO + </para> + <para> </para> + + <para> + White Balance + </para> + + + <para> + <guilabel>Method</guilabel> + </para> + + <para> + Four options are available here: Default D65, Camera, Automatic and Manual. <quote>Default D65</quote> reflects normal daylight conditions. <quote>Camera</quote> uses the camera's custom white-balance settings if set. ??? <quote>Automatic</quote> The default is to use a fixed color balance based on a white card photographed in sunlight. ??? <quote>Manual</quote> will adjust colors according to the T(K) (color temperature in degrees Kelvin) and Green settings. + TODO + </para> + <para> </para> + + + <para> + <guilabel>Highlights</guilabel> + </para> + + <para> + This is the story of the three highlight options, courtesy of Nicolas Vilars: + </para> + + <para> + Default is here to consider highlights (read: part of your images that are burned due to the inability of your camera to capture the highlights) as plain / solid white (<guilabel>solid white</guilabel> option). You can get some fancy results with the <guilabel>unclip</guilabel> option which will paint the highlights in various pinks. At last you can try to consider recovering some parts of the missing information from the highlights (<guilabel>reconstruct</guilabel> option). + </para> + + <para> + This is possible because the blue pixels tends to saturate less quickly than the greens and the reds. &digikam;/dcraw will try to reconstruct the missing green and red colors from the remaining none saturated blue pixels. Of course here everything is a question of tradeoff between how much color or white you want. + </para> + + <para> + If you select <guilabel>Reconstruct</guilabel> as the option, you will be given the choice to set a level. A value of 3 is a compromise and can/should be adapted on a per image basis. + </para> + + <note><para> + A small warning here, for the few curious that have read the man pages of Dcraw, the author says that 5 is the compromise, 0 is solid white and 1 unclip. This is because in &digikam; 0 and 1 are the "solid white" and "unclip" options in the drop down menu (if you select these, the level slider will be grayed out). Therefore, the slider in &digikam; with the "reconstruct" option will let you choose between 0 to 7 (instead of 0 to 9 in Dcraw command line) where 3 is the compromise instead of 5 in "native" Dcraw command line tool. + </para></note> + <para> </para> + + <para> + <guilabel>Exposure Correction (E.V)</guilabel> + </para> + + <para> + TODO + </para> + <para> </para> + + <para> + <guilabel>Correct false colors in highlights</guilabel> + </para> + + <para> + TODO + </para> + <para> </para> + + <para> + <guilabel>Auto Brightness</guilabel> + </para> + + <para> + TODO + </para> + <para> </para> + + <para> + Corrections + </para> + + <para> + <guilabel>Noise Reduction</guilabel> + </para> + + <para> + TODO + While demosaicing your image you can additionally ask for noise reduction (at a slight speed penalty). This option applies a noise reduction algorithm while the image still is in CIE Lab color space. Because the noise is only applied to the Luminosity layer (the "L" of the Lab), it should not blur your image as traditional noise reduction algorithms do in RGB mode. So, if you converted an image from RAW and it appears noisy, rather than applying a denoiser, go back and re-convert with this option enabled. The defaults are: <emphasis>Threshold</emphasis> = 100. Higher values will increase the smoothing, lower will decrease smoothing. + </para> + <para> </para> + + <anchor id="CA.anchor"/> + + <para> + <guilabel>Enable chromatic aberration (CA) correction</guilabel> + </para> + + <para> + If you know the CA of your lenses you can set the red and blue correction values here. This is certainly the optimal method for CA correction as it is done during RAW conversion. + </para> + +</sect3> <!-- Local Variables: diff --git a/digikam/using-setup-editor-save.docbook b/digikam/using-setup-editor-save.docbook index 26f8e8c..a57b14f 100644 --- a/digikam/using-setup-editor-save.docbook +++ b/digikam/using-setup-editor-save.docbook @@ -1,4 +1,4 @@ -<sect2 id="using-setup-editor-save"> +<sect3 id="using-setup-editor-save"> <title>Save Image Options</title> <para> @@ -31,7 +31,7 @@ With the <guilabel>LossLess PGF files</guilabel> option allows for lossless storage, or, if the lossy options is selected, even then the quality for comparative files size is much better than normal JPEG-2000. At the time of writing, metadata is supported. </para> -</sect2> +</sect3> <!-- Local Variables: diff --git a/digikam/using-setup-editor-version.docbook b/digikam/using-setup-editor-version.docbook index b9c21d2..b68c621 100644 --- a/digikam/using-setup-editor-version.docbook +++ b/digikam/using-setup-editor-version.docbook @@ -1,8 +1,8 @@ -<sect2 id="using-setup-editor-version"> +<sect3 id="using-setup-editor-version"> <title>Image Versioning Settings</title> <para> - TODO + Non-Destructive Editing and Versioning gives you the freedom of editing your images, trying out whatever you want without worrying that you might regret later what you did. &digikam; takes care of the original and every important intermediate step if you want. </para> <para> @@ -10,8 +10,28 @@ <imagedata fileref="&path;using-setup-editor-version.png" format="PNG" /> </imageobject></inlinemediaobject> </para> + + <para> + In the checkbox at the top you can enable or disable Non-Destructive Editing and Versioning. + </para> + + <para> + In the first field you can choose the file format used for saving the intermediate steps and the final result. Remember that JPEG - like in the screenshot above - is a lossy format. So if you need to start over from an intermediate step it wouldn't be really non-destructive. If you can afford it in terms of space on the harddisk and loading/saving speed you better choose a lossless format like PNG or PCF for instance. Please click the information button on the right side for more detailed information. + </para> + + <para> + In the next field you can decide whether the editor will save changes automatically on exit or should ask first. + </para> + + <para> + In the third field you decide on which occasions you want the editor to save intermediate steps. Please click the information button on the right side for more detailed information. + </para> + + <para> + In the last field you can adjust whether you want only the last version to be shown in the Image View (default, none of the boxes checked) or if you also want to see icons of the original version and/or intermediate steps. + </para> -</sect2> +</sect3> <!-- Local Variables: diff --git a/digikam/using-setup-editor.docbook b/digikam/using-setup-editor.docbook new file mode 100644 index 0000000..a44885f --- /dev/null +++ b/digikam/using-setup-editor.docbook @@ -0,0 +1,17 @@ +<sect2 id="using-setup-editor"> + <title>Image Editor Settings</title> + + &doc-using-setup-editor-iface; + &doc-using-setup-editor-save; + &doc-using-setup-editor-version; + &doc-using-setup-editor-raw; + +</sect2> + +<!-- +Local Variables: +mode: sgml +sgml-omittag: nil +sgml-shorttag: t +End: +--> diff --git a/digikam/using-setup.docbook b/digikam/using-setup.docbook index bbae8c6..3c96f66 100644 --- a/digikam/using-setup.docbook +++ b/digikam/using-setup.docbook @@ -8,10 +8,7 @@ &doc-using-setup-tooltip; &doc-using-setup-metadata; &doc-using-setup-templates; - &doc-using-setup-editor-iface; - &doc-using-setup-editor-save; - &doc-using-setup-editor-version; - &doc-using-setup-editor-raw; + &doc-using-setup-editor; &doc-using-setup-cm; &doc-using-setup-lighttable; &doc-using-setup-slideshow; diff --git a/showfoto/index.docbook b/showfoto/index.docbook index 7b2d4dd..e7dcb5c 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -265,10 +265,16 @@ &doc-using-setup-metadata-views; </sect2> - - &doc-using-setup-editor-iface; - &doc-using-setup-editor-save; - &doc-using-setup-editor-raw; + + <sect2 id="using-setup-editor"> + <title>Editor Settings</title> + + &doc-using-setup-editor-iface; + &doc-using-setup-editor-save; + &doc-using-setup-editor-raw; + + </sect2> + &doc-using-setup-cm; &doc-using-setup-slideshow;
