Index: branches/cones-final/apps/common/perllib/JReality.pm =================================================================== --- branches/cones-final/apps/common/perllib/JReality.pm (revision 10040) +++ branches/cones-final/apps/common/perllib/JReality.pm (revision 10049) @@ -134,19 +134,16 @@ sub add_vertex_thickness { my ($self,$factory_name) = @_; my $thickness=$self->source->VertexThickness; - my @thicknesses = (0..$#{$self->source->Vertices}); - my $text = ""; - #wenn es text ist, dann ueberall die gleich thickness, wenn es code ist, dann halt verschiedene. -my $text=<<"."; + my $text = <<"."; pts_thicknesses = new double[] { . - map { - $_ = (is_code($thickness)? &$thickness($_) : - ($thickness | 1) - )*$JReality::default::points_thickness - } @thicknesses; - $text .= join(",",@thicknesses)." };\n"; - $text .= "$factory_name.setVertexRelativeRadii( pts_thicknesses );\n"; + $text .= join(",", map { + defined((is_code($thickness) ? &$thickness($_) : $thickness) || 1) * $JReality::default::points_thickness + } 0..$#{$self->source->Vertices}); + $text .= <<"."; + }; +$factory_name.setVertexRelativeRadii( pts_thicknesses ); +. return $text; } @@ -285,19 +282,18 @@ sub add_line_thickness { my ($self,$factory_name)=@_; my $thickness=$self->source->EdgeThickness; - my @thicknesses = (0..($self->source->n_edges-1)); - my $text = ""; - #wenn es text ist, dann ueberall die gleich thickness, wenn es code ist, dann halt verschiedene. -my $text=<<"."; + my @thicknesses = (); + my $text =<< "."; lines_thicknesses = new double[] { . - map { - $_ = (is_code($thickness)? &$thickness($_) : - ($thickness | 1) - )*$JReality::default::lines_thickness - } @thicknesses; - $text .= join(",",@thicknesses)." };\n"; - $text .= "$factory_name.setEdgeRelativeRadii( lines_thicknesses); \n"; + $text .= join(",", map { + defined((is_code($thickness)? &$thickness($_) : $thickness) || 1) * $JReality::default::lines_thickness + } 0..($self->source->n_edges-1)); + $text .= <<"."; + }; +$factory_name.setEdgeRelativeRadii( lines_thicknesses ); +. + return $text; } sub add_line_labels {