Merge branch 'master' of ssh://git.breab.org:2223/kai/MasterArbeit

.gitignore

@@ -336,4 +336,6 @@ __pycache__/
 *.xsd.cs
 Contact GitHub API Training Shop Blog About
  2017 GitHub, Inc. Terms Privacy Security Status Help
+/Ausarbeitung/*.log
+/Ausarbeitung/Charts/*.log
 /3_PointCloud/opencv3/build/x86

.gitmodules

@@ -4,6 +4,7 @@
 [submodule "glTF"]
 	path = glTF
 	url = https://github.com/KhronosGroup/glTF.git
+	ignore = dirty
 [submodule "glTF-Sample-Models"]
 	path = glTF-Sample-Models
 	url = https://github.com/KhronosGroup/glTF-Sample-Models.git

Ausarbeitung/Charts/Erfahrung.txt

-Label	Minimum	Maximum	Mittelwert	Median	Q1	Q3
+Labels	Minimum	Maximum	Mittelwert	Median	Q1	Q3
 VR	-3	2	0.090909091	1	-1.75	1
 AR	-3	2	-2.090909091	-3	-3	-1

Ausarbeitung/Charts/Fehler.txt

+Q1	Minimum	Median	Mittelwert	Maximum	Q3
+0	0	0	0.272727273	1	0.5
+0	0	0	0.818181818	3	1

Ausarbeitung/Charts/Kommunikation.txt

+Q1	Minimum	Median	Mittelwert	Maximum	Q3
+1	0	3	2.090909091	3	3
+1	0	2	1.818181818	3	2.5
+3	2	3	2.818181818	3	3
+3	2	3	2.909090909	3	3

Ausarbeitung/Charts/KommunikationZeit.txt

+Q1	Minimum	Median	Mittelwert	Maximum	Q3
+10.5585	4.647	13.961	14.1607	28.973	16.31075
+8.79925	1.461	11.2665	12.2253	21.814	14.40925
+7.51375	4.545	7.93	8.9842	16.81	10.415
+8.85825	5.187	10.1075	9.942	13.248	11.026
+9.152	6.991	10.7435	13.0017	27.164	14.04825
+12.919	10.059	17.43	17.5238	25.422	21.974
+7.91475	6.97	11.2635	11.9977	26.929	12.401
+13.4695	8.2	16.9845	16.8248	26.037	19.7855
+9.40125	4.522	10.626	12.8108	31.14	14.30275
+9.70325	5.706	14.5715	13.566	24.172	15.4515
+7.2485	6.824	8.627	10.6568	24.539	11.15375
+12.249	7.856	13.909	13.9998	18.974	16.4155
+8.88475	7.494	10.09	12.0637	23.614	14.49375
+9.15575	5.85	10.9085	11.0296	18.23	11.74875
+11.94225	7.336	12.369	13.2102	22.227	14.6785
+8.7535	8.17	10.1115	11.1464	15.43	13.164
+9.1975	8.588	10.5985	13.2585	22.809	15.6425
+13.7345	10.327	15.7525	16.5527	25.449	18.88075
+9.075	7.538	11.9725	11.849	19.412	13.643
+7.82675	3.742	12.0995	11.5575	18.917	15.949
+10.20175	3.416	12.3745	12.5982	23.008	14.81675
+5.92375	5.409	7.7985	8.2756	12.871	9.8715
+8.64675	3.416	11.0115	12.23559091	31.14	14.731
+8.98825	1.461	12.4885	12.96759091	26.037	15.9685

Ausarbeitung/Charts/NASATLX.txt

+0	Q1	Minimum	Median	Mittelwert	Maximum	Q3
+1	10	5	30	39.54545455	80	72.5
+2	10	5	25	27.27272727	80	27.5
+3	35	15	50	49.54545455	90	70
+4	10	5	30	39.54545455	80	72.5
+5	0	0	0	0	0	0
+6	15	5	30	40.45454545	80	75
+7	20	5	30	33.18181818	70	45
+8	5	5	10	14.09090909	65	12.5
+9	12.5	5	20	26.36363636	75	32.5
+10	0	0	0	0	0	0
+11	22.5	5	40	40.45454545	85	55
+12	12.5	5	20	32.72727273	65	62.5
+13	25	10	30	37.72727273	85	50
+14	15	5	45	44.54545455	85	70
+15	0	0	0	0	0	0
+16	17.5	5	25	26.81818182	65	35
+17	7.5	5	10	15	45	17.5
+18	17.5	5	25	30.45454545	85	37.5
+19	7.5	5	20	25	75	32.5
+20	0	0	0	0	0	0
+21	17.5	5	35	39.09090909	85	62.5
+22	10	5	20	28.18181818	75	35
+23	15	5	20	34.54545455	80	60
+24	17.5	10	35	40	95	55
+25	0	0	0	0	0	0
+26	12.5	5	25	29.09090909	60	42.5
+27	7.5	5	10	14.54545455	45	15
+28	7.5	5	30	35.90909091	90	60
+29	7.5	5	15	29.09090909	70	50
+30	0	0	0	0	0	0
+31	22.91666667	8.333333333	37.5	37.72727273	67.5	52.91666667
+32	15.83333333	7.5	20	25.15151515	60	30.83333333
+33	20.83333333	13.33333333	21.66666667	33.71212121	65	48.75
+34	13.75	8.333333333	21.66666667	34.09090909	75.83333333	53.33333333

Ausarbeitung/Charts/Perspektive.txt

+Labels	Minimum	Maximum	Mittelwert	Median	Q1	Q3
+Unabhängigkeit -3	3	1.590909091	2	1	3

Ausarbeitung/Charts/SteinFinden.txt

+Q1	Minimum	Median	Mittelwert	Maximum	Q3
+0	-1	1	0.727272727	2	2
+1.5	0	2	2	3	3
+3	2	3	2.818181818	3	3
+1	-1	2	1.909090909	3	3

Ausarbeitung/Charts/Vorbereitung.txt

+Q1	Minimum	Median	Mittelwert	Maximum	Q3
+7.2785	4.647	8.1745	8.5634	13.091	10.1935
+2.119	0.812	3.591	4.0442	7.208	6.4855
+4.556	4.332	5.3425	6.6891	11.47	9.1155
+5.914	4.668	7.836	7.7071	11.299	9.33575
+5.28775	4.69	7.226	8.5639	21.244	9.1025
+9.242	6.959	10.0775	10.8225	17.163	10.98675
+6.5075	4.634	9.5045	11.2449	21.613	15.41675
+12.236	6.157	16.6605	19.1987	49.982	23.24475
+9.83975	4.522	11.53	13.2071	34.973	14.0455
+6.31275	5.376	6.602	7.5931	11.864	9.1185
+8.575	5.662	10.314	11.9318	18.563	16.54475
+8.631	7.081	9.2835	10.3164	20.119	10.3525
+7.28	4.736	9.5105	13.5017	40.222	16.37975
+4.926	2.864	8.3935	7.8274	11.764	10.561
+7.4315	6.287	8.041	8.9101	14.642	9.19525
+9.0945	7.132	15.692	19.5247	45.191	23.97475
+9.675	7.584	11.878	11.2807	14.711	12.6965
+8.99775	7.614	9.968	12.6659	24.077	15.21725
+6.44375	4.143	6.9975	7.662	14.731	8.33025
+6.48225	4.775	9.873	10.3623	18.792	13.85375
+5.7925	3.416	6.5775	7.3094	11.681	8.92075
+8.46725	6.503	10.459	11.1113	19.016	12.68775
+6.544	3.416	8.482	9.896736364	40.222	11.67025
+6.8465	0.812	9.3055	11.01578182	49.982	12.106

Ausarbeitung/Charts/Zusammenarbeit.txt

+Q1	Minimum	Median	Mittelwert	Maximum	Q3
+2	-1	2	2	3	2.5
+2	1	2	2.181818182	3	3
+1.5	-1	2	1.909090909	3	3
+2	-1	2	1.909090909	3	3

Ausarbeitung/thesis.tex

@@ -18,6 +18,8 @@
 \usepackage{listings}
 \usepackage{xcolor}
 
+ \usepackage{lscape} 
+
 \usepackage{pgfplots}
 \pgfplotsset{compat=newest}
 \usetikzlibrary{pgfplots.statistics}
@@ -37,10 +39,10 @@
 %% |  Information for PDF file   |
 %% -------------------------------
 \hypersetup{
- pdfauthor={Not set},
- pdftitle={Not set},
- pdfsubject={Not set},
- pdfkeywords={Not set}
+ pdfauthor={Kai Westerkamp},
+ pdftitle={Remote Assistance and Collaboration with 3D Point Clouds},
+ pdfsubject={Remote Assistance and Collaboration with 3D Point Clouds},
+ pdfkeywords={Masterarbeit, Kai Westerkamp, Point Clouds, Remote, Assistance, Kinect, Vive, VR, AR, HoloLens}
 }
 
 
@@ -54,6 +56,7 @@
 \newcommand{\reviewerone}{Prof. Dr.-Ing. Rainer Stiefelhagen}
 \newcommand{\reviewertwo}{XXXX}
 \newcommand{\advisor}{M.Sc. Adrian Hoppe}
+\newcommand{\sadvisor}{M.Sc. Sebastian Maier}
 
 \newcommand{\timestart}{01.06.2017}
 \newcommand{\timeend}{30.11.2017}
@@ -147,7 +150,7 @@
 \definecolor{delim}{RGB}{20,105,176}
 \colorlet{numb}{magenta!60!black}
 
-
+%https://tex.stackexchange.com/questions/117435/read-boxplot-prepared-values-from-a-table
 \pgfplotsset{
     boxplot prepared from table/.code={
         \def\tikz@plot@handler{\pgfplotsplothandlerboxplotprepared}%
@@ -171,10 +174,39 @@
         make style readable from table=upper quartile,
         make style readable from table=median,
         make style readable from table=lower notch,
-        make style readable from table=upper notch
+        make style readable from table=upper notch,
+        make style readable from table=average
+}
+
+\pgfplotsset{
+   boxplot/every median/.style={ultra thick,densely dotted}
 }
 
 
+\newcommand{\addBoxplot}[3]
+{\addplot+[boxplot prepared from table={
+    table=#1,
+    row=#2,
+    lower whisker=Minimum,
+    upper whisker=Maximum,
+    lower quartile=Q1,
+    upper quartile=Q3,
+    median=Median,
+   average=Mittelwert
+  },boxplot prepared , color=#3
+]
+coordinates {};}
+
+\definecolor{cvr}{HTML}{25788F}
+\definecolor{car}{HTML}{42BB94}
+\definecolor{cvl}{HTML}{E7A638}
+\definecolor{cve}{HTML}{EC6C36}
+
+\newcommand{\colorVR}{cvr}
+\newcommand{\colorAR}{car}
+\newcommand{\colorVideo}{cve}
+\newcommand{\colorVideoLocal}{cvl}
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Here, main documents begins %%

Ausarbeitung/thesisclass.cls

@@ -5,7 +5,7 @@
 %% Adapted by: Timo Rohrberg, 2009
 %% timo.rohrberg@student.kit.edu
 %%
-%% Additions by: Thorsten Haberecht, IPD - Chair Prof. Bhm, 2010
+%% Additions by: Thorsten Haberecht, IPD - Chair Prof. Böhm, 2010
 %% thorsten.haberecht@kit.edu
 
 
@@ -13,7 +13,7 @@
 \ProvidesClass{thesisclass}
 \LoadClass[a4paper,11pt,titlepage]{scrbook}	% Class based on scrbook
 
-\RequirePackage{ngerman}										% New german orthography
+%\RequirePackage{ngerman}										% New german orthography
 
 
 

Ausarbeitung/titlepage.tex

@@ -51,6 +51,7 @@
   \iflanguage{english}{Reviewer}{Erstgutachter}: & \hfill  & \reviewerone\\
   \iflanguage{english}{Second reviewer}{Zweitgutachter}: & \hfill  & \reviewertwo\\
   \iflanguage{english}{Advisor}{Betreuender Mitarbeiter}: & \hfill  & \advisor\\
+  \iflanguage{english}{Advisor}{Betreuender Mitarbeiter 2}: & \hfill  & \sadvisor\\
   %\iflanguage{english}{Second advisor}{Zweiter betreuender Mitarbeiter}: & \hfill  & \advisortwo\\
   % Der zweite betreuende Mitarbeiter kann weggelassen werden. 
 \end{tabular}