Changeset 25057 for gs3-extensions
- Timestamp:
- 2012-02-08T15:55:59+13:00 (12 years ago)
- Location:
- gs3-extensions/html-to-expeditee/trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm
r24944 r25057 170 170 $self->_setBaseDefaultAttributes($attr); 171 171 172 $attr->{'d'} = "0 0 0"; # black color 172 if(defined $attr->{'d'}){ 173 174 } 175 else { 176 $attr->{'d'} = "0 0 0"; # black color 177 } 178 173 179 } 174 180 … … 179 185 my ($attr) = @_; 180 186 187 181 188 $self->setPointDefaultAttributes($attr); 182 189 183 $attr->{'d'} = "80 80 80"; # green color for rect lines 184 $attr->{'h'} = "1.0"; # line thickness 190 if((defined $attr->{'d'}) && (defined $attr->{'h'})){ 191 192 } 193 else { 194 $attr->{'d'} = "80 80 80"; # grey color for rect lines 195 $attr->{'h'} = "1.0"; # line thickness 196 } 185 197 } 186 198 … … 210 222 211 223 $self->setTextDefaultAttributes(\%attr_copy); 212 213 224 my $items = $self->{'items'}; 214 225 … … 349 360 350 361 foreach my $item (@$items) { 362 351 363 my $type = delete $item->{'_type'}; 352 my $id = delete $item->{'_id'}; 353 354 print FOUT "S $type $id\n"; 355 foreach my $a (keys %$item) { 356 print FOUT "$a ", $item->{$a}, "\n"; 357 } 364 my $id = delete $item->{'_id'}; 365 366 if(defined($type) && defined($id)) { 367 368 print FOUT "S $type $id\n"; 369 370 foreach my $a (keys %$item) { 371 print FOUT "$a ", $item->{$a}, "\n"; 372 } 358 373 359 print FOUT "\n"; 360 } 374 print FOUT "\n"; 375 376 } 377 378 } 361 379 362 380 print FOUT "Z\n\n"; … … 486 504 $x += 4; 487 505 506 my $data = $html_node->{'data'}; 507 $attr->{'D'} = $data if defined $data; 508 488 509 $self->addText($x,$y,$text,$w,$attr); 489 510 } … … 510 531 if (open(FNOUT,">$filename")) { 511 532 binmode(FNOUT,":utf8"); 533 534 #writes frameset name concatenated with last frame number in the set to the frame.inf file. 535 my $getFramesetName = $self->{'output_dir'}; 536 print FNOUT "$getFramesetName$last_frame_number\n"; 537 512 538 513 print FNOUT "$last_frame_number\n";514 515 539 close(FNOUT); 516 540 $status = 1; -
gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js
r24944 r25057 130 130 jsonNode.xr = pxr; 131 131 jsonNode.yb = pyb; 132 133 var parent = node.parentNode; 134 if (parent != null) { 135 var data = parent.attributes["data"]; 136 137 if (data != null) { 138 jsonNode.data = data.value; 139 } 140 } 132 141 133 142 }
Note:
See TracChangeset
for help on using the changeset viewer.