Changeset 24941

Timestamp:

2012-01-12T11:03:59+13:00 (12 years ago)

Author:

davidb

Message:

Work on converting CSS style attributes to Expeditee attributes

Location:

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

Files:

• perllib/CssStyleToExpAttr.pm (added)
• perllib/ExpediteeFrameIO.pm (modified) (7 diffs)
• src/js/html-to-expeditee.js (modified) (4 diffs)

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

@@ -28 +28 @@
 use strict;
 
+use CssStyleToExpAttr;
+
 sub new 
 {
@@ -77 +79 @@
 
     # load up some defaults for font information
-    my $font_family = "s"; # t
-    my $font_face = "r";
-    my $font_size = "14";
+    my $exp_font_family = "s"; # t
+    my $exp_font_face = "r";
+    my $exp_font_size = "14";
 
 #    if (defined $css_attr->{'font-family'}) {
@@ -85 +87 @@
 #    }
 
-#    if (defined $css_attr->{'font-size'}) {
-#   $font_size = convert_font_size($css_attr->{'font-size'});
-#    }
+    if (defined $css_attr->{'font-size'}) {
+    my $css_font_size = $css_attr->{'font-size'};
+    $exp_font_size = CssStyleToExpAttr::convert_font_size($css_font_size);
+    }
 
 #    if (defined $css_attr->{'font-face'}) {
 #   $font = conver_font_face($css_attr->{'font-face'});
 #    }
+
+#    $exp_attr->{'f'} = $exp_font_family.$exp_font_face.$exp_font_size;
 
     return $exp_attr;
@@ -169 +174 @@
     $self->setPointDefaultAttributes($attr);
 
-    $attr->{'d'} = "50 100 50"; # green color for rect lines
-    $attr->{'h'} = "2.0";     # line thickness
+    $attr->{'d'} = "80 80 80"; # green color for rect lines
+    $attr->{'h'} = "1.0";     # line thickness
 }
 
@@ -193 +198 @@
 {
     my $self = shift @_;
-    my ($x, $y, $text, $attr) = @_;
-
-    # 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 ($x, $y, $text, $w, $attr) = @_;
 
     my %attr_copy = %$attr; # make a private copy of 'attr'
@@ -207 +208 @@
     $attr_copy{'P'} = "$x $y";
     $attr_copy{'T'} = $text;
+    $attr_copy{'w'} = "-$w" if (defined $w);
 
     return $self->_addItem("T",\%attr_copy);
@@ -442 +444 @@
     $self->addRect($xl,$yt,$xr,$yb,$attr);
 
+    if (defined $html_node->{'img'}) {
+
+        my $img_url = $html_node->{'img'};
+        $img_url =~ s/^http:\/\/www\.nzdl\.org\/greenstone3-showcase\///;
+        if ($img_url =~ m/^interfaces\//) {
+        $img_url = "images/$img_url";
+        }
+        elsif ($img_url =~ m/^sites\//) {
+        $img_url =~ s/^sites\/(.*?)\//images\//;
+        }
+
+        my $x = $xl;
+        my $y = $yt;
+
+        my $attr = {};
+
+        my $img_text = "\@i: $img_url";
+
+        $self->addText($x,$y,$img_text,undef,$attr);
+    }
+
     }
     elsif ($type eq "text") {
     my $text = $html_node->{'text'};
 
-    my $x = $html_node->{'x'};
-    my $y = $html_node->{'y'};
+    my $x = $html_node->{'xl'};
+    my $y = $html_node->{'yt'};
+    my $w = $html_node->{'xr'} - $x +1;
 
     my $attr = convertStyleToAttr($html_node->{'style'});
 
-    $self->addText($x,$y,$text,$attr);
+    # 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;
+
+    $self->addText($x,$y,$text,$w,$attr);
     }
     else {

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

@@ -52 +52 @@
 }
 
-function getStyle(node,styleProp)
-{
+function hyphenToInitialCapReplacer(str, p1, offset, s)  
+{  
+    return p1.toUpperCase();
+}  
+
+function getStyle(node,style_prop)
+{
+    var prop_val;
     if (node.currentStyle) {
-    var y = node.currentStyle[styleProp];
+    /* IE */
+    style_prop = strCssRule.replace(/\-(\w)/g, hyphenToInitialCapReplacer);
+    prop_val = node.currentStyle[style_prop];
     }
     else if (window.getComputedStyle) {
-    var y = document.defaultView.getComputedStyle(node,null).getPropertyValue(styleProp);
-    }
-    return y;
+    /* Firefox */
+    var computed_style = document.defaultView.getComputedStyle(node,null)
+    prop_val = computed_style.getPropertyValue(style_prop);
+    }
+    else {
+    /* try for inline value */
+    prop_val = el.style[style_prop];
+    }
+
+    return prop_val;
+
 }
 
@@ -110 +126 @@
         jsonNode.text = node.nodeValue;
 
-        jsonNode.x = pxl;
-        jsonNode.y = pyt;
+        jsonNode.xl = pxl;
+        jsonNode.yt = pyt;
+        jsonNode.xr = pxr;
+        jsonNode.yb = pyb;
 
     }
@@ -119 +137 @@
     /* need to handle: img, a, li */
         /* need to dig out: text size, l/r/justified, font-face, type, colour */
+
+    if (getStyle(node,"visibility").match("hidden")
+        || getStyle(node,"display").match("none")) {
+
+        return null;
+    }
 
         var elemName = node.nodeName.toLowerCase();
@@ -137 +161 @@
         jsonNode.rect = rect;
     
+        if (elemName.match("img")) {
+        jsonNode.img = node.src;
+        }
 
         var style = {};
 
-        style["font-family"] = getStyle(node,"font-family");
+        style["font-family"]      = getStyle(node,"font-family");
+        style["font-size"]        = getStyle(node,"font-size");
         style["background-color"] = getStyle(node,"background-color");
 
+        // console.log("font size = " + style["font-size"]);
+ 
         jsonNode.style = style