소스 검색

Merge branch 'master' of https://koljastrohm-games.com:3000/GraphDrawer/NodePlacementAnimation

Kolja Strohm 7 년 전
부모
커밋
1fb0c6b94f
3개의 변경된 파일16개의 추가작업 그리고 7개의 파일을 삭제
  1. 3 3
      doc/chapter/3ui.tex
  2. 11 4
      doc/chapter/4progress.tex
  3. 2 0
      doc/doc.tex

+ 3 - 3
doc/chapter/3ui.tex

@@ -18,7 +18,7 @@ Note that since the application is still under construction, so not all screensh
         \centering
         \includegraphics[width=0.4\linewidth]{img/bk-example-ours}
         \caption[The same graph as~\ref{fig:theirs}, displayed by \appname.]{The same graph as~\ref{fig:theirs}, displayed by \appname.
-        The layouts are leftmost (first column), rightmost (second column), lower (first row) and upper (second row), respectively.}
+        The layouts are leftmost (first column), rightmost (second column), upper (first row) and lower (second row), respectively.}
         \label{fig:ours}
     \end{subfigure}\\\vspace{4mm}
     \caption[Comparison with~\cite{brandes_fast_2001}]{Comparison of the implementation with the results of  Brandes and Köpf~\cite{brandes_fast_2001}}
@@ -52,7 +52,7 @@ Note that since the application is still under construction, so not all screensh
 
 \section{User interface}\label{sec:userInterface}
 Currently the only way to interact with the application is by keyboard events.
-It is planned to add both additional commands as well as some kind of graphical interface, see chapter~\ref{ch:progress}.
+It is planned to add additional commands, see chapter~\ref{ch:progress}.
 The possible inputs are listed in table~\ref{table:keys}.
 
 \begin{table}[htp]
@@ -64,6 +64,6 @@ The possible inputs are listed in table~\ref{table:keys}.
         P & Pause/unpause the automatic execution. Initially paused. \\\hline
         D & Print a debug table to standard out. \\\hline
     \end{longtable}
-    \caption{Overview of the currently available keyboard commands.}
+    \caption[Overview of the currently available keyboard commands]{Overview of the currently available keyboard commands. For the planned commands, see~\ref{ch:progress}.}
     \label{table:keys}
 \end{table}

+ 11 - 4
doc/chapter/4progress.tex

@@ -24,17 +24,24 @@ The following features are either planned (\planned), under construction (\progr
         \item[\done] Drawing the edges just as plain straight lines.
         \item[\done] Drawing the conflicted edges in a different color.
         \item[\done] Drawing the four extremal layouts and the combined layout separately.
-        \item[\planned] Drawing the edges of the block graph (in a different color than other edges, low priority).
-        \item[\planned] Show pseudocode and the position where the algorithm currently is.
+        \item[\planned] Drawing the edges of the block graph (yet another, low priority).
+        \item[\done] Showing pseudocode and the position where the algorithm currently is.
+        \begin{itemize}
+            \item[\planned] Clicking on the pseudocode to go to (not \reserved{goto}) to a specific location.
+        \end{itemize}
     \end{itemize}
     \item[\done] Running the algorithm step by step manually.
     \item[\progress] Running the algorithm step by step with configurable delay.
     \item[\progress] Using debugger-like commands such as \enquote{step into}, \enquote{step over}, \enquote{step out}.
-    \item[\planned] Adding buttons and other graphical elements to support the user interface (low priority, see figure~\ref{fig:sketch}).
+    \item[\progress] Adding buttons and other graphical elements to support the user interface (low priority, see figure~\ref{fig:sketch}).
+    \begin{itemize}
+        \item[\done] Displaying the buttons.
+        \item[\planned] Making all the buttons work.
+    \end{itemize}
     Currently there is only keyboard input (cf.\ section~\ref{sec:userInterface}).
     \item[\done] Working with hierarchical graphs.
     \item[\done] Scaling the display with the (adjustable) window size.
-    \item[\planned] Work with disconnected graphs (cf.\ section~\ref{sec:assumptions}), either by modifying the algorithm or by processing the connected components one by one (low priority).
+    \item[\planned] Working with disconnected graphs (cf.\ section~\ref{sec:assumptions}), either by modifying the algorithm or by processing the connected components one by one (low priority).
     \item[\planned] Creating ElkNode~\cite{noauthor_elk:_2018} objects from LayeredNode (\ref{sec:graph}) objects.
     \item[\planned] Creating LayeredNode (\ref{sec:graph}) objects from ElkNode~\cite{noauthor_elk:_2018} objects (low priority).
 \end{itemize}

+ 2 - 0
doc/doc.tex

@@ -103,9 +103,11 @@
 \definecolor{deepgreen}{rgb}{0,0.4,0}
 \definecolor{grau}{gray}{0.3}
 \definecolor{member}{rgb}{0.27,0.37,0.75}
+\definecolor{reserved}{rgb}{0.5,0.,0.333}
 
 \newcommand{\code}[1]{\lstinline[basicstyle=\ttfamily]|#1|}
 \newcommand{\member}[1]{\lstinline[basicstyle=\ttfamily\color{member}]|#1|}
+\newcommand{\reserved}[1]{\lstinline[basicstyle=\ttfamily\color{reserved}]|#1|}
 
 % python style code
 \lstset{