Skip to content

RFC: show vectorscope along with waveform (or histogram) #20337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dtorop wants to merge 1 commit into from
Closed

RFC: show vectorscope along with waveform (or histogram) #20337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions data/darktableconfig.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3106,8 +3106,15 @@
<name>plugins/darkroom/histogram/graphheight</name>
<type min="100" max="300">int</type>
<default>180</default>
<shortdescription>height of the scopes module</shortdescription>
<longdescription>height of the scopes module in the darkroom and tethering views</longdescription>
<shortdescription>height of the histogram/waveform module</shortdescription>
<longdescription>height of the histogram/waveform module in the darkroom and tethering views</longdescription>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/vectorscope/graphheight</name>
<type min="100" max="300">int</type>
<default>180</default>
<shortdescription>height of the vectorscope module</shortdescription>
<longdescription>height of the vectorscope module in the darkroom and tethering views</longdescription>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/colorequal/graphheight</name>
Expand Down Expand Up @@ -3190,7 +3197,6 @@
<name>plugins/darkroom/histogram/mode</name>
<type>
<enum>
<option>vectorscope</option>
<option>waveform</option>
<option>RGB parade</option>
<option>histogram</option>
Expand All @@ -3209,8 +3215,20 @@
</enum>
</type>
<default>right</default>
<shortdescription>position of the scopes module</shortdescription>
<longdescription>position the scopes at the top-left or top-right of the screen</longdescription>
<shortdescription>position of the histogram/waveform modules</shortdescription>
<longdescription>position the histogram/waveform at the top-left or top-right of the screen</longdescription>
</dtconfig>
<dtconfig prefs="misc" section="interface" restart="true">
<name>plugins/darkroom/vectorscope/panel_position</name>
<type>
<enum>
<option>left</option>
<option>right</option>
</enum>
</type>
<default>right</default>
<shortdescription>position of the vectorscope module</shortdescription>
<longdescription>position the vectorscope at the top-left or top-right of the screen</longdescription>
</dtconfig>
<dtconfig prefs="darkroom" section="modules">
<name>plugins/darkroom/panel_swap</name>
Expand Down Expand Up @@ -3256,7 +3274,7 @@
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope</name>
<name>plugins/darkroom/vectorscope/type</name>
<type>
<enum>
<option>u*v*</option>
Expand All @@ -3269,7 +3287,7 @@
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope/scale</name>
<name>plugins/darkroom/vectorscope/scale</name>
<type>
<enum>
<option>logarithmic</option>
Expand All @@ -3281,7 +3299,7 @@
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope/angle</name>
<name>plugins/darkroom/vectorscope/angle</name>
<type>int</type>
<default>270</default>
<shortdescription/>
Expand Down Expand Up @@ -3309,7 +3327,7 @@
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope/harmony_type</name>
<name>plugins/darkroom/vectorscope/harmony_type</name>
<type>
<enum>
<option>none</option>
Expand All @@ -3329,14 +3347,14 @@
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope/harmony_rotation</name>
<name>plugins/darkroom/vectorscope/harmony_rotation</name>
<type>int</type>
<default>0</default>
<shortdescription/>
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope/harmony_width</name>
<name>plugins/darkroom/vectorscope/harmony_width</name>
<type>
<enum>
<option>normal</option>
Expand All @@ -3350,7 +3368,7 @@
<longdescription/>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/vectorscope/harmony/dim</name>
<name>plugins/darkroom/vectorscope/harmony/dim</name>
<type min="0" max="1">float</type>
<default>0.7</default>
<shortdescription>dim pixels outside of guides</shortdescription>
Expand Down
4 changes: 4 additions & 0 deletions src/develop/pixelpipe_hb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2981,6 +2981,10 @@ static gboolean _dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe,
roi_in.width, roi_in.height,
display_profile,
dt_ioppr_get_histogram_profile_info(dev));
darktable.lib->proxy.vectorscope.process(darktable.lib->proxy.vectorscope.module, input,
roi_in.width, roi_in.height,
display_profile,
dt_ioppr_get_histogram_profile_info(dev));
}
return dt_pipe_shutdown(pipe);
}
Expand Down
3 changes: 2 additions & 1 deletion src/libs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ add_definitions(-include common/module_api.h)
add_definitions(-include libs/lib_api.h)

# The modules
set(MODULES import export copy_history styles tagging image select collect recentcollect filtering metadata metadata_view navigation histogram history snapshots modulegroups backgroundjobs colorpicker masks session duplicate ioporder)
set(MODULES import export copy_history styles tagging image select collect recentcollect filtering metadata metadata_view navigation histogram vectorscope history snapshots modulegroups backgroundjobs colorpicker masks session duplicate ioporder)

# The tools
set(MODULES ${MODULES} viewswitcher)
Expand Down Expand Up @@ -38,6 +38,7 @@ add_library(metadata MODULE "metadata.c")
add_library(metadata_view MODULE "metadata_view.c")
add_library(navigation MODULE "navigation.c")
add_library(histogram MODULE "histogram.c")
add_library(vectorscope MODULE "vectorscope.c")
add_library(history MODULE "history.c")
add_library(snapshots MODULE "snapshots.c")
add_library(modulegroups MODULE "modulegroups.c")
Expand Down
Loading
Loading