-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy pathGitHistory.txt
1945 lines (1299 loc) · 59 KB
/
GitHistory.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit cb060895db82d26728b5be3b80d9cf8e43eaba93
Merge: 3f8e6f8 df6faa1
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 19:10:55 2024 +0100
Merge pull request #90 from ZichengLiang/ZichengComments
comments and moved date format's location
commit df6faa18f2061d4d44055ca4d8150a43e8205edb
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Apr 10 19:10:20 2024 +0100
little comments
commit 3f8e6f83d8588d6032a2c562f247ea1bac99f9e5
Merge: 71939a3 ae5f4ca
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 19:08:52 2024 +0100
Merge pull request #88 from ZichengLiang/ScrollWheel
final changes - Neil Lawrence
commit 71939a39dc64d444615d3d918f1b518be506b0a1
Merge: 98cb286 cac7bc2
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 19:08:40 2024 +0100
Merge pull request #89 from ZichengLiang/Finishing-Pi+colors
Finishing pi+colors
commit cac7bc2edee73dc4f307ce30aac11f93711c5f20
Merge: 3a149f5 98cb286
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 19:08:32 2024 +0100
Merge branch 'main' into Finishing-Pi+colors
commit 3a149f51e25e784c4315b32e20a46d4a4bf7c3d9
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 19:02:24 2024 +0100
PieChart
somehow got a PieChart showing. Its linked to the querys
commit ae5f4cacac420ddf170f98f6a0d2fb908a0a81ab
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Apr 10 18:45:59 2024 +0100
final
commit 6b51f4e0f4973667a97b1a375186a0046844900a
Merge: b75ce3e 4312c05
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Apr 10 18:43:14 2024 +0100
Merge branch 'ScrollWheel' of https://github.com/ZichengLiang/CSU11013-GroupB-Team9 into ScrollWheel
commit 4feab04181430e9908757b9063b05b0ee6797b76
Merge: a4270fe 649ea0d
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 17:27:27 2024 +0100
Merge branch 'Finishing-Pi+colors' of https://github.com/ZichengLiang/CSU11013-GroupB-Team9 into Finishing-Pi+colors
commit a4270fe9845b99fb0cd4a88909d55bc73634a929
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 17:27:14 2024 +0100
Map
mapChange
commit 98cb286622f375c163ab7c0d4e41f3038fcbde76
Merge: 134c600 69ec192
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 15:42:31 2024 +0100
Merge pull request #77 from ZichengLiang/UserIneraction-Pi
attempted to implement search box
commit 69ec19255d8ab5e7b76a98e7baba93c28bc10632
Merge: b118ee8 134c600
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 15:42:20 2024 +0100
Merge branch 'main' into UserIneraction-Pi
commit 134c600e5bca2d08bb7b8cfd23cdeb8c9ab53944
Merge: 4d4be7a 649ea0d
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 15:41:54 2024 +0100
Merge pull request #84 from ZichengLiang/Finishing-Pi+colors
fixed pie chart
commit 4d4be7adfb3d4f1402748236565ad8ce5e6b2be6
Merge: 89d9196 6f8602d
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 15:41:35 2024 +0100
Merge pull request #85 from ZichengLiang/new-cancel
Bar chart
commit 6f8602d588d2e791ef7e6ba15f3fd9b913bd35f8
Merge: 6cd8f90 89d9196
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 15:41:28 2024 +0100
Merge branch 'main' into new-cancel
commit 6cd8f90d9b1b89334edcd32aecfcd0954ce19d76
Author: dannyelx21 <162593250+dannyelx21@users.noreply.github.com>
Date: Wed Apr 10 14:58:04 2024 +0100
Bar chart
Shows cancelled flight on bar charts
commit 649ea0dcd4f291e40e3790aaab909ff3a36e98e7
Author: Muireann <163150967+Pikacrazy@users.noreply.github.com>
Date: Wed Apr 10 14:56:59 2024 +0100
fixed pie chart
made data display
commit 89d91962f1f533a923868d2ef006862b41d9065c
Merge: 7d681f7 840c713
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:54:41 2024 +0100
Merge pull request #83 from ZichengLiang/Fixes
Fixes
commit 840c713d2c56f7e738366c1abcc2673272cdcdc2
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 14:33:58 2024 +0100
named rest of widgets
Named the remaining unamed widgets
commit ce0537090b15e39fba042e1ed8dd560cecb91d68
Merge: 8359f43 0f8547f
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 14:30:55 2024 +0100
Merge branch 'Fixes' of https://github.com/ZichengLiang/CSU11013-GroupB-Team9 into Fixes
commit 8359f43b2f326047c1b27f6815feabc51dd429db
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 14:30:43 2024 +0100
Filter
Created a title for Filter
commit 7d681f7d7dfc08c90207f8cbd03cb24a06001e72
Merge: 042fdc9 deeb43b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:28:55 2024 +0100
Merge pull request #82 from ZichengLiang/adding-comments
added some comments
commit 042fdc9a9163a410b9bae0154fd23f600b5ede13
Merge: a0976ad 0fb3830
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:28:41 2024 +0100
Merge pull request #76 from ZichengLiang/ScrollWheel
Table browsing
commit 0fb38301a630e9c1458336ab2ebc18891328f0f3
Merge: 4312c05 a0976ad
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:28:34 2024 +0100
Merge branch 'main' into ScrollWheel
commit deeb43b0e19d743bc2a5e063dce4e3fd06cbe2e7
Author: Aryan Kapoor <163135611+kapoor-ar@users.noreply.github.com>
Date: Wed Apr 10 14:27:20 2024 +0100
added some comments
commit a0976ad25edbe02f3abe168176e0bbdd1def603b
Merge: d234741 8158fa9
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:07:03 2024 +0100
Merge pull request #79 from ZichengLiang/cancelled-into-bar
Cancelled flights
commit 8158fa9f9270ae5738fea9591e3d8ee872151970
Merge: 4c2ff5e d234741
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:06:54 2024 +0100
Merge branch 'main' into cancelled-into-bar
commit d234741a3afbb5ae2e613cda47a45d80fb29e595
Merge: 534037b 0f8547f
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:05:17 2024 +0100
Merge pull request #81 from ZichengLiang/Fixes
AlterMap
commit 0f8547f479b1734eb124655fd7b0219a78cc6ec1
Merge: 9178fab 534037b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:05:10 2024 +0100
Merge branch 'main' into Fixes
commit 534037bd164fd77b14e125690be85b5f00afbf1a
Merge: 1fa42c1 500a87b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:04:22 2024 +0100
Merge pull request #80 from ZichengLiang/LinkMap
Link map
commit 500a87be81416890bfc76dcfd1a1d4ee2ac6fa00
Merge: 68c399f 1fa42c1
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 14:02:54 2024 +0100
Merge branch 'main' into LinkMap
commit 9178fab4cd9b052b22286ca283069083882e2a1f
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 14:02:24 2024 +0100
AlterMap
Changed the Map's position on the Screen
commit 68c399ffe218a4868da7e0d3e4575f824b76fad7
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 13:56:58 2024 +0100
Legend
Created a legend
commit 4c2ff5e31909ed7572d15df905774960dfa136c0
Author: dannyelx21 <162593250+dannyelx21@users.noreply.github.com>
Date: Wed Apr 10 13:48:57 2024 +0100
Cancelled flights
Cancelled flight also shown on flights if checkbox pressed
commit 1fa42c12bd8cd1a7b296d96b241c365ad8019217
Merge: 137f752 2b8a910
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 13:40:38 2024 +0100
Merge pull request #78 from ZichengLiang/Daniel-Comments
Comments for code
commit b118ee841ed4fb1ef1747bd71919ca7fc2c8a7fb
Merge: 325fb98 137f752
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 10 13:39:05 2024 +0100
Merge branch 'main' into UserIneraction-Pi
commit 800f3fd6fff01b8a2165b9cc879f6d3ec017755d
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Apr 10 13:14:30 2024 +0100
Update Map.pde
commit 2b8a910cf77b6281e90cf4b208676955bdf16ee0
Author: dannyelx21 <162593250+dannyelx21@users.noreply.github.com>
Date: Wed Apr 10 13:11:24 2024 +0100
Comments for code
Comments for the code
commit 325fb98de852090033a7156ee424167e6d893281
Author: Muireann <163150967+Pikacrazy@users.noreply.github.com>
Date: Wed Apr 10 10:04:18 2024 +0100
attempted to implement search box
basic changes added text box code not printing properly yet. need to do some touch ups elsewhere finishing pie chart
commit b75ce3ef2e809dec28a7f4b729133cc9e41c7e58
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Apr 10 02:09:09 2024 +0100
arrows adjusted
commit 4312c0596a81427211ed37bb1fc9365bc4498e2f
Merge: 4ea88e1 137f752
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 9 20:15:21 2024 +0100
Merge branch 'main' into ScrollWheel
commit f0caf4494b20269f0a898986a133f3fd788cd50a
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Tue Apr 9 19:29:05 2024 +0100
font
change font of the text
commit 4ea88e107e7bd18bd8ef1b975a6d28bc5381f024
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Tue Apr 9 19:17:36 2024 +0100
plus and minus
added working plus and minus signs to modify the text
commit b57c1c2d92b3d495c1cc2ef6db5c3490018aa5e5
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 9 12:58:41 2024 +0100
Loop
Looped the changing link
commit 4fd7379f4c671b6bde7faa2f95fd147724f40323
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 9 12:47:55 2024 +0100
Link
Is linked working on improvement
commit 137f75222306675c14c3b5125fe9db6aae3a9b20
Merge: d1444ec 228ee3b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 9 12:40:45 2024 +0100
Merge pull request #74 from ZichengLiang/CHECKBOXES-NEW
Text display
commit 228ee3bde15241297ce905aaecb1ee32c9776805
Merge: e546ac0 d1444ec
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 9 12:40:37 2024 +0100
Merge branch 'main' into CHECKBOXES-NEW
commit d1444ecc0a8dd55c78806c4ce135dfaa8e65303c
Merge: 1092c87 73e927f
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 9 12:39:55 2024 +0100
Merge pull request #75 from ZichengLiang/improvedBarChart
improved the performance of BarChart
commit e546ac016107ab05c1283c959d812f770db209c3
Author: dannyelx21 <162593250+dannyelx21@users.noreply.github.com>
Date: Tue Apr 9 12:39:09 2024 +0100
Text display
The labels now fit perfectly on the buttons and the text is aligned correctly.
commit 73e927f8fa5bdc97125ab11edc5f7cd2572e7093
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Tue Apr 9 12:39:06 2024 +0100
improved the performance of BarChart
commit 1092c8713a5804d7c640d918e7b83653e323a4e7
Merge: d19bb74 d4f9e65
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 9 11:17:25 2024 +0100
Merge pull request #70 from ZichengLiang/CHECKBOXES-NEW
Bar Chart
commit d4f9e65a1c032b80b67312c7feb4635adb3c0e30
Merge: a8c0673 d19bb74
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 9 11:17:16 2024 +0100
Merge branch 'main' into CHECKBOXES-NEW
commit 7d1646462936b0921162ad005eef476ce1cd85a9
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 9 09:54:31 2024 +0100
Speed
Trying to make it faster
commit 7c5cb529c670a6db01966d0fd2d80f8dfaf5c53e
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 9 09:12:15 2024 +0100
Link
Trying to link the map to query
commit ef40a660c987a5d05a962a76263a93d8056b3a6e
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Mon Apr 8 21:33:58 2024 +0100
text increase and decrease
commit d19bb74186d1522a04d28514e995954bfbe38a32
Merge: 601bfbc f16d7e5
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Sun Apr 7 14:52:53 2024 +0100
Merge pull request #73 from ZichengLiang/DateTime
Date update
commit f16d7e53e2f5e840974eeb5c88385a601ebc88ec
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Sun Apr 7 14:52:27 2024 +0100
the current slide bar is called "dateSlider" with 31 levels
commit 277ed2aa30f94cc75c09f74935bf9d35ce24020d
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Sun Apr 7 14:45:40 2024 +0100
flightsAfterDate performance optimized
commit 6ec55ea5052f134f7898fb29203c9c90956ae704
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Sun Apr 7 12:04:30 2024 +0100
standarised Slider class
commit a7c3d1dd246d46a98459682f55d702a4e20f9019
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Sun Apr 7 11:49:37 2024 +0100
Date is working, a new piece of info added on the text display
commit 601bfbc8512cb37d4ba7b18632e3da5a570d116d
Merge: 20f926b 43de85b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Sun Apr 7 10:57:33 2024 +0100
Merge pull request #71 from ZichengLiang/SliderInteraction
Slider interaction
commit 43de85b980fbc843df2e60a000796d3e7c71f9f2
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Sun Apr 7 10:56:17 2024 +0100
bufferedReader to load csv file
commit a8c0673d0ac8f607b9453aa7c12817d7f480040e
Merge: 16bb906 20f926b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Sat Apr 6 20:03:41 2024 +0100
Merge branch 'main' into CHECKBOXES-NEW
commit 16bb9063a99b60acc8e1002caf71f3c8a63a6045
Author: dannyelx21 <162593250+dannyelx21@users.noreply.github.com>
Date: Sat Apr 6 17:33:09 2024 +0100
Bar Chart
commit f036ffbb3a5fe0ae627359afd2e7c63c26c77930
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Fri Apr 5 18:39:46 2024 +0100
Dataloading upgraded with BufferedReader
commit 20f926bfccc9760eecdcc43f76a95e9316a59d06
Merge: b3d91d3 c7d8c4e
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 17:26:47 2024 +0100
Merge pull request #68 from ZichengLiang/slider-final
added event handler, wrapped code neatly in my own new class
commit c7d8c4e9b9c40b263fdfd73620e75462c2304f8f
Author: Aryan Kapoor <163135611+kapoor-ar@users.noreply.github.com>
Date: Thu Apr 4 17:24:47 2024 +0100
added event handler, wrapped code neatly in my own new class
commit b3d91d39c44e3217273896e08cc5d3d61978fae6
Merge: cba879f 9b2f183
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 16:51:57 2024 +0100
Merge pull request #66 from ZichengLiang/slider-new
added a functional slider for filtering flights by dep. time
commit 9b2f18324b243633b749ff9d61755f996d75203c
Merge: bb03723 cba879f
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 16:51:50 2024 +0100
Merge branch 'main' into slider-new
commit bb03723e2a67465c1b5ac4e7999aabf725ba624d
Author: Aryan Kapoor <163135611+kapoor-ar@users.noreply.github.com>
Date: Thu Apr 4 16:37:47 2024 +0100
added a functional slider for filtering flights by dep. time
commit cba879f62a7efff93dc1456f899e630e5401a3df
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Thu Apr 4 16:17:24 2024 +0100
Cancelled Working
commit cb29a36279b77bfcb494884bbb15a09282f0daee
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Thu Apr 4 14:53:04 2024 +0100
"Cancelled" box to filter query
commit 3bd50bddbbae12f78ba21905df825961e77112f2
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Thu Apr 4 12:51:17 2024 +0100
arrow buttons
commit be642453a4fce2c299734b4896631e2577b8c05b
Merge: f20a74f 1e59ae5
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 12:50:58 2024 +0100
Merge pull request #65 from ZichengLiang/UserInteraction
User interaction
commit 1e59ae544ec9f208eab6e913d018feeffac4a134
Merge: eadc101 f20a74f
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 12:50:52 2024 +0100
Merge branch 'main' into UserInteraction
commit eadc1010bb11318528cf56679ae728c776687467
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Thu Apr 4 12:46:03 2024 +0100
Wrapped barchart dataloading into its own class
commit f20a74fb5a59942d18c2eec5442cce5f2fecabba
Merge: 827c518 4320a31
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 12:45:28 2024 +0100
Merge pull request #64 from ZichengLiang/newBarChart
CheckBoxes
commit 4320a31d19c777024ffdd37c53730bc8e74404b2
Merge: 933bb2e 827c518
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Apr 4 12:45:19 2024 +0100
Merge branch 'main' into newBarChart
commit 933bb2ed0aac1bf2397049db4880aa373b4521f7
Author: dannyelx21 <162593250+dannyelx21@users.noreply.github.com>
Date: Thu Apr 4 12:42:15 2024 +0100
CheckBoxes
Created checkboxes
commit e7d24193c9b7bf047affcb529cc0c2ab4403a54d
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Thu Apr 4 10:10:14 2024 +0100
Compalibility updates
- text display on the welcome page
- new functions in the query class
- hashMaps in the query class
- wrapped getAbnormalFlights inside the PieChart Class
- wrapping in progress for BarChart
commit 827c51838a3ef3265c69a8fcb8c59814cf967fd8
Merge: ddc5912 fa3a41b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 3 22:28:36 2024 +0100
Merge pull request #63 from ZichengLiang/QueryHeavyInteraction
Query heavy interaction
commit fa3a41b09606e90acb2f7b38cb62ddc322e374de
Merge: 3c3b78b ddc5912
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 3 22:28:28 2024 +0100
Merge branch 'main' into QueryHeavyInteraction
commit ddc591283797adf3a3c5da7bc9233d163e922608
Merge: c5174fe 8089826
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Wed Apr 3 22:26:01 2024 +0100
Merge pull request #61 from ZichengLiang/Map.2
DataPoints
commit 3c3b78b0d0b45ccdeee1fcba03634b646c09b3fe
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Apr 3 22:24:46 2024 +0100
screentype initialise as 0 now
commit cd94e250f2200d339b5ca6f52513c8231b552f26
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Apr 3 22:04:08 2024 +0100
new ways to interact with Query
- new function filterQuery
- with no parameters, controlled by class attributes (setters)
- with paramters
commit 808982611e7dc1bab97cca46e5e6520bcd6972b3
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 2 12:18:04 2024 +0100
DataPoints
commit c5174fed219b9d4d506cf9ab866a692ebe0acb1a
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 2 12:15:23 2024 +0100
Fixed barchart sorting
commit 5a6f86550f126e6de62f2722dce64ac5c792ff5f
Merge: a730c98 ff30397
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Apr 2 12:13:45 2024 +0100
Filter area
commit ff30397e61ff265a4b05728e06560c4fc62ec7e7
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 2 12:12:36 2024 +0100
Rect
commit da0e9ea8dd5b323309952369859f9c3c0ff11c96
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Tue Apr 2 12:00:57 2024 +0100
changes
commit a730c9805057a674e49d6c8d843dac3e499f96c1
Merge: c357a52 a3fbd39
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Mon Apr 1 19:59:44 2024 +0100
Pie Chart cleanup & enhancement
Moved all global values to the top, removed unnecessary notes,
curved legend box and moved it top left.
commented notes are for working on widget classes for changing data displayed
commit a3fbd39fe6a80d816872fe14b15101ff200fc935
Author: Muireann <163150967+Pikacrazy@users.noreply.github.com>
Date: Sat Mar 30 13:41:34 2024 +0000
issue #58 resolved
Moved all global values to the top, removed unnecessary notes,
curved legend box and moved it top left.
commented notes are for working on widget classes for changing data displayed
commit f14d62bbf57d12e3591b996a9bf573851e849e4b
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Thu Mar 28 16:54:04 2024 +0000
drawing ScrollBar
commit 8db317d1d3bd0500942935559e6d2620d139b98d
Merge: 64b479a 44736f8
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 16:45:48 2024 +0000
Merge branch 'Map.2' of https://github.com/ZichengLiang/CSU11013-GroupB-Team9 into Map.2
commit 64b479ad1d6e52b257a5264742e63e47ee05b8d4
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 16:45:37 2024 +0000
slight alter
slightly altered the number of points added
commit c357a524281446efcec3c3e42daa2b74fdde2d49
Merge: 6b955ca 44736f8
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:39:18 2024 +0000
Merge pull request #54 from ZichengLiang/Map.2
Map.2
commit 44736f8b45ce4aca0f5cc5494daf3685b055e4ff
Merge: 7173ee6 6b955ca
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:39:11 2024 +0000
Merge branch 'main' into Map.2
commit 7173ee69d290e76d6e0603c1b086b47c147cb5e9
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 16:38:07 2024 +0000
map
commit 6b955ca13f486b3d55380109f90c0fb310eda80f
Merge: aa35129 a75db7b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:35:42 2024 +0000
Colour Scheme adjustment
changed a few colors
commit a75db7bd16804dcdff1aa8365a7513987a7b2744
Author: Muireann <163150967+Pikacrazy@users.noreply.github.com>
Date: Thu Mar 28 16:35:08 2024 +0000
commiting
commit to changes
commit 0c3688012f2593914eedeaea5e1f192adf7bb66a
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 16:31:04 2024 +0000
Update Screen.pde
commit 2fdda1711331426ee053794239787067f301fa00
Merge: 2d2e611 c36bb64
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 16:30:59 2024 +0000
Merge branch 'Map.2' of https://github.com/ZichengLiang/CSU11013-GroupB-Team9 into Map.2
commit 9ec6cb9b025666fb2d0058641e0146d8bfb36222
Merge: f6d97b0 aa35129
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:27:35 2024 +0000
Merge branch 'main' into Pie_test
commit aa351294a788b42a366f0c07ea6d8dee8c209074
Merge: e54f706 070f726
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:26:49 2024 +0000
Time zone done
Time zone usa
commit 070f726a435260c06977670acc1bf10a610f8837
Merge: af06311 e54f706
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:23:32 2024 +0000
Merge branch 'main' into TimeZone-USA
commit 2d2e611e2f4f479482f35c32ece711b621cccde8
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 16:20:47 2024 +0000
few edits
commit f6d97b0bd62a1651dd187b2d2cb1f9ac24dcef38
Author: Muireann <163150967+Pikacrazy@users.noreply.github.com>
Date: Thu Mar 28 16:18:16 2024 +0000
changed a few colors
changed colors, nicer buttons
commit e54f70622d26b7818af66c65775fc300d947bc3f
Merge: 06afcc6 c36bb64
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:15:54 2024 +0000
first version of map, unordered
Map.2
commit c36bb64bd30e5d0925805a00234b1a2e182fee62
Merge: 3fc9580 06afcc6
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 16:15:23 2024 +0000
Merge branch 'main' into Map.2
commit 3fc958027dde7bba9289a5b0eb35c848195bf29d
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Thu Mar 28 15:13:06 2024 +0000
Default page added
commit 06afcc6e6e9a7be3de1a6a50d5ae0aac6f3fb985
Merge: 776f4e4 7ded26a
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 14:39:32 2024 +0000
Tabledisplay in button2
Tablescreendisplay
commit 7ded26abec6fe626f3697ce5e13c49cf8563e4a0
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Thu Mar 28 14:31:54 2024 +0000
displaytabledata correction
commit 6a33af943d286ea66f6db184452fd9ebb965b813
Merge: f14d81a 776f4e4
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 14:28:14 2024 +0000
Merge branch 'main' into TABLESCREENDISPLAY
commit f14d81a505cbf1586e5deb0d6a12215e9a5f4f59
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Thu Mar 28 14:06:20 2024 +0000
screen size adjusted
commit 776f4e4ab5602544d14e392a637cbb7c2453891d
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Thu Mar 28 11:14:46 2024 +0000
added Collections and Generics for reference
commit dd5dcd3a6d09ac5a8030aaf78066810e6d057166
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Mar 27 16:41:15 2024 +0000
Revert "Revert "replaced button intialisation statements in setup() with functions""
This reverts commit c79e4cbd9373b001e014858977a2b1b5ac86b326.
commit 32d90eb68549f4b3762ed6e395f101a126fc2809
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Mar 27 16:41:12 2024 +0000
Revert "table code"
This reverts commit 58cbc826738f71faa0033e699c5d8f51fee160c1.
commit a2e7018027ad9bc716dd14b7b0d5d7fe68265f4e
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Mar 27 16:41:06 2024 +0000
Revert "screen adjusted"
This reverts commit d6d9d1ced0d6f14a57c531ad7690ebbb34662ed2.
commit c79e4cbd9373b001e014858977a2b1b5ac86b326
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Wed Mar 27 16:31:50 2024 +0000
Revert "replaced button intialisation statements in setup() with functions"
This reverts commit 8b989c3004302d0246a0718b2f6408a27fce4aad, reversing
changes made to 931741f23a878679dbfb92d29e6669a9f3d6cb85.
commit 53a02668f8064ed409f7f5a55afba152c883895b
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Mar 27 14:56:34 2024 +0000
Working on map
still working on it
commit af06311c203d574508deb01bb710d56a80da3983
Author: Aryan Kapoor <163135611+kapoor-ar@users.noreply.github.com>
Date: Wed Mar 27 14:49:21 2024 +0000
query for actual flight duration and planned flight duration
accurately calculates the planned v/s actual flight duration whilst taking care of difference in time zones of arrival and destination city
commit d80bfe379d780a49cdf1d6ad0298b2fb5c6b9394
Author: Aryan Kapoor <163135611+kapoor-ar@users.noreply.github.com>
Date: Wed Mar 27 14:48:15 2024 +0000
added timezone feature
this accurately calculates the timezone according to the arrival and destination cities
commit 713dd59ae1d3a00bf9990d02c79e1446076d1300
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Mar 27 14:45:37 2024 +0000
tabledisp
commit d6d9d1ced0d6f14a57c531ad7690ebbb34662ed2
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Mar 27 14:29:00 2024 +0000
screen adjusted
commit 58cbc826738f71faa0033e699c5d8f51fee160c1
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Mar 27 14:09:44 2024 +0000
table code
commit c0b013bd3960884fbd4309f4bd268ff29b320a6b
Author: Lawrencn0310 <162470996+Lawrencn0310@users.noreply.github.com>
Date: Wed Mar 27 13:57:01 2024 +0000
Update main.pde
commit 9db552b5441f1c0f0411b342c626825965b3de83
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Mar 27 12:42:31 2024 +0000
Check heatMap possibility
commit 9381116e2b0acf9f38a527e618ea803d144e9d67
Author: Brigandus <162377443+Brigandus@users.noreply.github.com>
Date: Wed Mar 27 12:30:10 2024 +0000
Adding map
commit 8b989c3004302d0246a0718b2f6408a27fce4aad
Merge: 931741f dd3356b
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Mar 26 15:34:23 2024 +0000
replaced button intialisation statements in setup() with functions
replaced button intialisation statements in setup() with functions
commit dd3356befc4f06c89e70b5e8a017811193883a75
Merge: 38bd9b1 931741f
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Tue Mar 26 15:32:46 2024 +0000
resolved merge conflict by switching to the latest version
commit 38bd9b1943335a95e49a291e58c7237bd17f9b68
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Tue Mar 26 15:20:43 2024 +0000
deleted unneccessary comments
commit 931741f23a878679dbfb92d29e6669a9f3d6cb85
Merge: b9684e9 61f38e0
Author: Zicheng Liang <116967748+ZichengLiang@users.noreply.github.com>
Date: Tue Mar 26 15:17:33 2024 +0000
added legend box to pie chart, removed black outlines
pi chart improvements + nostroke
commit c7bc4176f507b46ce5798916732e95f60e747589
Author: Zicheng_Liang <liangzicheng02@gmail.com>
Date: Tue Mar 26 15:13:46 2024 +0000
packed the buttons initialisation into functions