diff --git a/ng-images/dialog-preferences-block-border.png b/ng-images/dialog-preferences-block-border.png new file mode 100644 index 0000000..9b0086e Binary files /dev/null and b/ng-images/dialog-preferences-block-border.png differ diff --git a/ng-images/dialog-preferences-no-block-border.png b/ng-images/dialog-preferences-no-block-border.png new file mode 100644 index 0000000..5585ffe Binary files /dev/null and b/ng-images/dialog-preferences-no-block-border.png differ diff --git a/ng-images/dialog-preferences-numeric-display-7seg.png b/ng-images/dialog-preferences-numeric-display-7seg.png new file mode 100644 index 0000000..071b5ed Binary files /dev/null and b/ng-images/dialog-preferences-numeric-display-7seg.png differ diff --git a/ng-images/dialog-preferences-numeric-display-console.png b/ng-images/dialog-preferences-numeric-display-console.png new file mode 100644 index 0000000..30dd006 Binary files /dev/null and b/ng-images/dialog-preferences-numeric-display-console.png differ diff --git a/ng-images/dialog-preferences-window-startup.png b/ng-images/dialog-preferences-window-startup.png new file mode 100644 index 0000000..9290fdf Binary files /dev/null and b/ng-images/dialog-preferences-window-startup.png differ diff --git a/section-dialogs.tex b/section-dialogs.tex index 891b836..3585e1c 100644 --- a/section-dialogs.tex +++ b/section-dialogs.tex @@ -121,6 +121,72 @@ \subsection{Appearance} This section allows you to configure fonts, colors, and other display settings for the application. +\subsubsection{Stream Browser} + + +\textbf{\underline{Numeric value display}} + +Numeric value display in Stream Browser can take one of the following values: +\begin{itemize} +\item \emph{Console font}: use the font defined for console. +\item \emph{7 segment}: use 7 segment style display. +\item \emph{Default font}: use the application default font. +\end{itemize} + +\begin{figure}[H] +\centering +\includegraphics[width=\textwidth]{ng-images/dialog-preferences-numeric-display-7seg.png} +\caption{7 Segment} +\label{prefs} +\end{figure} + +\begin{figure}[H] +\centering +\includegraphics[width=\textwidth]{ng-images/dialog-preferences-numeric-display-console.png} +\caption{Console font} +\label{prefs} +\end{figure} + + +\textbf{\underline{Show block border}} + +When ticked, adds a visual border around stream browser blocks (e.g. channel properties) + +\begin{figure}[H] +\centering +\includegraphics[width=\textwidth]{ng-images/dialog-preferences-block-border.png} +\caption{With block border} +\label{prefs} +\end{figure} + +\begin{figure}[H] +\centering +\includegraphics[width=\textwidth]{ng-images/dialog-preferences-no-block-border.png} +\caption{Without block border} +\label{prefs} +\end{figure} + + +\subsubsection{Windowing} + + +\textbf{\underline{Window startup mode}} + +Window startup mode can be set to one of the following values: +\begin{itemize} +\item \emph{Windowed}: the application is started in a fixed 1280x720 window. +\item \emph{Maximized}: the window is maximized on the main screen. +\item \emph{Last State}: the window is restored at the last position and size. +\end{itemize} + +\begin{figure}[H] +\centering +\includegraphics[width=10cm]{ng-images/dialog-preferences-window-startup.png} +\caption{7 Segment} +\label{prefs} +\end{figure} + + % TODO: document all of these preferences once the list has stabilized a bit \subsection{Drivers} diff --git a/section-gettingstarted.tex b/section-gettingstarted.tex index 814d1ec..9f4a78e 100644 --- a/section-gettingstarted.tex +++ b/section-gettingstarted.tex @@ -420,6 +420,22 @@ \subsection{General arguments} \item \texttt{-{}-help}, \texttt{-h}\\ Print a brief description of the available command line arguments and exit. +\item \texttt{-{}-maximize}, \texttt{-m}\\ +Maximize ngscopeclient window on startup (overrides "Window startup mode" preference). + +\item \texttt{-{}-restore}, \texttt{-r}\\ +Restore previous ngscopeclient window size and position (overrides "Window startup mode" preference). + +\item \texttt{Session files}\\ +If you wish to resume a prior session, pass the path to a session file saved from the graphical interface as the sole non-option argument. + +The file name must end in .scopesession. + +\item \texttt{Instrument connection strings}\\ +When starting a new session, you may provide one or more instrument connection strings as arguments, which will be added to the session. + +Connection strings are not accepted when resuming an existing session. + \end{itemize} % TODO: add this section once these are implemented diff --git a/section-powersupply-drivers.tex b/section-powersupply-drivers.tex index 25c9e99..a6b2f13 100644 --- a/section-powersupply-drivers.tex +++ b/section-powersupply-drivers.tex @@ -43,7 +43,7 @@ \section{Kuaiqu} \thickhline Kuaiqu SSPS-S series & kuaiqu\_psu & uart & \\ Kuaiqu SPPS*D series & kuaiqu\_psu & uart & \\ -Kuaiqu SPPS-D series & kuaiqu\_psu & uart & Tested on a Kuaiqu SPPS-D3010-232\\ +Kuaiqu SPPS-D series & kuaiqu\_psu & uart (9600 bauds) & Tested on a Kuaiqu SPPS-D3010-232\\ Kuaiqu R-SPPS series & kuaiqu\_psu & uart & \\ \thickhline \end{tabularx}