From 4c018ec6c4ada4857c33274ad411278914583213 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 9 Apr 2024 12:05:00 +0200
Subject: [PATCH] update: chart margins
---
app/lib/widgets/bar_graph/bar_data.dart | 1 -
app/lib/widgets/main_layout.dart | 13 ++++++++-----
app/lib/widgets/stat_charts.dart | 2 +-
server/__pycache__/consts.cpython-311.pyc | Bin 359 -> 445 bytes
.../__pycache__/add_lake.cpython-311.pyc | Bin 6298 -> 7535 bytes
.../__pycache__/get_lake.cpython-311.pyc | Bin 0 -> 1132 bytes
.../get_measurements.cpython-311.pyc | Bin 4841 -> 4841 bytes
7 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 server/map_handler/__pycache__/get_lake.cpython-311.pyc
diff --git a/app/lib/widgets/bar_graph/bar_data.dart b/app/lib/widgets/bar_graph/bar_data.dart
index 6e97fc6b..4b80bacc 100644
--- a/app/lib/widgets/bar_graph/bar_data.dart
+++ b/app/lib/widgets/bar_graph/bar_data.dart
@@ -14,7 +14,6 @@ class BarData extends StatefulWidget {
class _BarDataState extends State<BarData> {
static const double barWidth = 30;
-
// NB should be allocated values dynamically
/*
selectedTile.IceStats.asMap().forEach((index, iceStats) {
diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart
index 29c4256c..021b77fd 100644
--- a/app/lib/widgets/main_layout.dart
+++ b/app/lib/widgets/main_layout.dart
@@ -216,7 +216,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
],
),
const SizedBox(height: contPadding), // Padding between containers
- Column(
+ Column( // Ice stats container
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
@@ -281,10 +281,13 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
const SizedBox(width: 10),
Expanded(
- child: Text(
- 'There may be multiple layers of black ice and slush ice stacked'
- ' between the snow and the steel ice.',
- style: regTextStyle,
+ child: Padding(
+ padding: const EdgeInsets.only(right: 15),
+ child: Text(
+ 'There may be multiple layers of black ice and slush ice stacked'
+ ' between the snow and the steel ice.',
+ style: regTextStyle,
+ ),
),
),
],
diff --git a/app/lib/widgets/stat_charts.dart b/app/lib/widgets/stat_charts.dart
index f97ee153..e76c02d1 100644
--- a/app/lib/widgets/stat_charts.dart
+++ b/app/lib/widgets/stat_charts.dart
@@ -75,7 +75,7 @@ class StatCharts extends StatelessWidget {
),*/
const SizedBox(height: 20),
SizedBox(
- width: MediaQuery.of(context).size.width,
+ width: MediaQuery.of(context).size.width-30,
child: const BarData(),
),
],
diff --git a/server/__pycache__/consts.cpython-311.pyc b/server/__pycache__/consts.cpython-311.pyc
index d47db4fadc975e2973e185a82508db4d8429a975..64000a10b34e12ebb363886ebb405b756392406e 100644
GIT binary patch
delta 169
zcmaFPw3nH0IWI340}y;*7fthEoX97^Xfjb<Qy`T!g{=xG9L1Kx9?YQ0F)_?uvr4!)
zwWut$NIy5RAU-28FC_=auHw&0%ubCjO3g_u$;{6y*7wt7pE%b<O~BVNAl}2#&&9_z
zC_cb3#N(E*kE6G1e2}Y;V~D4}Uocp3;%y&Bx5*leMlvFr7Z?O?h^bxBw7Mu}b%8+`
Jf{H+n0|2T(Fuwo*
delta 84
zcmdnX{G5qzIWI340}wne<V*X`Fp*D!QEQ^QCR++yFoP!h!~}bemm)w}KTWoYCrr3F
h9fMpQ<AXh;Tqi3r`Y@VL&Sx~@<>hbS1i>PZIRJG76RZFL
diff --git a/server/map_handler/__pycache__/add_lake.cpython-311.pyc b/server/map_handler/__pycache__/add_lake.cpython-311.pyc
index 6f2d57a52f8c159e10e5f2ba1f0bd62a7ec6c0f0..b4bf2ae822dcf9a98f4c3cd04bdf90cb961a59a3 100644
GIT binary patch
delta 2674
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
CVRy;^
delta 1612
zcmah}O>7%Q6rS<^d3U|`uARh9n<gn~+L)9CN<lPKl#;eImlT>tM228l-gRQL{^{(d
zwBRK{>Wxy7&Y@BPkpn772!RMk4&_99L8+)vScC*fAUM?*E?nTfO<jS6#LUjOZ@zi&
z&3iL%_s+!Chl~#lLnF{G%H8E}R*l}}b1=C=Y+_TF<SD#kZmcHcg_@WbYf@gKxF)!A
zP01^@cs^cJ^J>IVSIcXWou1ci(MgnJwsb+v8@B8SAS)mz?f3<fPuZ%Iur(OEW0qw*
z0V|eGXGqTYUBY0dFVo!W_rv@!9hN@@<_h6=w)O0`=`~8oM=-Wp5NkoVW4#@MRAc;e
zdW0(c>-2VR#&oLkzStvF=ci&rROV;QZb7Lk{Ks^UNQrN8YHk+;&Cj4<g3x`>6Y;Z1
za!tt41Q>S3{2ly&FgB)=1rq4C8YEiMQSug@7XzbZRFfUc7eqpWWRMEX!14$9C1HpT
z@Xv(N)UJ*OAuYqdk6%jn4ivyL-Qla5j&zjFPX=9Jy<5zI^|Uy?6+Gu+7aigsiUW7&
zKZyHjj+@d@=3eBs@s1E=Tl!j*E`MIyXFSmHONedq_oclwi$}qKlIHlAayOrryJ;`x
z$j`}HUIOM?Hfd7QBGnxo(={~d8u1Ty2tukmJ92B=zb|I3Kk}AVMh=a84m<0x@mjH2
zSS;3U7i72il2c%gTl6c9x;I{{HoW54g43vajd~adq2~DPJQMh7WsVB`W91EM@PqN|
zb2@AoTF0HDzr>u$hU+>dbdeJnmOvOUZ>@Nt=2u*&P--mI{Z}6T{|NZFdcqnAg@vXa
zs>~_cg)-RlH`T{21spROy^C(e^I4pKryiCCWRtvKdkre=UF`%l`LEh;xew_qH}y$6
z&QI%SMlCc{N=tqL@@J=Dro!-AV823sNu@6a8#||OrB2>Xo#cP$ZLKX@QoOx~nCbQ3
z60<bDk(|6fb4#7NtxmOxARV}IdVMx&QFGhKlp)+S#3@U;*+r+U^|PrXba@|c59LSL
zUVvPJ&7gb);VFb@{TNEe5uQdk0T5~ntYR13O5O3;vq(U$b%#9zqL%;|{6}M$6Wh~)
z3hLYhSRwpT>jurN|7A^3I?E?AgS*C13%_V~KSB;6ju6EsF_XWV=^uIynLL1ps?k<k
zn~dTD!t4Bt%-i64u4|Pp_XClOhf<SO>V6n&cx)b+P<GD2{djB`jrJovhO}re)tWgm
z(qS(mT|k<aJv=DfEZQqfzsxGWQ@|1|_>JiP*#c;+!tlNVfcp~F4XvLq_I$gXONT1d
zX%h;%=rR1VL(^L<HXZjo7V_Qt1$yf`Ft1SWC^VX0R8dSph3GsmR8~TG5CIEi>xeOX
z$e~j5qiC3cE14)gyoW#IhiVOb$#tG!E==*y==}`P7AU2gB)idhHu)!gS$@4wrki{f
ur1$#diA|!fM17N}D^YL9=P5l#*D`Gq3IF|iQn<YHRFWuku#Ld*xAixV4|N>?
diff --git a/server/map_handler/__pycache__/get_lake.cpython-311.pyc b/server/map_handler/__pycache__/get_lake.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..136f83f681989d911f21f4c715020cd44e8a2066
GIT binary patch
literal 1132
zcmZuxO-vI(6rSl$|ELrrw3zgwF&>I3qKUC8np7kaC1|7`fX2<HGljx-ceAsAEhX{5
zL5+#T3)h}7hKom!;>lx|ltA`sJaDU`3E||M#kMr?X6NnuzW3hzyqDdNot+&BWZNIf
z{l*CW5TGHR|Hl4#FxC)76sxF!Cox9Uvw|i)R2oNdvM0jg*y$ckJsy^y4UeYMBTvT0
z<)^9i!)#*>5#xg?!Q5A2r!`bY6#yrN;&t$Ez&sKxBAckeiZ_K5tiui)&0XBsCORIw
z4q&56U}X8509k>SUB)E<l(^d4zWNQc>?wOH-d1$WYF~d@f@;BN&&Nm$T|(CoCySn!
z(ga$BN=_gQql{)nbzG?&J6VH6s4P{EowCJKUwgIM5p)VckNjhM-yx-RW=Pj8rdbKA
zXt2^*#W2)-R<ZKBc6FBPS}7>g{6fDl9c-4o^HwgAj0c@g&NM2Uj2pVfnG<s13{xmG
zose)H+1w$z!8B9!*dZqP9q(c;uQGU<d5bwdre$@?;>01GsW~SooU*1Am_yt+LKREl
z1oAI{9Nrzeoq5ig$upXz&1W7kK4<Ah#xV8i>$e65GT>TZW~QJR@{FQU73^td$*MBP
z`i-K~B>-F~PZ^aV$n1fIMf3PiP_NJ~3G9&Q7KyHMo5X4)RwXf)>)9ebt1qgTZ`veT
zBgraBHfftgYb07F(Z4>_5#A18tc=*<#OIJ5zVl_=4yJ0sR2^Y&>}z_rtNVTNZSl?0
zyQSBpE&=B{T=h$Y{1K|fon{>z9Gphi1IQa(d9*{^gQnM}K1@}5?MS>9iQA;FM*6Ca
zho6I+ZpI?1L1}Z4+(-Uz5(YgMmqb%V_4>2WQ;WMza|`qd?L!VSyFncW1`9f!SJ^#N
f`~$>C$Ok~dbuivViE8^(4|L!wb#zjhy^!<|$jJRg
literal 0
HcmV?d00001
diff --git a/server/map_handler/__pycache__/get_measurements.cpython-311.pyc b/server/map_handler/__pycache__/get_measurements.cpython-311.pyc
index 3c546c803103ceed9c919b9c8ddcce41627366ab..25db6829c4c9367f2c4a309982dd48696767a7af 100644
GIT binary patch
delta 81
zcmaE<`cjo^IWI340}!m|n8>9o$e6<z#hAj7!j!|5%M``L$gt7lmmr$~P`-$HvWJkj
TByR&4-e8cufQlxs5wZmU2Ky8z
delta 81
zcmaE<`cjo^IWI340}!~dP2|!QWXfU8WsG8EWJqC1Va#EQV%q5OOOTBjC|_hS*+a-%
UQuYD^3cA6-+W>}>*9h4H0P2eqxc~qF
--
GitLab