Browse Source

changed description for color part

Taco 1 year ago
parent
commit
d18c231505
2 changed files with 57 additions and 59 deletions
  1. 52 53
      entitlements.html
  2. 5 6
      entitlements.org

+ 52 - 53
entitlements.html

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2018-03-30 Fri 14:41 -->
6
+<!-- 2018-03-30 Fri 14:46 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title>&lrm;</title>
@@ -233,45 +233,45 @@ for the JavaScript code in this tag.
233 233
 <h2>Table of Contents</h2>
234 234
 <div id="text-table-of-contents">
235 235
 <ul>
236
-<li><a href="#orgff08dfe">1. Introduction</a></li>
237
-<li><a href="#org28b1e07">2. Data Model</a>
236
+<li><a href="#orgee45230">1. Introduction</a></li>
237
+<li><a href="#org0af4373">2. Data Model</a>
238 238
 <ul>
239
-<li><a href="#org0e5af42">2.1. Example wallet profile</a>
239
+<li><a href="#orgff579c3">2.1. Example wallet profile</a>
240 240
 <ul>
241
-<li><a href="#org042bacb">2.1.1. Things to further investigate</a></li>
241
+<li><a href="#orgab32aa1">2.1.1. Things to further investigate</a></li>
242 242
 </ul>
243 243
 </li>
244
-<li><a href="#org928acd2">2.2. Example request</a>
244
+<li><a href="#org74062a1">2.2. Example request</a>
245 245
 <ul>
246
-<li><a href="#org42aec5f">2.2.1. Things to further investigate</a></li>
246
+<li><a href="#org40a8d59">2.2.1. Things to further investigate</a></li>
247 247
 </ul>
248 248
 </li>
249 249
 </ul>
250 250
 </li>
251
-<li><a href="#org44a6fc1">3. Data Comparison</a>
251
+<li><a href="#org7f0f0a5">3. Data Comparison</a>
252 252
 <ul>
253 253
 <li>
254 254
 <ul>
255
-<li><a href="#org727d9ba">3.0.1. Things to further investigate</a></li>
255
+<li><a href="#orge7e25f4">3.0.1. Things to further investigate</a></li>
256 256
 </ul>
257 257
 </li>
258 258
 </ul>
259 259
 </li>
260
-<li><a href="#orgc55d352">4. Visualization</a>
260
+<li><a href="#org3d8fb67">4. Visualization</a>
261 261
 <ul>
262
-<li><a href="#orgf38f954">4.1. Request</a></li>
263
-<li><a href="#org54b7a22">4.2. Contexts</a>
262
+<li><a href="#org1917997">4.1. Request</a></li>
263
+<li><a href="#org29c0efa">4.2. Contexts</a>
264 264
 <ul>
265
-<li><a href="#org80b30aa">4.2.1. Things to further investigate</a></li>
265
+<li><a href="#org23da441">4.2.1. Things to further investigate</a></li>
266 266
 </ul>
267 267
 </li>
268 268
 </ul>
269 269
 </li>
270
-<li><a href="#orgea7a75f">5. Interaction</a>
270
+<li><a href="#orgbd26647">5. Interaction</a>
271 271
 <ul>
272 272
 <li>
273 273
 <ul>
274
-<li><a href="#org344618a">5.0.1. Things to further investigate</a></li>
274
+<li><a href="#org0872f53">5.0.1. Things to further investigate</a></li>
275 275
 </ul>
276 276
 </li>
277 277
 </ul>
@@ -279,8 +279,8 @@ for the JavaScript code in this tag.
279 279
 </ul>
280 280
 </div>
281 281
 </div>
282
-<div id="outline-container-orgff08dfe" class="outline-2">
283
-<h2 id="orgff08dfe"><span class="section-number-2">1</span> Introduction</h2>
282
+<div id="outline-container-orgee45230" class="outline-2">
283
+<h2 id="orgee45230"><span class="section-number-2">1</span> Introduction</h2>
284 284
 <div class="outline-text-2" id="text-1">
285 285
 <p>
286 286
 The purpose of this document is to investigate possible User Interaction designs for Decode task 4.4.
@@ -289,12 +289,12 @@ More specifically the focus is on investigating how the user of a decode wallet
289 289
 </div>
290 290
 </div>
291 291
 
292
-<div id="outline-container-org28b1e07" class="outline-2">
293
-<h2 id="org28b1e07"><span class="section-number-2">2</span> Data Model</h2>
292
+<div id="outline-container-org0af4373" class="outline-2">
293
+<h2 id="org0af4373"><span class="section-number-2">2</span> Data Model</h2>
294 294
 <div class="outline-text-2" id="text-2">
295 295
 </div>
296
-<div id="outline-container-org0e5af42" class="outline-3">
297
-<h3 id="org0e5af42"><span class="section-number-3">2.1</span> Example wallet profile</h3>
296
+<div id="outline-container-orgff579c3" class="outline-3">
297
+<h3 id="orgff579c3"><span class="section-number-3">2.1</span> Example wallet profile</h3>
298 298
 <div class="outline-text-3" id="text-2-1">
299 299
 <p>
300 300
 This sample wallet profile datastructure consists of multiple contexts.
@@ -307,7 +307,7 @@ Each context has a name and groups on or more properties that consist of a well
307 307
 A type can be part of more than one context. 
308 308
 </p>
309 309
 <div class="org-src-container">
310
-<pre class="src src-js" id="org4d65cc2"><span style="color: #4f97d7; font-weight: bold;">var</span> <span style="color: #7590db;">profile</span> = <span style="color: #4f97d7;">{</span>
310
+<pre class="src src-js" id="orgfeaf3a4"><span style="color: #4f97d7; font-weight: bold;">var</span> <span style="color: #7590db;">profile</span> = <span style="color: #4f97d7;">{</span>
311 311
     contexts : 
312 312
     <span style="color: #bc6ec5;">[</span>
313 313
         <span style="color: #2d9574;">{</span>
@@ -357,8 +357,8 @@ process.stdout.write<span style="color: #4f97d7;">(</span>JSON.stringify<span st
357 357
 </div>
358 358
 </div>
359 359
 
360
-<div id="outline-container-org042bacb" class="outline-4">
361
-<h4 id="org042bacb"><span class="section-number-4">2.1.1</span> Things to further investigate</h4>
360
+<div id="outline-container-orgab32aa1" class="outline-4">
361
+<h4 id="orgab32aa1"><span class="section-number-4">2.1.1</span> Things to further investigate</h4>
362 362
 <div class="outline-text-4" id="text-2-1-1">
363 363
 <ul class="org-ul">
364 364
 <li>Make a big list of possible property types (at least properties that are used in Gebied Online)</li>
@@ -373,15 +373,15 @@ process.stdout.write<span style="color: #4f97d7;">(</span>JSON.stringify<span st
373 373
 </div>
374 374
 </div>
375 375
 
376
-<div id="outline-container-org928acd2" class="outline-3">
377
-<h3 id="org928acd2"><span class="section-number-3">2.2</span> Example request</h3>
376
+<div id="outline-container-org74062a1" class="outline-3">
377
+<h3 id="org74062a1"><span class="section-number-3">2.2</span> Example request</h3>
378 378
 <div class="outline-text-3" id="text-2-2">
379 379
 <p>
380 380
 This sample application request consists of an application name, a set of required property types and a set of optional property types.
381 381
 </p>
382 382
 
383 383
 <div class="org-src-container">
384
-<pre class="src src-js" id="orgf80361e"><span style="color: #4f97d7; font-weight: bold;">var</span> <span style="color: #7590db;">request</span> = <span style="color: #4f97d7;">{</span>
384
+<pre class="src src-js" id="org3ad9afe"><span style="color: #4f97d7; font-weight: bold;">var</span> <span style="color: #7590db;">request</span> = <span style="color: #4f97d7;">{</span>
385 385
     application : <span style="color: #2d9574;">"decodeapp:facebook"</span>,
386 386
     required : <span style="color: #bc6ec5;">[</span><span style="color: #2d9574;">"decode:name"</span>, <span style="color: #2d9574;">"decode:email"</span>, <span style="color: #2d9574;">"decode:address"</span><span style="color: #bc6ec5;">]</span>,
387 387
     optional : <span style="color: #bc6ec5;">[</span><span style="color: #2d9574;">"decode:phone"</span><span style="color: #bc6ec5;">]</span>
@@ -392,8 +392,8 @@ process.stdout.write<span style="color: #4f97d7;">(</span>data<span style="color
392 392
 </div>
393 393
 </div>
394 394
 
395
-<div id="outline-container-org42aec5f" class="outline-4">
396
-<h4 id="org42aec5f"><span class="section-number-4">2.2.1</span> Things to further investigate</h4>
395
+<div id="outline-container-org40a8d59" class="outline-4">
396
+<h4 id="org40a8d59"><span class="section-number-4">2.2.1</span> Things to further investigate</h4>
397 397
 <div class="outline-text-4" id="text-2-2-1">
398 398
 <ul class="org-ul">
399 399
 <li>Create a generator that seeds a request with random required and optional property types</li>
@@ -404,8 +404,8 @@ process.stdout.write<span style="color: #4f97d7;">(</span>data<span style="color
404 404
 </div>
405 405
 </div>
406 406
 
407
-<div id="outline-container-org44a6fc1" class="outline-2">
408
-<h2 id="org44a6fc1"><span class="section-number-2">3</span> Data Comparison</h2>
407
+<div id="outline-container-org7f0f0a5" class="outline-2">
408
+<h2 id="org7f0f0a5"><span class="section-number-2">3</span> Data Comparison</h2>
409 409
 <div class="outline-text-2" id="text-3">
410 410
 <p>
411 411
 During the interaction we want to give the user insight into a couple of things;
@@ -421,7 +421,7 @@ In below ruby code a comparison is made by on creating the intersection and its
421 421
 </p>
422 422
 
423 423
 <div class="org-src-container">
424
-<pre class="src src-ruby" id="org154264d"><span style="color: #4f97d7;">require</span> <span style="color: #2d9574;">'json'</span>
424
+<pre class="src src-ruby" id="org324c7a4"><span style="color: #4f97d7;">require</span> <span style="color: #2d9574;">'json'</span>
425 425
   <span style="color: #4f97d7;">require</span> <span style="color: #2d9574;">'nokogiri'</span> <span style="color: #2aa1ae; background-color: #292e34;">#</span><span style="color: #2aa1ae; background-color: #292e34;">for creating xml</span>
426 426
 
427 427
   request = <span style="color: #ce537a; font-weight: bold;">JSON</span>.parse<span style="color: #4f97d7;">(</span>request_data<span style="color: #4f97d7;">)</span>
@@ -442,8 +442,8 @@ In below ruby code a comparison is made by on creating the intersection and its
442 442
 </div>
443 443
 </div>
444 444
 
445
-<div id="outline-container-org727d9ba" class="outline-4">
446
-<h4 id="org727d9ba"><span class="section-number-4">3.0.1</span> Things to further investigate</h4>
445
+<div id="outline-container-orge7e25f4" class="outline-4">
446
+<h4 id="orge7e25f4"><span class="section-number-4">3.0.1</span> Things to further investigate</h4>
447 447
 <div class="outline-text-4" id="text-3-0-1">
448 448
 <ul class="org-ul">
449 449
 <li>Calculate the weight of each context before and after giving permission</li>
@@ -462,8 +462,8 @@ request is size 3
462 462
 </div>
463 463
 </div>
464 464
 
465
-<div id="outline-container-orgc55d352" class="outline-2">
466
-<h2 id="orgc55d352"><span class="section-number-2">4</span> Visualization</h2>
465
+<div id="outline-container-org3d8fb67" class="outline-2">
466
+<h2 id="org3d8fb67"><span class="section-number-2">4</span> Visualization</h2>
467 467
 <div class="outline-text-2" id="text-4">
468 468
 <p>
469 469
 We want to visualize the following things;
@@ -506,7 +506,7 @@ A preliminary definition of 6 context types (ordered from the self outwards, but
506 506
 </ul>
507 507
 
508 508
 <div class="org-src-container">
509
-<pre class="src src-java" id="org0bc2591"><span style="color: #2aa1ae; background-color: #292e34;">//</span><span style="color: #2aa1ae; background-color: #292e34;">color definitions</span>
509
+<pre class="src src-java" id="org2b44fce"><span style="color: #2aa1ae; background-color: #292e34;">//</span><span style="color: #2aa1ae; background-color: #292e34;">color definitions</span>
510 510
 <span style="color: #ce537a; font-weight: bold;">color</span> <span style="color: #7590db;">a3</span> = #<span style="color: #a45bad;">3A3B58</span>;
511 511
 <span style="color: #ce537a; font-weight: bold;">color</span> <span style="color: #7590db;">b3</span> = #<span style="color: #a45bad;">734246</span>;
512 512
 <span style="color: #ce537a; font-weight: bold;">color</span> <span style="color: #7590db;">d3</span> = #B4561F;
@@ -586,12 +586,11 @@ A preliminary definition of 6 context types (ordered from the self outwards, but
586 586
 </div>
587 587
 
588 588
 <p>
589
-Below snippet is an exemplifies the color getColor(PrivacyLevel.SECRET, ContextType.SELF);
590
-And should be a dark red color.
589
+Below snippet exemplifies a color for the SELF context with a privacy level SECRET, and should be a dark red color.
591 590
 </p>
592 591
 
593 592
 <div class="org-src-container">
594
-<pre class="src src-java" id="orga52ded4"><span style="color: #ce537a; font-weight: bold;">void</span> <span style="color: #bc6ec5; font-weight: bold;">draw</span><span style="color: #4f97d7;">(){</span>
593
+<pre class="src src-java" id="orgc332fb0"><span style="color: #ce537a; font-weight: bold;">void</span> <span style="color: #bc6ec5; font-weight: bold;">draw</span><span style="color: #4f97d7;">(){</span>
595 594
   size<span style="color: #bc6ec5;">(</span><span style="color: #a45bad;">100</span>,<span style="color: #a45bad;">100</span><span style="color: #bc6ec5;">)</span>;
596 595
   background<span style="color: #bc6ec5;">(</span><span style="color: #a45bad;">0</span><span style="color: #bc6ec5;">)</span>;
597 596
   noStroke<span style="color: #bc6ec5;">()</span>;
@@ -695,11 +694,11 @@ void draw(){
695 694
 </script> <canvas id="ob-e4084f25c6566c618f6cc091e4920fd86e9b1c21"></canvas>
696 695
 </div>
697 696
 
698
-<div id="outline-container-orgf38f954" class="outline-3">
699
-<h3 id="orgf38f954"><span class="section-number-3">4.1</span> Request</h3>
697
+<div id="outline-container-org1917997" class="outline-3">
698
+<h3 id="org1917997"><span class="section-number-3">4.1</span> Request</h3>
700 699
 <div class="outline-text-3" id="text-4-1">
701 700
 <div class="org-src-container">
702
-<pre class="src src-java" id="org4250e6e"><span style="color: #ce537a; font-weight: bold;">Request</span> <span style="color: #7590db;">r</span> = parseRequest<span style="color: #4f97d7;">(</span>doc<span style="color: #4f97d7;">)</span>;
701
+<pre class="src src-java" id="orgfd6cfbf"><span style="color: #ce537a; font-weight: bold;">Request</span> <span style="color: #7590db;">r</span> = parseRequest<span style="color: #4f97d7;">(</span>doc<span style="color: #4f97d7;">)</span>;
703 702
 <span style="color: #ce537a; font-weight: bold;">Diff</span><span style="color: #4f97d7;">[]</span> <span style="color: #7590db;">d</span> = parseDiffs<span style="color: #4f97d7;">(</span>doc<span style="color: #4f97d7;">)</span>;
704 703
 
705 704
 size<span style="color: #4f97d7;">(</span><span style="color: #a45bad;">200</span>,<span style="color: #a45bad;">200</span><span style="color: #4f97d7;">)</span>;
@@ -801,15 +800,15 @@ text(r.application, 10, 10);
801 800
 </div>
802 801
 </div>
803 802
 
804
-<div id="outline-container-org54b7a22" class="outline-3">
805
-<h3 id="org54b7a22"><span class="section-number-3">4.2</span> Contexts</h3>
803
+<div id="outline-container-org29c0efa" class="outline-3">
804
+<h3 id="org29c0efa"><span class="section-number-3">4.2</span> Contexts</h3>
806 805
 <div class="outline-text-3" id="text-4-2">
807 806
 <p>
808 807
 How do we visulize each context? Intend to do this in processing too.
809 808
 </p>
810 809
 
811 810
 <div class="org-src-container">
812
-<pre class="src src-java" id="org95cb692"><span style="color: #ce537a; font-weight: bold;">Request</span> <span style="color: #7590db;">r</span> = parseRequest<span style="color: #4f97d7;">(</span>doc<span style="color: #4f97d7;">)</span>;
811
+<pre class="src src-java" id="orgeccad1e"><span style="color: #ce537a; font-weight: bold;">Request</span> <span style="color: #7590db;">r</span> = parseRequest<span style="color: #4f97d7;">(</span>doc<span style="color: #4f97d7;">)</span>;
813 812
 <span style="color: #ce537a; font-weight: bold;">Diff</span><span style="color: #4f97d7;">[]</span> <span style="color: #7590db;">d</span> = parseDiffs<span style="color: #4f97d7;">(</span>doc<span style="color: #4f97d7;">)</span>;
814 813
 <span style="color: #2aa1ae; background-color: #292e34;">//</span><span style="color: #2aa1ae; background-color: #292e34;">draw the difference for each context with the request</span>
815 814
 size<span style="color: #4f97d7;">(</span><span style="color: #a45bad;">200</span>,<span style="color: #a45bad;">200</span><span style="color: #4f97d7;">)</span>;
@@ -910,8 +909,8 @@ text(d[0].context, 10, 10);
910 909
 </script> <canvas id="ob-1233b6269f6ad9dae9260cd0fea081e8622a0cf4"></canvas>
911 910
 </div>
912 911
 
913
-<div id="outline-container-org80b30aa" class="outline-4">
914
-<h4 id="org80b30aa"><span class="section-number-4">4.2.1</span> Things to further investigate</h4>
912
+<div id="outline-container-org23da441" class="outline-4">
913
+<h4 id="org23da441"><span class="section-number-4">4.2.1</span> Things to further investigate</h4>
915 914
 <div class="outline-text-4" id="text-4-2-1">
916 915
 <ul class="org-ul">
917 916
 <li>How do we show relation between request and each context with color?</li>
@@ -923,16 +922,16 @@ text(d[0].context, 10, 10);
923 922
 </div>
924 923
 </div>
925 924
 
926
-<div id="outline-container-orgea7a75f" class="outline-2">
927
-<h2 id="orgea7a75f"><span class="section-number-2">5</span> Interaction</h2>
925
+<div id="outline-container-orgbd26647" class="outline-2">
926
+<h2 id="orgbd26647"><span class="section-number-2">5</span> Interaction</h2>
928 927
 <div class="outline-text-2" id="text-5">
929 928
 <p>
930 929
 We intend to investigate this in Processing as well.
931 930
 </p>
932 931
 </div>
933 932
 
934
-<div id="outline-container-org344618a" class="outline-4">
935
-<h4 id="org344618a"><span class="section-number-4">5.0.1</span> Things to further investigate</h4>
933
+<div id="outline-container-org0872f53" class="outline-4">
934
+<h4 id="org0872f53"><span class="section-number-4">5.0.1</span> Things to further investigate</h4>
936 935
 <div class="outline-text-4" id="text-5-0-1">
937 936
 <ul class="org-ul">
938 937
 <li>How does the end user actually accept the request? Is it by dragging the request onto the context?</li>
@@ -944,7 +943,7 @@ We intend to investigate this in Processing as well.
944 943
 </div>
945 944
 <div id="postamble" class="status">
946 945
 <p class="author">Author: Taco</p>
947
-<p class="date">Created: 2018-03-30 Fri 14:41</p>
946
+<p class="date">Created: 2018-03-30 Fri 14:46</p>
948 947
 <p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
949 948
 </div>
950 949
 </body>

+ 5 - 6
entitlements.org

@@ -284,8 +284,7 @@ public int getColor(int privacy_level, int context_type)
284 284
 }
285 285
 #+END_SRC
286 286
 
287
-Below snippet is an exemplifies the color getColor(PrivacyLevel.SECRET, ContextType.SELF);
288
-And should be a dark red color.
287
+Below snippet exemplifies a color for the SELF context with a privacy level SECRET, and should be a dark red color.
289 288
 
290 289
 #+name: color_example_src
291 290
 #+BEGIN_SRC java
@@ -310,7 +309,7 @@ void draw(){
310 309
 #+RESULTS: color_example
311 310
 #+BEGIN_EXPORT html
312 311
 <script src="processing.js"></script>
313
- <script type="text/processing" data-processing-target="ob-aac1cb0de10f17f2bf5848bf4547f6a869db9766">
312
+ <script type="text/processing" data-processing-target="ob-e4084f25c6566c618f6cc091e4920fd86e9b1c21">
314 313
 //color definitions
315 314
 color a3 = #3A3B58;
316 315
 color b3 = #734246;
@@ -393,11 +392,11 @@ void draw(){
393 392
   noStroke();
394 393
   int level = PrivacyLevel.SECRET;
395 394
   int contextType = ContextType.SELF;
396
-  color private_self = getColor(level, contextType);//should be dark red
397
-  fill(private_self);
395
+  color secret_self = getColor(level, contextType);//should be dark red
396
+  fill(secret_self);
398 397
   ellipse(50,50,50,50);
399 398
 }
400
-</script> <canvas id="ob-aac1cb0de10f17f2bf5848bf4547f6a869db9766"></canvas>
399
+</script> <canvas id="ob-e4084f25c6566c618f6cc091e4920fd86e9b1c21"></canvas>
401 400
 #+END_EXPORT
402 401
 
403 402
 #+RESULTS: colors