Skip to content

Commit

Permalink
second try to push update
Browse files Browse the repository at this point in the history
  • Loading branch information
Danielle-Schuman committed Jan 29, 2021
1 parent 38f5f36 commit dfb3253
Show file tree
Hide file tree
Showing 65 changed files with 2,955 additions and 0 deletions.
Binary file added .DS_Store
Binary file not shown.
9 changes: 9 additions & 0 deletions 7-Tages-Inzidenz.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Länder;KW1;KW2;KW3;KW4;KW5;KW6;KW7;KW8;KW9;KW10;KW11;KW12;KW13;KW14;KW15;KW16;KW17;KW18;KW19;KW20;KW21;KW22;KW23;KW24;KW25;KW26;KW27;KW28;KW29;KW30;KW31;KW32;KW33;KW34;KW35;KW36;KW37;KW38;KW39;KW40;KW41;KW42;KW43;KW44;KW45;KW46;KW47;KW48;KW49;KW50;KW51;KW52;KW1
australien;0.00000;0.00000;0.00000;0.01555;0.01944;0.01166;0.00000;0.00000;0.04666;0.19051;0.85925;4.86781;9.46734;6.62131;2.44168;1.14697;0.40435;0.41991;0.48989;0.41213;0.23328;0.34215;0.24495;0.27216;0.54044;1.12753;3.18429;5.43157;8.12208;11.14308;13.15319;11.97123;8.40202;5.27605;3.23095;2.23561;1.44246;0.85537;0.51322;0.40435;0.53266;0.44323;0.48989;0.29549;0.24883;0.32659;0.33048;0.26439;0.27216;0.25272;0.70762;0.54044;0.64930
österreich;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.15726;1.01094;8.49190;30.57534;58.47730;36.65221;21.27468;9.03107;5.34675;4.17855;3.07775;4.16732;2.93173;2.56105;1.92079;2.32516;2.60598;3.51583;7.03165;6.93056;8.51437;9.17709;9.34558;8.18862;15.01808;21.15112;21.48810;23.64478;43.67263;55.44448;53.70341;59.19619;80.57197;106.56437;179.77894;326.53382;486.06025;570.65352;485.61095;365.28655;266.46148;213.79148;184.11475;146.45160;155.86458
brazilien;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00095;0.00851;0.06716;0.65462;1.28181;3.25135;5.23224;7.78640;11.56277;18.31709;28.79245;37.07360;57.76700;71.72358;83.67657;83.18324;102.03245;123.35730;122.46334;123.74704;110.54205;151.68953;148.79671;142.72302;144.15618;125.62009;121.33573;130.17217;91.25627;101.30262;88.77117;86.54810;84.99196;61.19714;80.29799;71.69473;56.00700;94.11503;98.52805;115.09744;136.60013;141.14653;159.23186;116.20708;117.99309
china;0.00000;0.00000;0.00000;0.11160;1.01076;1.61104;2.13083;0.45201;0.20208;0.06188;0.01250;0.03000;0.04771;0.03333;0.03694;0.04660;0.00743;0.00361;0.00319;0.00306;0.00285;0.00354;0.00313;0.01000;0.01646;0.01285;0.00792;0.01708;0.02681;0.07410;0.09826;0.05611;0.04042;0.02222;0.01389;0.01132;0.00965;0.01194;0.00792;0.01014;0.01271;0.01111;0.01243;0.01708;0.01861;0.01285;0.01847;0.04847;0.05299;0.05215;0.05014;0.04042;0.03667
deutschland;0.00000;0.00000;0.00000;0.00000;0.01203;0.00481;0.00241;0.00000;0.13718;1.09507;5.72202;22.95788;44.79182;45.76173;33.37064;20.85439;15.14561;9.49940;7.47894;5.40313;4.76414;3.70878;2.81588;2.12756;4.51745;4.11673;3.40554;2.88327;3.38869;4.73165;5.47894;7.30205;9.28881;11.41637;10.60289;10.13598;12.04452;14.71480;14.89049;18.33213;29.76655;50.97714;83.06498;128.33694;166.39952;144.79182;155.74128;148.40433;167.09868;188.03851;197.53550;172.89651;150.73045
russland;0.00000;0.00000;0.00000;0.00000;0.00136;0.00000;0.00000;0.00000;0.00000;0.01022;0.03133;0.20707;0.79490;2.62584;7.07104;18.44765;25.94919;36.60377;51.08712;49.08657;42.72802;41.79688;41.70697;41.68245;37.88025;33.84238;31.82345;31.16477;30.15803;27.76514;26.02275;24.82188;23.84102;22.89285;22.57476;23.67550;25.06369;27.20114;32.22873;42.75322;56.29589;67.52742;76.85308;82.41673;92.48144;101.98828;110.14849;121.26694;128.92378;129.78407;130.39030;135.44513;125.17608
südafrika;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00000;0.00503;0.08051;0.37404;1.68735;0.62898;0.86884;1.65213;2.32808;3.75210;5.42100;9.22509;11.85508;16.94062;26.16907;36.48608;45.72962;68.48708;98.31600;133.33110;147.74572;136.03656;110.78833;81.13720;46.10198;37.61825;25.63402;22.57799;18.91312;19.15129;16.02650;17.65012;18.75545;18.99027;20.25327;18.37471;17.53606;23.05602;27.93526;33.58437;45.05703;77.82456;102.24421;138.36129;161.58168
usa;0.00000;0.00000;0.00000;0.00152;0.00091;0.00121;0.00061;0.00061;0.00485;0.14757;0.81604;9.58850;33.00627;62.84355;66.70768;60.02364;62.78992;57.67916;51.76267;47.55401;47.46220;44.25230;43.74716;45.04985;56.39526;81.54571;103.31232;125.60559;141.15512;139.23214;131.21330;113.55535;107.91794;90.83573;89.17154;86.79798;73.79110;86.83737;92.60901;91.22633;106.00345;118.65034;149.41093;182.92627;244.48229;319.00427;365.52923;345.12984;421.13633;455.78619;457.35644;390.55544;452.73174
134 changes: 134 additions & 0 deletions Data_Infovis.xlsx - VerbraucherDaten.csv

Large diffs are not rendered by default.

Binary file added PJs-master/.DS_Store
Binary file not shown.
165 changes: 165 additions & 0 deletions PJs-master/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
25 changes: 25 additions & 0 deletions PJs-master/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<h3>Welcome to my...</h3>
<hr>
<h1>PJs</h1>

&emsp;&emsp;&emsp;&emsp;*"This is what I write my JavaScript in." - PT*

Pimped Javascript - Just a library of my javascript functions and shims. They are generally built for speed, size, versatility, and portability (copy and paste-able). Readability will be sacrificed, because they are optimized for usage right out-of-the-box. Therefore, this documentation will have to make up for that.

As you can see, a number of the functions are simple. For these, the real work will be to help the documentation and in formalizing a standard.

*Speaking of which, here is the needed help for all of them:*
* *Documentation*
* *Formalizing standards*
* *Some of these are old and might have already been incorporated into newer javascript standards (excluding aliases).*
* *Debuging/Testing/Refining*
* *More quick and simple features and versatility improvements*


NOTE: None of these functions (files) are meant to be linked in separately. They are to be copied and pasted into the `head` of your HTML on a "as desired" basis.

NOTE: I have used all of these functions in various situations and feel good about their performance. But, I have not fully added all practical features yet, nor tested in all relevant situations. Please feel free to chime in.

Also, this list is still incomplete.

( Goto: [Table of Contents](https://github.com/PimpTrizkit/PJs/wiki/01.--Table-of-Contents) )
31 changes: 31 additions & 0 deletions PJs-master/pSBC.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// pSBC - Shade Blend Convert - Version 4.0 - 02/18/2019
// https://github.com/PimpTrizkit/PJs/edit/master/pSBC.js

const pSBC=(p,c0,c1,l)=>{
let r,g,b,P,f,t,h,m=Math.round,a=typeof(c1)=="string";
if(typeof(p)!="number"||p<-1||p>1||typeof(c0)!="string"||(c0[0]!='r'&&c0[0]!='#')||(c1&&!a))return null;
h=c0.length>9,h=a?c1.length>9?true:c1=="c"?!h:false:h,f=pSBC.pSBCr(c0),P=p<0,t=c1&&c1!="c"?pSBC.pSBCr(c1):P?{r:0,g:0,b:0,a:-1}:{r:255,g:255,b:255,a:-1},p=P?p*-1:p,P=1-p;
if(!f||!t)return null;
if(l)r=m(P*f.r+p*t.r),g=m(P*f.g+p*t.g),b=m(P*f.b+p*t.b);
else r=m((P*f.r**2+p*t.r**2)**0.5),g=m((P*f.g**2+p*t.g**2)**0.5),b=m((P*f.b**2+p*t.b**2)**0.5);
a=f.a,t=t.a,f=a>=0||t>=0,a=f?a<0?t:t<0?a:a*P+t*p:0;
if(h)return"rgb"+(f?"a(":"(")+r+","+g+","+b+(f?","+m(a*1000)/1000:"")+")";
else return"#"+(4294967296+r*16777216+g*65536+b*256+(f?m(a*255):0)).toString(16).slice(1,f?undefined:-2)
}

pSBC.pSBCr=(d)=>{
const i=parseInt,m=Math.round;
let n=d.length,x={};
if(n>9){
const [r, g, b, a] = (d = d.split(','));
n = d.length;
if(n<3||n>4)return null;
x.r=i(r[3]=="a"?r.slice(5):r.slice(4)),x.g=i(g),x.b=i(b),x.a=a?parseFloat(a):-1
}else{
if(n==8||n==6||n<4)return null;
if(n<6)d="#"+d[1]+d[1]+d[2]+d[2]+d[3]+d[3]+(n>4?d[4]+d[4]:"");
d=i(d.slice(1),16);
if(n==9||n==5)x.r=d>>24&255,x.g=d>>16&255,x.b=d>>8&255,x.a=m((d&255)/0.255)/1000;
else x.r=d>>16,x.g=d>>8&255,x.b=d&255,x.a=-1
}return x
};
Binary file added Projektplanung/.DS_Store
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Projektplanung/Für 4. Präsi/Zukunft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Projektplanung/Für 4. Präsi/dieser MS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Projektplanung/Für 4. Präsi/letzter MS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
76 changes: 76 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# InfoVis-Group4
## Start the Application
Before starting the application, you need to install the following npm package:
```batch
npm install --global http-server
```

or run this function using npx without installing it first:
```batch
npx http-server
```

Start the http server with the following command in the main directory ("InfoVis-Group4") of the application (which contains the index.html)
```batch
http-server
```

The application will then be available here:
```
http://localhost:8080
```

## Available online
at https://danielle-schuman.github.io/InfoVis-Hamsterkaeufe-unter-der-Lupe/

## Browser compatibility
Our application supports Chrome (Version 88.0.4324.96 and newer), Firefox (Version 85.0 and newer) and Safari (Version 14.0.2 and newer), but looks best in Chrome.
We do not support Microsoft Edge, Internet Explorer, Opera, older Versions of Firefox and mobile browsers.

# Glossar
## Previously Planned Features 4 Our Application
- [x] Base Structure of the Project
- [x] Connected Scatterplot
- [x] First prototype
- [x] Shows progress for each bubble
- [x] Shows flag on each bubble representing the countries
- [x] Can hide/show progress lines for all countries when triggered by a toggle
- [x] Contains real data
- [x] Spider Chart
- [x] First prototype
- [x] Shows progress for each country
- [x] Can hide/show data for specific countries triggered by filter checkboxes
- [x] Contains real data
- [x] Slider
- [x] First implementation (not fully integrated in the application)
- [x] Integrated implementation
- [x] Manipulates the scatter chart
- [x] Manipulates the spider chart
- [x] Filter ~~Toggle~~ Undo-Button
- [x] Is turned on automatically when a checkbox is checked or turned off when the last checkbox is unchecked

## Optional Features
- [x] Slider
- [x] Supports a playback function which can be triggered by a play-button
- [x] Filter ~~Toggle~~ Undo-Button
- [x] Turns ~~on/~~ off the effect of all filter checkboxes
- [x] Connected Scatterplot
- [x] Flaggen in Länder-Bubbles
- [x] Toggle für Verlauf ein- & ausblenden bei Länder Plot
- [x] Spider Chart
- [x] ein- & ausblendbar
- [ ] ~~cool animierter Übergang von Liniendiagramm zu Spider Plot~~
- [x] Spider Plot von verschiedenen Länder übereinander
- [ ] ~~Inzidenz anzeigen als Zahl beim Spider Plot~~
- [ ] ~~Inzidenz als Farbhelligkeit in Spider Plot~~
- [ ] Other Features
- [x] Undo-Button für Filter
- [ ] ~~Undo-Button~~
- [ ] ~~Speicher-Button~~
- [x] Zoom-Functionality for Scatterplot




## Weiterführende Informationen
- Notizen zu den bisherigen Besprechungen / Meilensteinen: see private Repo
76 changes: 76 additions & 0 deletions bubble-style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
body {
background-color: #eeeeee
}

/*Axis*/
.axisGray line{
stroke: #777777;
}

.axisGray path{
stroke: #777777;
}

.axis-grid path {
display: none;
}

.axisGray text{
fill: #777777;
}

/*BUBBLES*/

.bubbles {
stroke-width: 2px;
stroke: white;
}
.bubbles:hover {
stroke: black;
}

.axis-grid line {
stroke: gray;
stroke-dasharray: 5,5;
}

/* zoom overlays */
#bubble-chart #zoom-in-overlay {
background-color: rgba(153, 237, 131, 0.2);
opacity: 0;
border: 2px solid var(--slider-green);
color: var(--slider-green);
position: absolute;
left: 4vw;
top: calc(100px + 28.5vh);
width: 22vw;
height: 27vh;
z-index: 100;
justify-content: center;
display: flex;
}

#zoom-in-overlay i {
margin: auto;
font-size: 6rem;
}

#zoom-bubble-chart #zoom-out-overlay {
background-color: rgba(153, 237, 131, 0.2);
opacity: 0;
border: 2px solid var(--slider-green);
color: var(--slider-green);
position: absolute;
left: 4vw;
top: calc(100px + 2.5vh);
width: 62vw;
height: 53vh;
z-index: 100;
justify-content: center;
display: flex;
}

#zoom-out-overlay i {
margin: auto;
font-size: 6rem;
}
Loading

0 comments on commit dfb3253

Please sign in to comment.