From 79d5696d5e008fd5c1b611ed161ab5f7c42e24a3 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 1 Apr 2020 10:21:17 -0600 Subject: [PATCH] Andrea fixes --- CinelerraGG_Manual.tex | 4 +++ parts/AuxilaryPrograms.tex | 1 - parts/Editing.tex | 4 +-- parts/FFmpeg.tex | 2 +- parts/Installation.tex | 5 ++-- parts/Keyframes.tex | 3 ++- parts/Plugins.tex | 35 +++++++++++++++----------- parts/Windows.tex | 51 +++++++++++++++++++++----------------- 8 files changed, 59 insertions(+), 46 deletions(-) diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex index 8e856bf..434054d 100644 --- a/CinelerraGG_Manual.tex +++ b/CinelerraGG_Manual.tex @@ -57,11 +57,15 @@ svgnames, \include{parts/AuxilaryPrograms} \end{appendices} +\pagestyle{plain} + \include{parts/Glossary} \printnomenclature % print glossary \newpage +\pagestyle{ruled} + \listoftables \newpage diff --git a/parts/AuxilaryPrograms.tex b/parts/AuxilaryPrograms.tex index dde4207..611221e 100644 --- a/parts/AuxilaryPrograms.tex +++ b/parts/AuxilaryPrograms.tex @@ -190,7 +190,6 @@ The following extensions of files in \CGG{}'s \texttt{.bcast5} directory are exp \item [.png] thumbnails of files in Resources so they do not have to be created over and over \end{labeling} - %%% Local Variables: %%% mode: latex %%% TeX-master: "../CinelerraGG_Manual" diff --git a/parts/Editing.tex b/parts/Editing.tex index 101f2c9..d1c4271 100644 --- a/parts/Editing.tex +++ b/parts/Editing.tex @@ -86,8 +86,8 @@ shadowed by a color, the feature is enabled. If the toggle is the background color of most of the window, it is disabled. Click on the toggle to enable/disable the feature. -\begin{wrapfigure}[12]{O}{0.3\linewidth} - \vspace{-2ex} +\begin{wrapfigure}[17]{O}{0.3\linewidth} + %\vspace{-2ex} \centering \includegraphics[width=0.79\linewidth]{patchbay01.png} \caption{Patchbay} diff --git a/parts/FFmpeg.tex b/parts/FFmpeg.tex index f9c6269..6b55d86 100644 --- a/parts/FFmpeg.tex +++ b/parts/FFmpeg.tex @@ -46,7 +46,7 @@ In the ffmpeg configuration directory there are a series of options files used w \begin{center} \small - \begin{tabular}{l l} + \begin{tabular}{l m{25em}} \toprule ffmpeg/ffmpeg.opts & global ffmpeg options, always used \\ ffmpeg/decode.opts & global decoder options, used when opening existing files for decoding \\ diff --git a/parts/Installation.tex b/parts/Installation.tex index e283762..5c1fe94 100644 --- a/parts/Installation.tex +++ b/parts/Installation.tex @@ -757,8 +757,7 @@ tar -xJf /path/cygcin-bld.tar.bz2 This creates \texttt{\~{}/cygcin}, a user build installation of \CGG{} and requires approximately 400MB storage. -\underline{Running \CGG{}:} - +\paragraph{Running \CGG{}:} You will need to start a cygwin desktop from the startup menu: \begin{enumerate} \item \texttt{Start$\rightarrow$ Cygwin-X $\rightarrow$ Openbox} @@ -797,7 +796,7 @@ example h264/h265), and utilities. The only graphics driver is X11 and the only sound driver is pulseaudio. Almost all configurable omissions are applied to this build. -\underline{\CGG{} build on cygwin from source code:} +\paragraph{\CGG{} build on cygwin from source code:} \begin{enumerate} \item Download and install ffmpeg into /usr/local : diff --git a/parts/Keyframes.tex b/parts/Keyframes.tex index 10dda93..e50e448 100644 --- a/parts/Keyframes.tex +++ b/parts/Keyframes.tex @@ -155,7 +155,8 @@ all sessions. The intent is to make a parameter set that is likely to be reused It may be useful to create a default keyframe which has specific desirable values for later use. To do this, set the timeline to position 0 and be sure to disable \textit{generate keyframes while tweaking}. This will create a default keyframe at the beginning of the timeline which contains global parameters for the entire duration. Or if you have copied a non-default keyframe via Keyframes pulldown \textit{copy default keyframe}, it can be stored as the default keyframe by calling \texttt{keyframes $\rightarrow$ paste default keyframe}. After using paste default keyframe to convert a non-default keyframe into a default keyframe, you will not see the value of the default keyframe reflected until all the non-default keyframes are removed. -The \texttt{keyframes $\rightarrow$ copy default keyframe} and \texttt{keyframes} $\rightarrow$ \texttt{paste} \texttt{default keyframe} allow conversion of the default keyframe to a non-default keyframe. +The \texttt{keyframes $\rightarrow$ copy default keyframe} and \\ +\texttt{keyframes $\rightarrow$ paste default keyframe} allow conversion of the default key-frame to a non-default keyframe. \texttt{Keyframes $\rightarrow$ copy default keyframe} copies the default keyframe to the clipboard, no matter what region of the timeline is selected. The \texttt{keyframes $\rightarrow$ paste} \texttt{keyframes} function may then be used to paste the clipboard as a non-default keyframe. diff --git a/parts/Plugins.tex b/parts/Plugins.tex index d2e0207..c9b11a5 100644 --- a/parts/Plugins.tex +++ b/parts/Plugins.tex @@ -31,10 +31,10 @@ Note that when you change the plugin icons, your session will automatically save \node (img1) [yshift=0cm, xshift=0cm, rotate=0] {\includegraphics[width=0.5\linewidth]{plugin-icons.png}}; \node [yshift=-6mm, xshift=-1cm,anchor=east] at (img1.north west) (Preferences) {Preferences Window}; \node [yshift=-14mm, xshift=-1cm,anchor=east] at (img1.north west) (Tab) {Tab section}; - \node [yshift=-35mm, xshift=-1cm,anchor=east] at (img1.north west) (Icon) {Plugin icon choices}; + \node [yshift=-34mm, xshift=-1cm,anchor=east] at (img1.north west) (Icon) {Plugin icon choices}; \draw [->, line width=1mm] (Preferences) edge ([yshift=-6mm] img1.north west); \draw [->, line width=1mm] (Tab) edge ([yshift=-14mm] img1.north west); - \draw [->, line width=1mm] (Icon) edge ([yshift=-35mm] img1.north west); + \draw [->, line width=1mm] (Icon) edge ([yshift=-34mm] img1.north west); \end{tikzpicture} \caption{Screencast showing the screen to change your plugin icons set} \label{fig:plugin-icons} @@ -135,11 +135,11 @@ A Presets button on the plugin bar to the left of the Controls and On/Off button \begin{tikzpicture}[scale=1, transform shape] \node (img1) [yshift=0cm, xshift=0cm, rotate=0] {\includegraphics[width=0.6\linewidth]{preset02.png}}; \node [yshift=-20mm, xshift=-1cm,anchor=east] at (img1.north west) (Green) {A user preset Green}; - \node [yshift=-68mm, xshift=-1cm,anchor=south east,text width=10em, inner ysep=-3mm] at (img1.north west) (Textbox) {Textbox to type in the title for the chosen preset or name for a new preset.}; - \node [yshift=-80mm, xshift=-1cm,anchor=north east,text width=10em,inner ysep=-3mm] at (img1.north west) (Save) {Use the Delete, Save or Apply button for operation.}; + \node [yshift=-67mm, xshift=-1cm,anchor=south east,text width=10em, inner ysep=-3mm] at (img1.north west) (Textbox) {Textbox to type in the title for the chosen preset or name for a new preset.}; + \node [yshift=-79mm, xshift=-1cm,anchor=north east,text width=10em,inner ysep=-3mm] at (img1.north west) (Save) {Use the Delete, Save or Apply button for operation.}; \draw [->, line width=1mm] (Green) edge ([yshift=-20mm] img1.north west); - \draw [->, line width=1mm] (Textbox.south east) -- ([yshift=-68mm] img1.north west); - \draw [->, line width=1mm] (Save.north east) -- ([yshift=-80mm] img1.north west); + \draw [->, line width=1mm] (Textbox.south east) -- ([yshift=-67mm] img1.north west); + \draw [->, line width=1mm] (Save.north east) -- ([yshift=-79mm] img1.north west); \end{tikzpicture} \caption{Screencast shows 4 Factory presets as preceded by an *.} \label{fig:preset02} @@ -1030,6 +1030,10 @@ This is a Gaussian type blur. Other blur plugins -- \textit{Linear}, \textit{Mot \item[Blur alpha, red, green, blue] specifies which color channels is to be blurred. \end{description} +\subsection{BoxBlur}% +\label{sub:boxblur} +Based on ffmpeg’s. To blur horizontal, vertical, and with power. Very fast + \subsection{Brightness/Contrast}% \label{sub:brightness_contrast} @@ -2386,7 +2390,7 @@ There is no \textit{undo} recorded between gui updates. It is recommended that y \begin{center} \small - \begin{longtable}{{m{15em}m{13em}m{12em}}} + \begin{longtable}{{m{12em}m{13em}m{12em}}} \caption{Sketcher controls} \label{tabular:sketcher_controls} \\ % note that double backslash is mandatory here \toprule @@ -2975,6 +2979,14 @@ Only for Nvidia GPU and Cuda SDK \label{sub:mandelbrot} Produce fractal figures (figure~\ref{fig:mandelbrot}). Use case: + +\begin{figure}[hbtp] + \centering + \includegraphics[width=0.8\linewidth]{mandelbrot.png} + \caption{Mandelbrot Cuda plugin} + \label{fig:mandelbrot} +\end{figure} + \begin{enumerate} \item add the Mandelbrot Cuda video effect to the timeline \item you must enable Drag in the plugin popup menu @@ -2983,13 +2995,6 @@ Produce fractal figures (figure~\ref{fig:mandelbrot}). Use case: \item so now when you play the video from the beginning because you have keyframes, the fractal will be animated between keyframes. \end{enumerate} -\begin{figure}[hbtp] - \centering - \includegraphics[width=0.9\linewidth]{mandelbrot.png} - \caption{Mandelbrot Cuda plugin} - \label{fig:mandelbrot} -\end{figure} - \subsection{N\_Body}% \label{sub:n_body} @@ -3075,7 +3080,7 @@ The location for most User installs is: Location for some System installs is: -\hspace{4em}\texttt{/usr/lib/cin/plugins/} (most ubuntu distros)\newline +\hspace{4em}\texttt{/usr/lib/cin/plugins/} (most ubuntu distros)\\ \hspace{4em}\texttt{/usr/lib64/cin/plugins/} (Leap distro) \subsection{How to Build OpenCV Plugins}% diff --git a/parts/Windows.tex b/parts/Windows.tex index 9b4b935..b662a49 100644 --- a/parts/Windows.tex +++ b/parts/Windows.tex @@ -1623,7 +1623,7 @@ Examples with some caveats first: \caption{Examples} \label{tab:label} \small - \begin{tabular}{llllm{10em}} \toprule + \begin{tabular}{lllm{10em}m{10em}} \toprule Enable& Target& Op& Value& meaning\\\midrule Or &Patterns &Matches &*& all files from the Media folder are included\\ And Not&Filesize&Lt &160000000& no files that are less than 160MB in size \\ @@ -1936,6 +1936,32 @@ Here is a list of how they work. Keep in mind that if the Expander on the patch checkboxes except for the one you are on. Then this named box will have outline for a \textit{hot} spot. \item Shift+LMB on this \textit{hot} spot will return to \textit{cool} of the previous settings with all of the previous checkboxes checked again. +\end{itemize} + +\begin{figure}[htpb] + \begin{minipage}{.29\linewidth} + \centering + \includegraphics[width=0.99\linewidth]{overlays_list1.png} + \caption{Original Settings --- cool spot} + \label{fig:overlays_list1} + \end{minipage} + \hfill + \begin{minipage}{.29\linewidth} + \centering + \includegraphics[width=0.99\linewidth]{overlays_list2.png} + \caption{Note Titles box hot spot } + \label{fig:overlays_list2} + \end{minipage} + \hfill + \begin{minipage}{.29\linewidth} + \centering + \includegraphics[width=0.99\linewidth]{overlays_list3.png} + \caption{Cam/Proj XYZ toggle to fine tune} + \label{fig:overlays_list3} + \end{minipage} +\end{figure} + +\begin{itemize} \item Shift+LMB on a non-\textit{hot} spot will simply check or uncheck a box and there is no previous state. \item This all works in conjunction with the View pulldown menu which, of course, has no hot spots. \item Caveat \#1 - Shift+LMB on the top 4 choices of Assets, Titles, Transitions, Plugin Keyframes will turn @@ -1945,28 +1971,7 @@ Here is a list of how they work. Keep in mind that if the Expander on the patch \item Caveat \#3 - XYZ toggle on/off of Camera and Projector are not affected. \end{itemize} -\begin{figure}[htpb] - \begin{minipage}{.29\linewidth} - \centering - \includegraphics[width=0.99\linewidth]{overlays_list1.png} - \caption{Original Settings --- cool spot} - \label{fig:overlays_list1} - \end{minipage} - \hfill - \begin{minipage}{.29\linewidth} - \centering - \includegraphics[width=0.99\linewidth]{overlays_list2.png} - \caption{Note Titles box hot spot } - \label{fig:overlays_list2} - \end{minipage} - \hfill - \begin{minipage}{.29\linewidth} - \centering - \includegraphics[width=0.99\linewidth]{overlays_list3.png} - \caption{Cam/Proj XYZ toggle to fine tune} - \label{fig:overlays_list3} - \end{minipage} -\end{figure} + \subsection{Sound Level Meters Window}% -- 2.26.2