Changeset 24939

Timestamp:

2012-01-11T11:17:00+13:00 (11 years ago)

Author:

davidb

Message:

Some initial work at converting CSS style information into Expeditee attributes

Location:

gs3-extensions/html-to-expeditee/trunk/src

Files:

• perllib/ExpediteeFrameIO.pm (modified) (5 diffs)
• src/js/html-to-expeditee.js (modified) (2 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm

@@ -65 +65 @@
     return $fdate;
 }
+
+sub convertStyleToAttr
+{
+    my ($css_attr) = @_;
+
+    my $exp_attr = {};
+
+    if (defined $css_attr->{'background-color'}) {
+    $exp_attr->{'e'} = $css_attr->{'background-color'};
+    }
+
+    # load up some defaults for font information
+    my $font_family = "s"; # t
+    my $font_face = "r";
+    my $font_size = "14";
+
+#    if (defined $css_attr->{'font-family'}) {
+#   $font_family = $font_family_lookup->[$css_attr->{'font-family'}];
+#    }
+
+#    if (defined $css_attr->{'font-size'}) {
+#   $font_size = convert_font_size($css_attr->{'font-size'});
+#    }
+
+#    if (defined $css_attr->{'font-face'}) {
+#   $font = conver_font_face($css_attr->{'font-face'});
+#    }
+
+    return $exp_attr;
+}
+
 
 sub _nextFreeId
@@ -166 +197 @@
     # fudge factor for now (based on default font size used)
     $y += 16; # y-value of text item in Expeditee is it's base line
+    $x += 4;
 
     my %attr_copy = %$attr; # make a private copy of 'attr'
@@ -406 +438 @@
     my $yb = $rect->{'yb'};
 
-    my $attr = {};
+    my $attr = convertStyleToAttr($html_node->{'style'});
 
     $self->addRect($xl,$yt,$xr,$yb,$attr);
@@ -417 +449 @@
     my $y = $html_node->{'y'};
 
-    my $attr = {};
+    my $attr = convertStyleToAttr($html_node->{'style'});
 
     $self->addText($x,$y,$text,$attr);
@@ -442 +474 @@
 
     if (open(FNOUT,">$filename")) {
-    binmode(FOUT,":utf8");
+    binmode(FNOUT,":utf8");
     
     print FNOUT "$last_frame_number\n";

gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js

@@ -52 +52 @@
 }
 
-function getStyle(el,styleProp)
+function getStyle(node,styleProp)
 {
-    var x = document.getElementById(el);
-    if (x.currentStyle) {
-    var y = x.currentStyle[styleProp];
+    if (node.currentStyle) {
+    var y = node.currentStyle[styleProp];
     }
     else if (window.getComputedStyle) {
-    var y = document.defaultView.getComputedStyle(x,null).getPropertyValue(styleProp);
+    var y = document.defaultView.getComputedStyle(node,null).getPropertyValue(styleProp);
     }
     return y;
@@ -138 +137 @@
         jsonNode.rect = rect;
     
+
+        var style = {};
+
+        style["font-family"] = getStyle(node,"font-family");
+        style["background-color"] = getStyle(node,"background-color");
+
+        jsonNode.style = style
+
             var jsonChildNodes = [];