From 9374e326fd3d3417c5b8b3b51dd9a495dbe26cdb Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 16 Oct 2013 13:21:00 +0200 Subject: [PATCH] added icon for registers that can be edited --- web/htdocs/layout/blue.css | 19 +++++++++++++++---- web/htdocs/layout/edit.png | Bin 0 -> 340 bytes web/htdocs/layout/styles.css | 6 ++++++ xml-db/get.pl | 26 +++++++++++++++----------- 4 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 web/htdocs/layout/edit.png diff --git a/web/htdocs/layout/blue.css b/web/htdocs/layout/blue.css index b8f38b8..d02ac54 100644 --- a/web/htdocs/layout/blue.css +++ b/web/htdocs/layout/blue.css @@ -254,17 +254,17 @@ div.header span a:hover { .high { - background:#ded; + background-color:#ded; } .low { - background:#edd; + background-color:#edd; } .good { - background:#cfc; + background-color:#cfc; } .bad { - background:#fcc; + background-color:#fcc; } @@ -287,8 +287,19 @@ table.queryresult td:first-child, table.queryresult th:first-child{ background:#dde; } +table.queryresult td { + text-align:right; + } + hr.queryresult { border:none; width:100%; border-top:1px solid #aaa; } + + +td.editable { + background-image:url("edit.png"); + background-repeat:no-repeat; + background-position:fixed; +} diff --git a/web/htdocs/layout/edit.png b/web/htdocs/layout/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..5976a59b644bcc2749bf0115371bab1e4645ab49 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XzInPhhE&{2nq!ct#N4?+yo0yFf}_KJ(}We4!X4cU-n?~q zbH-(fTbhC&+ap$oJ^Wf}oJUsA?6|T=q~kfm#}tKc?2lvvc3SJWWbw6sa$NU-@lk+6 zAM2x+IxHsoPM3I?75eJ=|43lO6Nhu}+d#a&qe|OFrP%HlN*>_h)ybJ< z?)dnh_$Gy2j0$HtBTUw}v)$1z;Z!rZ&7Tywg{?z*L#CUV15?L$r@1fLj=b-<*pt(s zCvcnjqvwjWVug3jS^v8A7arhYIGU{|pzU<|hr5EF+7ih$2ICOn6aT9m)^HtJ-+4Ax jCm{NZ#0eG#MmC1W8w@vIO%TWgh5&=7tDnm{r-UW|$xVSu literal 0 HcmV?d00001 diff --git a/web/htdocs/layout/styles.css b/web/htdocs/layout/styles.css index 8b15a8a..4fa1109 100644 --- a/web/htdocs/layout/styles.css +++ b/web/htdocs/layout/styles.css @@ -24,6 +24,12 @@ h2 { margin: 0px 0 10px -25px; } +h2 a { + text-decoration:none; + color:black; +} + + h3 { border-bottom: 1px solid #dddddd; font-size: 120%; diff --git a/xml-db/get.pl b/xml-db/get.pl index f60e21a..7d335e8 100755 --- a/xml-db/get.pl +++ b/xml-db/get.pl @@ -110,7 +110,6 @@ foreach my $req (@request) { $once = (defined $slice)?1:0; if ($isbrowser) { requestdata($db->{$name},$name,$slice); - print DumpTree($data) if $verbose; generateoutput($db->{$name},$name,$slice,$once); writeoutput($db->{$name},$name,$slice,$once); } @@ -124,17 +123,18 @@ foreach my $req (@request) { #### Formatting of values ############################### sub FormatPretty { - my ($value,$obj,$cont) = @_; + my ($value,$obj,$cont,$class) = @_; $value = $value >> ($obj->{start}); $value &= ((1<<$obj->{bits})-1); $value = $value * ($obj->{scale}||1) + ($obj->{scaleoffset}||0); + $class = "" unless $class; my $ret, my $cl; if (defined $cont) { - $cl = "class=\"".($value?"bad":"good")."\"" if ( $obj->{errorflag} && !$obj->{invertflag}); - $cl = "class=\"".($value?"good":"bad")."\"" if ( $obj->{errorflag} && $obj->{invertflag}); - $cl = "class=\"".($value?"high":"low")."\"" if (!$obj->{errorflag} && !$obj->{invertflag}); - $cl = "class=\"".($value?"low":"high")."\"" if (!$obj->{errorflag} && $obj->{invertflag}); + $cl = "class=\"$class ".($value?"bad":"good")."\"" if ( $obj->{errorflag} && !$obj->{invertflag}); + $cl = "class=\"$class ".($value?"good":"bad")."\"" if ( $obj->{errorflag} && $obj->{invertflag}); + $cl = "class=\"$class ".($value?"high":"low")."\"" if (!$obj->{errorflag} && !$obj->{invertflag}); + $cl = "class=\"$class ".($value?"low":"high")."\"" if (!$obj->{errorflag} && $obj->{invertflag}); $ret = "<$cont "; for($obj->{format}) { when ("boolean") { @@ -151,10 +151,10 @@ sub FormatPretty { when ("hex") {$ret .= sprintf("$cl>%8x",$value);} when ("enum") { my $t = sprintf("%x",$value); if (exists $obj->{enumItems}->{$t}) { - $ret .= '>'.$obj->{enumItems}->{$t} + $ret .= "$cl>".$obj->{enumItems}->{$t} } else { - $ret .= '>'.$t; + $ret .= "$cl>".$t; } } default {$ret .= sprintf(">%08x",$value);} @@ -227,7 +227,7 @@ sub requestdata { $o = trb_register_read($netaddr,$obj->{address}+$slice*$stepsize); next unless defined $o; foreach my $k (keys $o) { - $data->{$obj->{address}}->{$k} = $o->{$k}; + $data->{$obj->{address}+$slice*$stepsize}->{$k} = $o->{$k}; } } while(defined $obj->{repeat} && ++$slice < $obj->{repeat}); } @@ -253,7 +253,10 @@ sub generateoutput { my $addr = $obj->{address}+$slice*$stepsize; #### Prepare table header line - $t .= sprintf("{description}\">".$name,$addr); + my $fullname = $name; + $fullname .= ".$slice" if ($once != 1 && defined $obj->{repeat}); + + $t .= sprintf("{description}\">".$fullname,$addr); if($obj->{type} eq "registerfield" || $obj->{type} eq "field"){ $t .= "{description}\">$name"; @@ -267,11 +270,12 @@ sub generateoutput { } # print DumpTree($data->{$addr}); + my $wr = 1 if $obj->{mode} =~ /w/; foreach my $b (sort keys %{$data->{$addr}}) { $t .= sprintf("%04x",$data->{$addr}->{$b},$b); if($obj->{type} eq "register") { foreach my $c (@{$obj->{children}}) { - $t .= FormatPretty($data->{$addr}->{$b},$db->{$c},"td"); + $t .= FormatPretty($data->{$addr}->{$b},$db->{$c},"td",($wr?"editable":"")); } } elsif($obj->{type} eq "field" || $obj->{type} eq "registerfield") { -- 2.43.0