Skip to content

Commit

Permalink
Added examples for used packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca Mazzoleni committed Jun 29, 2018
1 parent 1bcedf0 commit 5a57cdd
Show file tree
Hide file tree
Showing 3 changed files with 277 additions and 25 deletions.
13 changes: 9 additions & 4 deletions Vorlage.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
% - Makros
% - Farben
% - Mathematische Operatoren
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\include{header/zusammenfassung}
%\include{header/codelayout}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%Ergänzungen für Package kommen hier hin:
%\usepackage{hyperref}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\begin{document}
\maketitle
Expand All @@ -26,6 +28,9 @@
\clearpage
\input{sections/Beispiel}
\clearpage
%%%
\input{sections/V1}
\clearpage
%%%
\input{idiotenseite/IdiotenseiteInclude}
\end{document}
269 changes: 248 additions & 21 deletions sections/Beispiel.tex
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
\section*{Beispiel}
\LaTeX hat eine gute Community $\rightarrow$ einfach Googeln\newline
\subsection{Install}
Reihenfolge beachten!\newline
Latex-Installation\newline
\begin{enumerate}
\item \href{https://miktex.org/download}{MikTex mit Adminrecht installieren}
\item \href{https://www.texstudio.org}{Texstudio mit Adminrecht installieren}
\item (MikTex Package aktualisieren mit MikTex Package Manager)
\end{enumerate}

Git-Installation mit Sourcetree / GitHub\newline
\begin{itemize}
\item \href{https://www.sourcetreeapp.com/}{Sourcetree installieren für GUI-Git}\item \href{https://www.github.com/}{GitHub Account erstellen}
\end{itemize}
\LaTeX hat eine gute Community $\rightarrow$ einfach Googeln

\subsection{Installation}
Infos zur Installation von \href{https://github.com/HSR-Stud/Willkommen/blob/master/installation.md#latex}{\LaTeX}, Git und \href{https://github.com/HSR-Stud/Willkommen/blob/master/installation.md#sourcetree}{Sourcetree} findet ihr hier: \url{https://github.com/HSR-Stud/Willkommen}

\subsection{Mathe Umgebung}
Texstudio Shortcut: alt + shift + m
\[ \varphi_A = \int_{A}^{Bezugspunkt}\vec{E}\cdot\vec{dl} \]
Expand All @@ -37,10 +28,12 @@ \subsection{Tabelle}


longtable für tabellen über mehrere Seiten

%Dies ist ein Kommentar
%TODO bsp
%arraystrech verändert die "`grösse"' der tabelle
%tabbild kann in Tabelle verwendete werden, damit das Bild nicht oben and er Tabelle klebt.
\todo{Dies ist ein TODO}
%arraystrech verändert die "`grösse"' der Tabelle
%tabImg kann in Tabellen verwendete werden, damit das Bild nicht oben an der Tabelle klebt.
\renewcommand{\arraystretch}{2}
\begin{longtable}{| p{.25\textwidth} | p{.40\textwidth} | p{.30\textwidth} |}
\firsthline
Expand Down Expand Up @@ -70,7 +63,7 @@ \subsection{Tabelle}
\end{longtable}
\resetArrayStretch

Sonst tabular \newline
Meistens kann eine tabular-Umgebung verwendet werden. \newline
\begin{tabular}{l|r}
Hallo & \textbf{Hallo}\\ \hline
\textit{Hallo} & Hallo \\
Expand All @@ -83,13 +76,13 @@ \subsection{Tabelle}

\subsection{Layout-Tipps}
\begin{minipage}{0.5\linewidth}
\textbf{minipage} verwenden für platzierungen.
\textbf{minipage} verwenden für Platzierungen.
\end{minipage}
\begin{minipage}{0.2\linewidth}
minipage verwenden für platzierungen.
minipage verwenden fürPplatzierungen.
\end{minipage}
\begin{minipage}{0.3\linewidth}
minipage verwenden für platzierungen.
minipage verwenden für Platzierungen.
\end{minipage}
\vspace{1cm}
\begin{multicols}{2}
Expand Down Expand Up @@ -126,4 +119,238 @@ \subsection{Aufzählung}
\item ctrl + shift + i für item
\item ctrl + shift + i für item
\end{itemize}
\end{itemize}
\end{itemize}

\section*{Einige Beispiele für die Verschiednene Packages in dieser Vorlage}
\subsection{hyperref} \label{hyperref}
Dieses Package gibt dem Benutzer nicht nur die Möglichkeit Links und Verweise innerhalb von PDF Dokumenten zu erzeugen und zu setzen, sondern auch die Änderung von Einstellungen innerhalb des PDF Dokumentes zulässt.\\
Für Verweise innerhalb eines Dokuments werden $\backslash$label\{key\} sowie die Referenz darauf mit $\backslash$ref\{key\} \ref{hyperref}, $\backslash$pageref\{key\} \pageref{hyperref} oder $\backslash$nameref\{key\} \nameref{hyperref}.\newline
Auch Links auf Websiten sind möglich wie bsp. auf \href{www.google.com}{Google}.
Weiter Infos gibt es hier:
\begin{itemize}
\item \url{https://en.wikibooks.org/wiki/LaTeX/Labels_and_Cross-referencing}
\item \url{https://en.wikibooks.org/wiki/LaTeX/Hyperlinks}
\end{itemize}

\subsection{circuitikz}
\url{https://de.sharelatex.com/learn/CircuiTikz_package}
\begin{circuitikz}[american voltages]
\draw
% rotor circuit
(0,0) to [short, *-] (6,0)
to [V, l_=$\mathrm{j}{\omega}_m \underline{\psi}^s_R$] (6,2) % rotor emf
to [R, l_=$R_R$] (6,4) % rotor resistance
to [short, i_=$\underline{i}^s_R$] (5,4) % rotor current

% stator circuit
(0,0) to [open, v^>=$\underline{u}^s_s$] (0,4) % stator voltage
to [short, *- ,i=$\underline{i}^s_s$] (1,4) % stator current
to [R, l=$R_s$] (3,4) % stator resistance
to [L, l=$L_{\sigma}$] (5,4) % leakage inductance
to [short, i_=$\underline{i}^s_M$] (5,3) % magnetizing current
to [L, l_=$L_M$] (5,0); % magnetizing inductance
\end{circuitikz}
\\
\begin{tikzpicture}
\draw
% Thyristors leg 2
(2,0)
to[Ty] ++(0,1.5)
-- ++(0,1)
to[Ty] ++(0,1.5) coordinate (leg2)
% Thyristors leg 1
(0,0)
to[Ty] ++(0,1.5)
-- ++(0,1)
to[Ty] ++(0,1.5) coordinate (leg1)
% Connections and load RL
-- ++(2,0)
to[short, i=$i_o$, current/distance=0.5] ++(2,0)
-- ++(0,-0.8)
to[R] ++(0,-1.2)
to[L] ++(0,-1.2)
% Back to (0,0)
|- (0,0)
% AC source
(-2,1.5) coordinate (Vnn)
to[sV] ++(0,1) coordinate (Vpp)
-- (leg1 |- Vpp) node [circ] {}
(Vnn)
-- (leg2 |- Vnn) node [circ] {}
% v_o(t)
(4.5,3.5)
to[open, v^=$v_o(t)$] ++(0,-3)
;
\end{tikzpicture}

\bigskip

% Example 4-7, p. 135 of Hart, discontinuous current in full-wave rect
\begin{tikzpicture}
\begin{scope}[xscale=1,yscale=1.5]
\newcommand{\alphaa}{60 * pi / 180}
\newcommand{\betaa}{216 * pi / 180}

\draw[thin, ->] (-0.2, 0) -- (14,0) node[right] {$\omega t$};

\foreach \x/\xtext in {0,{\alphaa}/\alpha,{pi}/\pi,
{\betaa}/~,{2*pi}/{2\pi},{3*pi}/{3\pi}}
\draw (\x,0.1) -- (\x,-0.1) node [below] {$\xtext$};
\draw (\betaa,-0.1) -- (\betaa,0.1) node [above] {$\beta$};


% Vs
\draw[domain=0:14, help lines, smooth]
plot (\x,{sin(\x r)});
% -Vs
\draw[domain=0:14, help lines, smooth]
plot (\x,{-sin(\x r)});
% Vo and Io
\foreach \qq [evaluate=\qq as \qqshft using \qq*pi] in {0,...,3}
{
\begin{scope}[xshift=\qqshft cm,
every path/.style={ultra thick, color=red}]
% Vo
\draw[domain=0:{\betaa-pi}]
plot (\x,{-sin(\x r)})
-- ({\betaa-pi},0)
-| (\alphaa,{sin(\alphaa r)})
[domain=\alphaa:pi]
plot (\x,{sin(\x r)});
% Io
\draw
[domain=\alphaa:\betaa,color=blue,thick]
plot (\x,{0.05 * (13.6*sin((\x - 0.646)*180/pi)
- 21.2*exp(-\x/0.754))});
\end{scope}
}
\node[right,color=red] at ({pi/2+pi/12},1.05) {$v_o$};
\node[right,color=blue] at ({pi/2+pi/3},0.8) {$i_o$};
\end{scope}
\end{tikzpicture}



\subsection{rotating}
\url{https://en.wikibooks.org/wiki/LaTeX/Rotations}
\includegraphics[width=3cm]{images/HSR}
\begin{sideways}
\includegraphics[width=3cm]{images/HSR}
\end{sideways}
\begin{turn}{30}
\includegraphics[width=3cm]{images/HSR}
\end{turn}
\begin{rotate}{30}
\includegraphics[width=3cm]{images/HSR}
\end{rotate}\\

\begin{table}[ht]
\centering
\rotatebox{30}{
\begin{minipage}{5cm}
\begin{tabular}{l|r}
Hallo & \textbf{Hallo}\\ \hline
\textit{Hallo} & Hallo \\
\end{tabular}
\end{minipage}
}
\caption{Rotated 30}
\end{table}


\subsection{hsrColor}
Verwendetes Package $\backslash$usepackage\{xcolor\} in \{header/hsrColors\}\newline
\url{https://en.wikibooks.org/wiki/LaTeX/Colors}\newline
$\backslash$colorbox\{Farbe\}\{Text\} \hspace{1cm} \textcolor{blue}{Text}\newline
$\backslash$textcolor\{Farbe\}\{Text\} \hspace{1cm} \colorbox{red}{Text}\newline
$\backslash$fcolorbox\{Randfarbe\}\{Innenfarbe\} \hspace{1cm} \fcolorbox{red}{white}{$a^{2} + b^{2} = c^{2}$}
\begin{multicols}{4}
\fcolorbox{white}{HSRBlue}{HSRBlue}\newline
\fcolorbox{white}{HSRBlue80}{HSRBlue80}\newline
\fcolorbox{white}{HSRBlue60}{HSRBlue60}\newline
\fcolorbox{white}{HSRBlue40}{HSRBlue40}\newline
\fcolorbox{white}{HSRBlue20}{HSRBlue20}\newline\\

\fcolorbox{white}{HSRLightGray}{HSRLightGray}\newline
\fcolorbox{white}{HSRLightGray80}{HSRLightGray80}\newline
\fcolorbox{white}{HSRLightGray60}{HSRLightGray60}\newline
\fcolorbox{white}{HSRLightGray40}{HSRLightGray40}\newline
\fcolorbox{white}{HSRLightGray20}{HSRLightGray20}\newline\\


\fcolorbox{white}{HSRSchwarz}{HSRSchwarz}\newline
\fcolorbox{white}{HSRSchwarz80}{HSRSchwarz80}\newline
\fcolorbox{white}{HSRSchwarz60}{HSRSchwarz60}\newline
\fcolorbox{white}{HSRSchwarz40}{HSRSchwarz40}\newline
\fcolorbox{white}{HSRSchwarz20}{HSRSchwarz20}\newline\\

\fcolorbox{white}{HSRHematite}{HSRHematite}\newline
\fcolorbox{white}{HSRHematite80}{HSRHematite80}\newline
\fcolorbox{white}{HSRHematite60}{HSRHematite60}\newline
\fcolorbox{white}{HSRHematite40}{HSRHematite40}\newline
\fcolorbox{white}{HSRHematite20}{HSRHematite20}\newline\\

\fcolorbox{white}{HSRLakeGreen}{HSRLakeGreen}\newline
\fcolorbox{white}{HSRLakeGreen80}{HSRLakeGreen80}\newline
\fcolorbox{white}{HSRLakeGreen60}{HSRLakeGreen60}\newline
\fcolorbox{white}{HSRLakeGreen40}{HSRLakeGreen40}\newline
\fcolorbox{white}{HSRLakeGreen20}{HSRLakeGreen20}\newline\\

\fcolorbox{white}{HSRReed}{HSRReed}\newline
\fcolorbox{white}{HSRReed80}{HSRReed80}\newline
\fcolorbox{white}{HSRReed60}{HSRReed60}\newline
\fcolorbox{white}{HSRReed40}{HSRReed40}\newline
\fcolorbox{white}{HSRReed20}{HSRReed20}\newline\\

\fcolorbox{white}{HSRPetrol}{HSRPetrol}\newline
\fcolorbox{white}{HSRPetrol80}{HSRPetrol80}\newline
\fcolorbox{white}{HSRPetrol60}{HSRPetrol60}\newline
\fcolorbox{white}{HSRPetrol40}{HSRPetrol40}\newline
\fcolorbox{white}{HSRPetrol20}{HSRPetrol20}\newline\\

\fcolorbox{white}{HSRBasswood}{HSRBasswood}\newline
\fcolorbox{white}{HSRBasswood80}{HSRBasswood80}\newline
\fcolorbox{white}{HSRBasswood60}{HSRBasswood60}\newline
\fcolorbox{white}{HSRBasswood40}{HSRBasswood40}\newline
\fcolorbox{white}{HSRBasswood20}{HSRBasswood20}\newline
\end{multicols}
%\fcolorbox{white}\newline
%\fcolorbox{white}\newline
%\fcolorbox{white}\newline

\clearpage
\subsection{listings}
\url{https://en.wikibooks.org/wiki/LaTeX/Source_Code_Listings}\newline
Beispielinclude eines Matlab-Skripts mit $\backslash$lstinputlisting[style=Matlab]\{Pfad\}
\lstinputlisting[style=Matlab]{sections/Handrechnung.m}
Mögliche Styles in dieser Vorlage sind:
\begin{itemize}
\item ASM
\item C
\item Cdoxy
\item Cpp
\item CppQT
\item Cppunit
\item Csharp
\item Java
\item Matlab
\item R
\item SQL
\item VHDL
\end{itemize}


\section*{Macros}
\subsection{tabImg}
$\backslash$tabImg[arg][pfad]\\
Kann verwendet werden wie $\backslash$includegraphics[width=3cm]\{images/HSR\}.\newline
tabImg kann in Tabellen verwendete werden, damit das Bild nicht oben an der Tabelle klebt

\subsection{Verswiese auf Skript}
$\backslash$buch\{name\} \hspace{1cm} \buch{Buch}\newline
$\backslash$buchSeite\{seite\} \hspace{1cm}\buchSeite{30}\newline
$\backslash$skript\{name\} \hspace{1cm} \skript{Skript}\newline
$\backslash$formelbuch\{seite\} \hspace{1cm} \formelbuch{50}\newline

\subsection{Todos}
$\backslash$todo\{arg\} \hspace{1cm} \todo{Makros überarbeiten}
20 changes: 20 additions & 0 deletions sections/Handrechnung.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%-----------------------------------------------------------------------
% Dateiname: Handrechnung.m
% Autor: Luca Mazzoleni
% Beschreibung: Handrechnung zur FEM-Analyse Clip
%-----------------------------------------------------------------------
clear;
%% Gegeben
ri = 12; %Innenradius
ra= 16; %Aussenradius
b=48; %Breite

lr=[0.1,0.2,0.3,0.4,0.5,0.6];
k=[1.006,1.025,1.058,1.109,1.183,1.293];
ki= interp1(lr,k,(l/r));

% Mb =-F*r*sin(phi);
Mb =-F*r*(cos(phi0)-cos(phi));
% fun = @(phi) Mb*r*(diff(Mb,F));
F=solve(Vy == 1/(E*Is)*int(Mb*r*(diff(Mb,F)),phi0,phi1),F);
Fe=double(F)

0 comments on commit 5a57cdd

Please sign in to comment.