Commit 07df823e authored by icyrizard's avatar icyrizard

worked on theses and deleted unnecessary files

parent b15d2230
......@@ -4,3 +4,9 @@ www/sencha-touch-2.0.0-commercial/*
*.log
*.gz
*.aux
www/build/*
www/resources/sass/.sass-cache/*
*.pdf
*.bbl
*.out
*.blg
\beamer@endinputifotherversion {3.10pt}
\headcommand {\slideentry {0}{0}{1}{1/1}{}{0}}
\headcommand {\beamer@framepages {1}{1}}
\headcommand {\sectionentry {1}{Introductie}{2}{Introductie}{0}}
\headcommand {\beamer@sectionpages {1}{1}}
\headcommand {\beamer@subsectionpages {1}{1}}
\headcommand {\slideentry {1}{0}{2}{2/2}{}{0}}
\headcommand {\slideentry {0}{0}{2}{2/2}{}{0}}
\headcommand {\beamer@framepages {2}{2}}
\headcommand {\sectionentry {2}{Doel Flood Simulation Browser}{3}{Doel Flood Simulation Browser}{0}}
\headcommand {\beamer@sectionpages {2}{2}}
\headcommand {\beamer@subsectionpages {2}{2}}
\headcommand {\slideentry {2}{0}{3}{3/3}{}{0}}
\headcommand {\sectionentry {1}{Introductie}{3}{Introductie}{0}}
\headcommand {\beamer@sectionpages {1}{2}}
\headcommand {\beamer@subsectionpages {1}{2}}
\headcommand {\slideentry {1}{0}{3}{3/3}{}{0}}
\headcommand {\beamer@framepages {3}{3}}
\headcommand {\sectionentry {3}{De requirements}{4}{De requirements}{0}}
\headcommand {\sectionentry {2}{Doel Flood Simulation Browser}{4}{Doel Flood Simulation Browser}{0}}
\headcommand {\beamer@sectionpages {3}{3}}
\headcommand {\beamer@subsectionpages {3}{3}}
\headcommand {\slideentry {3}{0}{4}{4/4}{}{0}}
\headcommand {\slideentry {2}{0}{4}{4/4}{}{0}}
\headcommand {\beamer@framepages {4}{4}}
\headcommand {\sectionentry {4}{App Design}{5}{App Design}{0}}
\headcommand {\sectionentry {3}{Dit project}{5}{Dit project}{0}}
\headcommand {\beamer@sectionpages {4}{4}}
\headcommand {\beamer@subsectionpages {4}{4}}
\headcommand {\slideentry {4}{0}{5}{5/5}{}{0}}
\headcommand {\slideentry {3}{0}{5}{5/5}{}{0}}
\headcommand {\beamer@framepages {5}{5}}
\headcommand {\sectionentry {5}{Platform keuze}{6}{Platform keuze}{0}}
\headcommand {\sectionentry {4}{App Design}{6}{App Design}{0}}
\headcommand {\beamer@sectionpages {5}{5}}
\headcommand {\beamer@subsectionpages {5}{5}}
\headcommand {\slideentry {5}{0}{6}{6/6}{}{0}}
\headcommand {\slideentry {4}{0}{6}{6/6}{}{0}}
\headcommand {\beamer@framepages {6}{6}}
\headcommand {\sectionentry {6}{Implementatie}{7}{Implementatie}{0}}
\headcommand {\sectionentry {5}{Platform keuze}{7}{Platform keuze}{0}}
\headcommand {\beamer@sectionpages {6}{6}}
\headcommand {\beamer@subsectionpages {6}{6}}
\headcommand {\slideentry {6}{0}{7}{7/7}{}{0}}
\headcommand {\slideentry {5}{0}{7}{7/7}{}{0}}
\headcommand {\beamer@framepages {7}{7}}
\headcommand {\sectionentry {6}{Implementatie}{8}{Implementatie}{0}}
\headcommand {\beamer@sectionpages {7}{7}}
\headcommand {\beamer@subsectionpages {7}{7}}
\headcommand {\slideentry {6}{0}{8}{8/8}{}{0}}
\headcommand {\beamer@framepages {8}{8}}
\headcommand {\slideentry {6}{0}{9}{9/9}{}{0}}
......@@ -41,26 +41,28 @@
\headcommand {\beamer@framepages {11}{11}}
\headcommand {\slideentry {6}{0}{12}{12/12}{}{0}}
\headcommand {\beamer@framepages {12}{12}}
\headcommand {\sectionentry {7}{Server Testing}{13}{Server Testing}{0}}
\headcommand {\beamer@sectionpages {7}{12}}
\headcommand {\beamer@subsectionpages {7}{12}}
\headcommand {\slideentry {7}{0}{13}{13/13}{}{0}}
\headcommand {\slideentry {6}{0}{13}{13/13}{}{0}}
\headcommand {\beamer@framepages {13}{13}}
\headcommand {\sectionentry {7}{Server Testing}{14}{Server Testing}{0}}
\headcommand {\beamer@sectionpages {8}{13}}
\headcommand {\beamer@subsectionpages {8}{13}}
\headcommand {\slideentry {7}{0}{14}{14/14}{}{0}}
\headcommand {\beamer@framepages {14}{14}}
\headcommand {\slideentry {7}{0}{15}{15/15}{}{0}}
\headcommand {\beamer@framepages {15}{15}}
\headcommand {\slideentry {7}{0}{16}{16/16}{}{0}}
\headcommand {\beamer@framepages {16}{16}}
\headcommand {\sectionentry {8}{Referenties}{17}{Referenties}{0}}
\headcommand {\beamer@sectionpages {13}{16}}
\headcommand {\beamer@subsectionpages {13}{16}}
\headcommand {\slideentry {8}{0}{17}{17/17}{}{0}}
\headcommand {\slideentry {7}{0}{17}{17/17}{}{0}}
\headcommand {\beamer@framepages {17}{17}}
\headcommand {\sectionentry {8}{Referenties}{18}{Referenties}{0}}
\headcommand {\beamer@sectionpages {14}{17}}
\headcommand {\beamer@subsectionpages {14}{17}}
\headcommand {\slideentry {8}{0}{18}{18/18}{}{0}}
\headcommand {\beamer@framepages {18}{18}}
\headcommand {\beamer@partpages {1}{18}}
\headcommand {\beamer@subsectionpages {17}{18}}
\headcommand {\beamer@sectionpages {17}{18}}
\headcommand {\beamer@documentpages {18}}
\headcommand {\def \inserttotalframenumber {18}}
\headcommand {\slideentry {8}{0}{19}{19/19}{}{0}}
\headcommand {\beamer@framepages {19}{19}}
\headcommand {\beamer@partpages {1}{19}}
\headcommand {\beamer@subsectionpages {18}{19}}
\headcommand {\beamer@sectionpages {18}{19}}
\headcommand {\beamer@documentpages {19}}
\headcommand {\def \inserttotalframenumber {19}}
......@@ -34,9 +34,9 @@
\item Burgers en Hulpdiensten
\item Steeds Belangrijker
\item Sensoren in dijk + Internet
\item Hoogte Kaart
\item Water Simulatie
\item Voorlichting met multi-touch table
\item Water Simulatie
\item Hoogte Kaart
\end{itemize}
\column{2.0in}
\begin{figure}
......@@ -120,9 +120,8 @@
\end{itemize}
\item Nadelen vooraf
\begin{itemize}
\item Verschilt veel met huidige persoonlijke kennis webtechnologiën
\item Highlevel specificatie
\item Mogelijk onvoorziene problemen
\item Verschilde veel met persoonlijke kennis van webtalen
\item Mogelijk onvoorziene problemen m.b.t. performance
\end{itemize}
\end{itemize}
\end{frame}
......@@ -136,7 +135,7 @@
\item Download sencha touch + SDK Tools (command line tool)
\item Start met leeg project: \\ \texttt{\$ sencha generate app my\_app}
\item Layouts bieden layout
\item Flex 1, 2
\item layout: hbox / vbox, Flex 1, 2
\item List Objecten
\item Map Object
\end{itemize}
......@@ -218,7 +217,9 @@
\frametitle{Test in Browser}
\begin{itemize}
\item Tool: Siege
\item \url{sangkil.science.uva.nl}
\item Server: \url{sangkil.science.uva.nl} (E5620 Xeon Duo @2.4 Ghz, 32 GB Ram)
\item Bottle necks vermijden: \url{mangkus.science.uva.nl}
\item Praktisch naast elkaar
\item file met verschillende requests, random uitgevoerd
\item Concurrente processen
\item Herhalingen
......
\begin {itemize}
\frametitle {Test in Browser}
\begin{itemize}
\item Tool: Siege
\item \url{sangkil.science.uva.nl}
\item Server: \url{sangkil.science.uva.nl} (E5620 Xeon Duo @2.4 Ghz, 32 GB Ram)
\item Bottle necks vermijden: \url{mangkus.science.uva.nl}
\item Praktisch naast elkaar
\item file met verschillende requests, random uitgevoerd
\item Concurrente processen
\item Herhalingen
......
......@@ -2,7 +2,6 @@ scriptie.tex: title.tex fsb.tex area_api.tex references.bbl
%.pdf: %.tex
pdflatex $^
pdflatex $^
%.bbl: %.bib
pdflatex scriptie.tex
......
This diff is collapsed.
......@@ -4,8 +4,8 @@
}
@misc{Titanium-Appcelerator,
title = "Appcelerator, \url{http://www.appcelerator.com/}",
url = "\url{http://www.appcelerator.com/}",
title = "Appcelerator",
note = "\url{http://www.appcelerator.com/}",
}
@article{memoryleak,
......@@ -16,7 +16,6 @@
@misc{CSS3,
title = "Check CSS3 Support",
note = "\url{http://www.caniuse.com/}",
}
......@@ -34,7 +33,7 @@
@misc{PhoneGap,
title = "PhoneGap, ",
title = "PhoneGap",
note = "\url{http://www.phonegap.com/}",
}
......@@ -48,12 +47,83 @@
note = "\url{http://www.joedog.org/siege-home/}",
}
@misc{UbanFlood,
@misc{UrbanFlood,
title = "The UrbanFlood Project",
note = "\url{http://www.urbanflood.eu/Pages/default.aspx}"
}
@misc{ipad,
title= "iPad information page",
note="\url{http://en.wikipedia.org/wiki/IPad}"
}
@misc{android,
title="Android information Page",
note="\url{http://en.wikipedia.org/wiki/Google_Android}"
}
@misc{wallingford,
title="HR Wallingford",
note="\url{http://www.hrwallingford.com/site/}"
}
@misc{GUI,
title="GUI definition",
author="Linux Information Project",
year = "2004",
note= "Retrieved 10 June 2012"
}
@book{REST,
title="Fielding Dissertation",
author="R. T. Fielding",
chapter="5",
year = "2000",
}
@misc{JSON,
title= "Introducing JSON",
author = "Crockford, D.",
year = "2009",
note= "\url{json.org}, Retrieved May 12, 2012"
}
@misc{CSV,
title= "Common Format and MIME Type for Comma-Separated Values (CSV) Files",
author=" Y. Shafranovich",
year="2005",
note="Retrieved April 20, 2012"
}
@misc{HTML5,
title = "HTML 5, A vocabulary and associated APIs for HTML and XHTML",
author = "W3C",
note="Retrieved April 11, 2012"
}
@misc{SDK,
title="SDK wiki",
note = "\url{http://en.wikipedia.org/wiki/Software_development_kit}"
}
@misc{webkit,
title="The Webkit Open Source Project",
note="\url{http://www.webkit.org/}",
}
@misc{MVC,
title= "The DCI Architecture: A New Vision of Object-Oriented Programming",
author="Trygve Reenskaug and James O. Coplien"
}
@misc{eclipse,
title="Eclipse",
note="\url{http://www.eclipse.org/}",
}
@misc{xcode,
title="Xcode",
note="\url{https://developer.apple.com/xcode/}",
}
%http://www.sencha.com/products/touch
......
......@@ -52,7 +52,7 @@
\newpage
\begin{abstract}
This project covers the implementation of a cross-platform application, designed specifically for tablets, that will aid the urban flood project in viewing simulated floods. This application already existed on a multi-touch table, which is not easily portable. To reach to goal of mobility and to be able to reach more public, tablets have the same interaction features as the multi-touch table and are therefore chosen to reach this goal. Sencha Touch 2 was found to be the best option at first but did not suffice the expectations. A side objective is to test how many peers the back-end server can handle at ones, the response time of the server goes up fast which means that a problem can occur when more clients are requesting data.
In this thesis we discuss the design and implementation of a cross platform application, designed specifically for tablets, that assists the UrbanFlood project in making simulated flood more accessible for viewing. This application for viewing simulated floods was already available on the multi-touch table, which is not easily transportable. To reach to goal of mobility, and to reach a larger audience, it is desirable to have a more portable instrument for viewing. As tablets have the same interaction features as the mult-touc table, they are the ultimate tool to achieve this goal. Sencha Touch 2 was found to be the best option at first, but a more in-depth study showed that it could live up to the expectations. A second objective of the present study is to test how many clients can be handled by the back end server at ones. Tests show that the response time goes up considerably with the number of users, which shows that there are also server side problems to be solved before widely applying the developed software.
\end{abstract}
\input{fsb}
......
......@@ -5,17 +5,17 @@ Ext.Loader.setPath({
//</debug>
Ext.application({
controllers: ["Lsm", "Main", "ChartController"],
controllers: ["Main", "ChartController"],
models: ["SimulationModel", "SimulationDetails"],
stores: ['SimulationStore', 'SimulationDetailsStore', 'SimulationsSummary', 'LsmStore'],
stores: ['SimulationStore', 'FloodDetailStore', 'SimulationsSummary', 'LsmStore', 'chartStore'],
name: 'app',
requires: [
'Ext.MessageBox', 'app.CustomProxy'
'Ext.MessageBox',
],
views: ['Main', "Home", "Simulation", "List", 'Map', 'StepsOverlay', 'OptionsPanel',
views: ['Main', "Simulation", "List", 'Map', 'StepsOverlay', 'OptionsPanel',
'SimulationList', 'LsmSimulationList', 'Chart'],
icon: {
......
......@@ -32,5 +32,22 @@ Ext.define('app.Api', {
console.log('getCsvFile: failed to get csv file');
}
});
},
requestInfo: function(test_id, callback, url){
var url = url || 'http://sangkil.science.uva.nl:8003/drfsm/'+ test_id +'/info.json';
var request = Ext.Ajax.request({
method: 'GET',
url: url,//'http://sangkil.science.uva.nl:8003/drfsm/'+ test_id +'/info.json',
success: function(response, opts){
var result = Ext.decode(response.responseText);
callback(result);
},
failure: function(){
console.log('failed to create images');
}
});
}
});
\ No newline at end of file
Ext.define('app.chartData', {
singleton: true,
init: function(){
self.csvFiles = new Array();
},
setCsvFile: function(file){
self.csvFiles.push(file)
}
});
\ No newline at end of file
Ext.define('app.controller.Lsm', {
extend: 'Ext.app.Controller',
config: {
refs: {
},
control: {
}
},
//called when the Application is launched, remove if not needed
launch: function(app) {
}
});
\ No newline at end of file
Ext.define('app.helper.Map', {
xtype: 'MapHelper',
func: function(){
console.log(func);
}
});
\ No newline at end of file
Ext.define('app.view.Home', {
extend: "Ext.tab.Panel",
xtype: 'homepanel',
config: {
title: 'Home',
iconCls: 'home',
styleHtmlContent: true,
scrollable: true,
html: [
'<h1>Home Page</h1>',
'<p>This the home page<p>',
].join('')
}
});
\ No newline at end of file
......@@ -8,8 +8,15 @@ Ext.define('app.view.Map', {
mapOptions : {
zoom : 12,
center: new google.maps.LatLng(52.354453, 4.95536),
mapTypeId : google.maps.MapTypeId.ROADMAP,
navigationControl: true,
scrollwheel: true,
scaleControl: true,
rotateControl: true,
panControl: true,
overviewMapControl: true,
zoomControl: true,
navigationControlOptions: {
style: google.maps.NavigationControlStyle.DEFAULT
}
......
......@@ -13,7 +13,6 @@ Ext.define('app.view.Simulation', {
},
{
xtype: 'SimulationMap',
flex: 2,
}],
}
});
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>11D50</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>My Application</string>
<key>CFBundleExecutable</key>
<string>stbuild_template</string>
<key>CFBundleIconFiles</key>
<array>
<string>resources/icons/Icon~ipad.png</string>
</array>
<key>CFBundleIdentifier</key>
<string>com.codefabriek.tipspottmp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>My Application</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleResourceSpecification</key>
<string>ResourceRules.plist</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>9A334</string>
<key>DTPlatformName</key>
<string>iphoneos</string>
<key>DTPlatformVersion</key>
<string>5.0</string>
<key>DTSDKBuild</key>
<string>9A334</string>
<key>DTSDKName</key>
<string>iphoneos5.0</string>
<key>DTXcode</key>
<string>0420</string>
<key>DTXcodeBuild</key>
<string>4D199</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
<string>3.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer><integer>2</integer>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
</dict>
</plist>
APPL????
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
{"id":"b67f2b40-7fd3-11e1-bda5-b5b6c868e529","js":[{"path":"sdk/sencha-touch.js","type":"js"},{"path":"app.js","update":"delta","type":"js"}],"css":[{"path":"resources/css/app.css","update":"delta","type":"css"}]}
\ No newline at end of file
<!DOCTYPE HTML>
<html manifest="" lang="en-US">
<head>
<meta charset="UTF-8">
<title>Floodsimulation Browser</title>
<style type="text/css">
/**
* Example of an initial loading indicator.
* It is recommended to keep this as minimal as possible to provide instant feedback
* while other resources are still being loaded for the first time
*/
html, body {
height: 100%;
}
#appLoadingIndicator {
position: absolute;
top: 50%;
left: 50%;
margin-top: -10px;
margin-left: -50px;
width: 100px;
height: 20px;
}
#appLoadingIndicator > * {
background-color: #FFFFFF;
float: left;
height: 20px;
margin-left: 11px;
width: 20px;
-webkit-animation-name: appLoadingIndicator;
-webkit-border-radius: 13px;
-webkit-animation-duration: 0.8s;
-webkit-animation-iteration-count: infinite;
-webkit-animation-direction: linear;
opacity: 0.3
}
#appLoadingIndicator > :nth-child(1) {
-webkit-animation-delay: 0.18s;
}
#appLoadingIndicator > :nth-child(2) {
-webkit-animation-delay: 0.42s;
}
#appLoadingIndicator > :nth-child(3) {
-webkit-animation-delay: 0.54s;
}
@-webkit-keyframes appLoadingIndicator{
0% {
opacity: 0.3
}
50% {
opacity: 1;
background-color:#1985D0
}
100% {
opacity:0.3
}
}
.x-container .x-scroll-view{
border-right: solid #ababab;
}
.flood_thumb {
position: absolute;
z-index: 100;
left: 10px;
top: 10px;
border: solid #ababab;
}
.map_thumb {
position: relative;
left: 0px;
top: 0px;
}
#overlay {
border: solid;
border-width: 1px;
border-color: #a9a9a9;
}
.x-button-icon.down.x-icon-mask {
background: url(up.png);
}
</style>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>
<script type="text/javascript">(function(h){function f(c,d){document.write('<meta name="'+c+'" content="'+d+'">')}if("undefined"===typeof g)var g=h.Ext={};g.blink=function(c){var d=c.js||[],c=c.css||[],b,e,a;f("viewport","width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no");f("apple-mobile-web-app-capable","yes");f("apple-touch-fullscreen","yes");for(b=0,e=c.length;b<e;b++)a=c[b],"string"!=typeof a&&(a=a.path),document.write('<link rel="stylesheet" href="'+a+'">');for(b=0,e=d.length;b<
e;b++)a=d[b],"string"!=typeof a&&(a=a.path),document.write('<script src="'+a+'"><\/script>')}})(this);
;Ext.blink({"id":"b67f2b40-7fd3-11e1-bda5-b5b6c868e529","js":[{"path":"sdk/sencha-touch.js","type":"js"},{"path":"app.js","update":"delta","type":"js"}],"css":[{"path":"resources/css/app.css","update":"delta","type":"css"}]})</script>
</head>
<body>
<div id="appLoadingIndicator">
<div></div>
<div></div>
<div></div>
</div>
</body>
</html>
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -124,6 +124,8 @@
<script type="text/javascript">(function(h){function f(c,d){document.write('<meta name="'+c+'" content="'+d+'">')}if("undefined"===typeof g)var g=h.Ext={};g.blink=function(c){var d=c.js||[],c=c.css||[],b,e,a;f("viewport","width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no");f("apple-mobile-web-app-capable","yes");f("apple-touch-fullscreen","yes");for(b=0,e=c.length;b<e;b++)a=c[b],"string"!=typeof a&&(a=a.path),document.write('<link rel="stylesheet" href="'+a+'">');for(b=0,e=d.length;b<
e;b++)a=d[b],"string"!=typeof a&&(a=a.path),document.write('<script src="'+a+'"><\/script>')}})(this);
;Ext.blink({"id":"b67f2b40-7fd3-11e1-bda5-b5b6c868e529","js":[{"path":"sdk/sencha-touch.js","type":"js"},{"path":"app.js","update":"delta","type":"js"}],"css":[{"path":"resources/css/app.css","update":"delta","type":"css"}]})</script>
<script type="text/javascript" src="sdk/touch-charts.js"></script>
</head>
<body>
<div id="appLoadingIndicator">
......@@ -132,4 +134,5 @@ e;b++)a=d[b],"string"!=typeof a&&(a=a.path),document.write('<script src="'+a+'">
<div></div>
</div>
</body>
</html>
This diff is collapsed.
This diff is collapsed.
......@@ -123,6 +123,7 @@
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>
<script id="microloader" type="text/javascript" src="sdk/microloader/development.js"></script>
<script type="text/javascript" src="sdk/touch-charts.js"></script>
</head>
<body>
<div id="appLoadingIndicator">
......
......@@ -63,7 +63,7 @@
* - Android
* - AndroidEmulator
*/
"platform":"Android",
"platform":"iOS",
/**
* @cfg {String} deviceType
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment