Эх сурвалжийг харах

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

Kolja Strohm 7 жил өмнө
parent
commit
3a34f2fe5f

+ 3 - 3
doc/chapter/2architecture.tex

@@ -50,13 +50,13 @@ The internal representation of graphs is further explained in the section~\ref{s
     name & string & yes & If not omitted, this must be unique for a given parent node. \\\hline
     name & string & yes & If not omitted, this must be unique for a given parent node. \\\hline
     width & integer & yes & The minimum width of the node.
     width & integer & yes & The minimum width of the node.
     The node can be wider if it contains other nodes that need more space.
     The node can be wider if it contains other nodes that need more space.
-    If the whole layout is too large, it is resized, such that all nodes are proportionately shrunk: In that case the minimum width can be undercut.
+    If the whole layout is too large, it is resized, such that all nodes are proportionately shrunk: In that case the minimum width can be exceeded after the shrinking.
     Default 40.\\\hline
     Default 40.\\\hline
     height & integer & yes & The minimum height of the node.
     height & integer & yes & The minimum height of the node.
     The node can be higher if it contains other nodes that need more space.
     The node can be higher if it contains other nodes that need more space.
-    If the whole layout is too large, it is resized, such that all nodes are proportionately shrunk: In that case the minimum height can be undercut.
+    If the whole layout is too large, it is resized, such that all nodes are proportionately shrunk: In that case the minimum height can be exceeded after the shrinking.
     Default 40.\\\hline
     Default 40.\\\hline
-    dummy & boolean & yes & Iff this is set to yes, then the node is a dummy node. \\\hline
+    dummy & boolean & yes & Iff this is explicitly set to yes, then the node is a dummy node. \\\hline
     layers & < < node > > & yes & The layers of nodes inside this node (Hierarchy). \\\hline
     layers & < < node > > & yes & The layers of nodes inside this node (Hierarchy). \\\hline
     edges & < edge > & yes & The edges between nodes whose parent node is this node. \\\hline
     edges & < edge > & yes & The edges between nodes whose parent node is this node. \\\hline
     \caption[Node Attributes]{Node Attributes. < \emph{element type} > is a list.}
     \caption[Node Attributes]{Node Attributes. < \emph{element type} > is a list.}

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

@@ -65,14 +65,23 @@ It is planned to add additional commands, see chapter~\ref{ch:progress}.
 The possible inputs are listed in table~\ref{table:keys}.
 The possible inputs are listed in table~\ref{table:keys}.
 
 
 \begin{table}[htp]
 \begin{table}[htp]
-    \begin{longtable}{|l|l|}
+    \begin{longtable}{|l|p{10cm}|}
         \hline
         \hline
         Key & Action \\\hline\hline
         Key & Action \\\hline\hline
-        Left arrow key & Perform one forward step of the algorithm. \\\hline
-        Right arrow key & Perform one backward step---i.e.\ undo one step of the algorithm. \\\hline
-        P & Pause/unpause the automatic execution. Initially paused. \\\hline
-        D & Print a debug table to standard out. \\\hline
+        Alt + Left arrow key & Perform one forward step of the algorithm, \enquote{step into}. \\\hline
+        Alt + Right arrow key & Perform one \enquote{step into} in backwards direction---i.e.\ undo one step of the algorithm. \\\hline
+        Alt + Up arrow key & Perform one \enquote{step over} in backwards direction. \\\hline
+        Alt + Down arrow key & Perform one \enquote{step over} in forwards direction. \\\hline
+        Alt + Page down & Perform one \enquote{step out} in forwards direction. \\\hline
+        Alt + Page up & Perform one \enquote{step out} in backwards direction. \\\hline
+        Alt + P & Activate forwards automatic execution. \\\hline
+        Alt + R & Activate backwards automatic execution. \\\hline
+        Alt + Pause & Pause automatic execution. \\\hline
+        Alt + G & Generate a random graph (opens a dialog window). \\\hline
+        Alt + S & Save the current graph to a file (opens a dialog window). \\\hline
+        Alt + L & Load a graph from a file (opens a dialog window). \\\hline
+        Alt + D & Show a debug table (in a new window). \\\hline
     \end{longtable}
     \end{longtable}
-    \caption[Overview of the currently available keyboard commands]{Overview of the currently available keyboard commands. For the planned commands, see~\ref{ch:progress}.}
+    \caption[Overview of the available keyboard commands]{Overview of the available keyboard commands. For the planned commands, see~\ref{ch:progress}.}
     \label{table:keys}
     \label{table:keys}
 \end{table}
 \end{table}

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

@@ -31,13 +31,13 @@ The following features are either planned (\planned), under construction (\progr
         \end{itemize}
         \end{itemize}
     \end{itemize}
     \end{itemize}
     \item[\done] Running the algorithm step by step manually.
     \item[\done] Running the algorithm step by step manually.
-    \item[\progress] Running the algorithm step by step with configurable delay.
+    \item[\done] 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[\progress] Using debugger-like commands such as \enquote{step into}, \enquote{step over}, \enquote{step out}.
-    \item[\progress] Adding buttons and other graphical elements to support the user interface (low priority, see figure~\ref{fig:sketch}).
+    \item[\done] Adding buttons and other graphical elements to support the user interface (low priority, see figure~\ref{fig:sketch}).
     Currently there is only keyboard input (cf.\ section~\ref{sec:userInterface}).
     Currently there is only keyboard input (cf.\ section~\ref{sec:userInterface}).
     \begin{itemize}
     \begin{itemize}
-        \item[\progress] Displaying the buttons.
-        \item[\planned] Making all the buttons work.
+        \item[\done] Displaying the buttons.
+        \item[\done] Making all the buttons work.
     \end{itemize}
     \end{itemize}
     \item[\done] Working with hierarchical graphs.
     \item[\done] Working with hierarchical graphs.
     \item[\done] Scaling the display with the (adjustable) window size.
     \item[\done] Scaling the display with the (adjustable) window size.

BIN
doc/img/logo.jpg


BIN
doc/img/logo.png