Don't down-scale images used in the wiki unless it's required to make…

… the diagram fit. Also add a new diagram for the car_component image.
google · May 15, 2016 · 2f36ab0 · 2f36ab0
1 parent 11f319e
commit 2f36ab0
Show file tree

Hide file tree

Showing 37 changed files with 55 additions and 37 deletions.
diff --git a/extras/doc/CMakeLists.txt b/extras/doc/CMakeLists.txt
@@ -17,6 +17,7 @@ set(LATEX_SOURCES
 bar_handler.tex
 bind.tex
 bind_instance.tex
+car_component.tex
 checked_adder.tex
 checked_incrementer.tex
 component_composition.tex

diff --git a/extras/doc/bar_handler.tex b/extras/doc/bar_handler.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{2.5}{BarHandlerComponent}
 \umlprovidedinterface[interface=BarHandler, distance=3.3, padding=0.9cm]{BarHandlerComponent}

diff --git a/extras/doc/bind.tex b/extras/doc/bind.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=0.91, transform shape]
 
 \newnamedcomponent{0}{2.5}{bind1}{bind}
 \newnamedcomponent{0}{0}{bind2}{bind}

diff --git a/extras/doc/bind_instance.tex b/extras/doc/bind_instance.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{bindInstance}
 \umlprovidedinterface[interface=Foo, distance=2.5, padding=0.9cm]{bindInstance}

diff --git a/extras/doc/car_component.tex b/extras/doc/car_component.tex
@@ -0,0 +1,17 @@
+
+\input{header}
+\begin{tikzpicture}[scale=1, transform shape]
+
+\begin{component}{20cm}{1}{0}{CarComponent}
+\newcomponent{0}{1.5}{CarImpl}
+\umlprovidedinterface[interface=Car, distance=2cm, padding=1cm]{CarImpl}
+\newcomponent{10}{0}{MainBrakeComponent}
+\umlassemblyconnector[interface={Annotated<MainBrake{,} Brake>}]{CarImpl}{MainBrakeComponent}
+\newcomponent{10}{3}{EmergencyBrakeComponent}
+\umlassemblyconnector[interface={Annotated<EmergencyBrake{,} Brake>}]{CarImpl}{EmergencyBrakeComponent}
+\end{component}
+\umlprovidedinterface[interface=Car, distance=9.7, with port, padding=0cm]{CarComponent}
+\umldep{CarComponent-west-port}{CarImpl-west-interface}
+
+\end{tikzpicture}
+\input{footer}
diff --git a/extras/doc/checked_adder.tex b/extras/doc/checked_adder.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{2}{0}{CheckedAdderComponent}
 \umlprovidedinterface[interface=Adder, distance=4, padding=0.5cm]{CheckedAdderComponent}

diff --git a/extras/doc/checked_incrementer.tex b/extras/doc/checked_incrementer.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{CheckedIncrementerComponent}
 \newcomponent{0}{0}{IncrementerImplComponent}

diff --git a/extras/doc/component_composition.tex b/extras/doc/component_composition.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=0.93, transform shape]
 
 \begin{component}{20cm}{1}{0}{U1Component}
 \newcomponent{11}{4}{SomeType}
@@ -25,8 +25,8 @@
 \draw (U1U2Component-west-interface)+(-1cm,0) node[name=U1U2Component-west-padding] {};
 
 \end{component}
-\umlprovidedinterface[interface=U1, distance=9.5, with port]{U1Component}
-\umlrequiredinterface[interface=T3, distance=9.5, with port]{U1Component}
+\umlprovidedinterface[interface=U1, distance=9.5, with port, padding=0cm]{U1Component}
+\umlrequiredinterface[interface=T3, distance=9.5, with port, padding=0cm]{U1Component}
 \umldep{SomeType-east-interface}{U1Component-east-port}
 \umldep{U1U2Component-east-interface}{U1Component-east-port}
 \umldep{U1Component-west-port}{U1U2Component-west-interface}

diff --git a/extras/doc/component_dep_loop.tex b/extras/doc/component_dep_loop.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{T1Component}
 \newcomponent{5}{0}{T2Component}

diff --git a/extras/doc/foo_handler.tex b/extras/doc/foo_handler.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{2.5}{FooHandlerComponent}
 \umlprovidedinterface[interface=FooHandler, distance=3.3, padding=0.9cm]{FooHandlerComponent}

diff --git a/extras/doc/greeter.tex b/extras/doc/greeter.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=0.71, transform shape]
 
 \begin{component}{20cm}{1}{0}{GreeterComponent}
 \newnamedcomponent{0}{0}{bind1}{bind<Greeter, GreeterImpl>}

diff --git a/extras/doc/incrementer.tex b/extras/doc/incrementer.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{2}{0}{IncrementerImplComponent}
 \umlprovidedinterface[interface=Incrementer, distance=4, padding=0.5cm]{IncrementerImplComponent}

diff --git a/extras/doc/incrementer_component.tex b/extras/doc/incrementer_component.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{IncrementerComponent}
 \newcomponent{0}{0}{SimpleIncrementerComponent}

diff --git a/extras/doc/inject_macro.tex b/extras/doc/inject_macro.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{GreeterImpl1}{GreeterImpl}
 \newnamedcomponent{0}{0}{GreeterImpl2}{GreeterImpl}

diff --git a/extras/doc/inject_macro_no_args.tex b/extras/doc/inject_macro_no_args.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{StdoutWriter1}{StdoutWriter}
 \newnamedcomponent{0}{0}{StdoutWriter2}{StdoutWriter}

diff --git a/extras/doc/inject_macro_template.tex b/extras/doc/inject_macro_template.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{GreeterImpl1}{GreeterImpl}
 \newnamedcomponent{0}{0}{GreeterImpl2}{GreeterImpl}

diff --git a/extras/doc/inject_typedef_greeter.tex b/extras/doc/inject_typedef_greeter.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{GreeterImpl1}{GreeterImpl}
 \newnamedcomponent{0}{0}{GreeterImpl2}{GreeterImpl}

diff --git a/extras/doc/inject_typedef_templated_constructor.tex b/extras/doc/inject_typedef_templated_constructor.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{GreeterImpl1}{GreeterImpl}
 \newnamedcomponent{0}{0}{GreeterImpl2}{GreeterImpl}

diff --git a/extras/doc/inject_typedef_writer.tex b/extras/doc/inject_typedef_writer.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{StdoutWriter1}{StdoutWriter}
 \newnamedcomponent{0}{0}{StdoutWriter2}{StdoutWriter}

diff --git a/extras/doc/inject_typedef_writer2.tex b/extras/doc/inject_typedef_writer2.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{StdoutWriter1}{StdoutWriter}
 \newnamedcomponent{0}{0}{StdoutWriter2}{StdoutWriter}

diff --git a/extras/doc/multiplier.tex b/extras/doc/multiplier.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{2}{0}{MultiplierComponent}
 \umlprovidedinterface[interface=Multiplier, distance=3, padding=0.5cm]{MultiplierComponent}

diff --git a/extras/doc/parametrized_component.tex b/extras/doc/parametrized_component.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{FooComponent}
 \newnamedcomponent{0}{0}{bind1}{bind}

diff --git a/extras/doc/provider.tex b/extras/doc/provider.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{2.5}{registerProvider}
 \umlprovidedinterface[interface=Database, distance=3, padding=0.9cm]{registerProvider}

diff --git a/extras/doc/provider_functor.tex b/extras/doc/provider_functor.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{registerProvider}
 \newcomponent{0}{3.8}{bindInstance}

diff --git a/extras/doc/register_constructor.tex b/extras/doc/register_constructor.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newnamedcomponent{0}{2.5}{registerConstructor1}{registerConstructor}
 \newnamedcomponent{0}{0}{registerConstructor2}{registerConstructor}

diff --git a/extras/doc/register_constructor_component.tex b/extras/doc/register_constructor_component.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{GreeterComponent}
 \newcomponent{0}{0}{bind}

diff --git a/extras/doc/register_factory.tex b/extras/doc/register_factory.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{registerFactory}
 \umlprovidedinterface[interface=std::function<std::unique\_ptr<MyClass>(int)>, distance=5.7, padding=0.9cm]{registerFactory}

diff --git a/extras/doc/register_factory_macro.tex b/extras/doc/register_factory_macro.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{MyClass}
 \umlprovidedinterface[interface=std::function<std::unique\_ptr<MyClass>(int)>, distance=5.3, padding=0.9cm]{MyClass}

diff --git a/extras/doc/register_factory_typedef.tex b/extras/doc/register_factory_typedef.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{MyClass}
 \umlprovidedinterface[interface=std::function<std::unique\_ptr<MyClass>(int)>, distance=5.3, padding=0.9cm]{MyClass}

diff --git a/extras/doc/register_factory_use.tex b/extras/doc/register_factory_use.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{0}{Bar}
 \umlprovidedinterface[interface=Bar, distance=2, padding=0.9cm]{Bar}

diff --git a/extras/doc/request_injector.tex b/extras/doc/request_injector.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=0.95, transform shape]
 
 \begin{component}{20cm}{1}{0}{injector}
 \newcomponent{0}{1.5}{RequestDispatcherComponent}

diff --git a/extras/doc/scaler.tex b/extras/doc/scaler.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{ScalerComponent}
 \newcomponent{0}{0}{ScalerImpl}

diff --git a/extras/doc/server.tex b/extras/doc/server.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{0}{2.5}{ServerComponent}
 \umlprovidedinterface[interface=Server, distance=2.8, padding=0.9cm]{ServerComponent}

diff --git a/extras/doc/simple_adder.tex b/extras/doc/simple_adder.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \newcomponent{2}{0}{SimpleAdderComponent}
 \umlprovidedinterface[interface=Adder, distance=4, padding=0.5cm]{SimpleAdderComponent}

diff --git a/extras/doc/simple_greeter.tex b/extras/doc/simple_greeter.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{GreeterComponent}
 \newcomponent{0}{0}{GreeterImpl}

diff --git a/extras/doc/simple_incrementer.tex b/extras/doc/simple_incrementer.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=1, transform shape]
 
 \begin{component}{20cm}{1}{0}{SimpleIncrementerComponent}
 \newcomponent{0}{0}{IncrementerImplComponent}

diff --git a/extras/doc/templated_component.tex b/extras/doc/templated_component.tex
@@ -1,6 +1,6 @@
 
 \input{header}
-\begin{tikzpicture}[scale=0.7, transform shape]
+\begin{tikzpicture}[scale=0.91, transform shape]
 
 \begin{component}{20cm}{1}{0}{FooComponent}
 \newcomponent{0}{0}{bind}