--- loncom/xml/lonplot.pm 2001/12/28 21:56:16 1.25
+++ loncom/xml/lonplot.pm 2001/12/31 19:02:00 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.25 2001/12/28 21:56:16 matthew Exp $
+# $Id: lonplot.pm,v 1.28 2001/12/31 19:02:00 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,7 +26,7 @@
# http://www.lon-capa.org/
#
# 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 Matthew
+# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 Matthew
package Apache::lonplot;
use strict;
@@ -193,7 +193,7 @@ my %label_defaults =
my %axis_defaults =
(
- color => {
+ color => {
default => 'x000000',
test => $color_test,
description => 'color of axes (x000000)',
@@ -222,13 +222,6 @@ my %axis_defaults =
test => $real_test,
description => 'maximum y-value shown in plot',
edit_type => 'entry'
- },
- linestyle => {
- default => 'points',
- test => $linestyle_test,
- description => 'Style of the axis lines',
- edit_type => 'choice',
- choices => ['lines','linespoints','dots','points']
}
);
@@ -288,7 +281,7 @@ sub start_plot {
($token,$parstack,$safeeval,keys(%plot_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.= &Apache::edit::handle_insert();
+# $result.= &Apache::edit::handle_insert();
}
}
return $result;
@@ -367,8 +360,7 @@ sub start_title {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
$result.='
'.
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
+ &Apache::edit::editfield('',$text,'',20,1);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/function");
$result.=&Apache::edit::modifiedfield($token);
@@ -381,6 +373,7 @@ sub end_title {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
@@ -394,8 +387,7 @@ sub start_xlabel {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
$result.=' |
'.
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
+ &Apache::edit::editfield('',$text,'',20,1);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/function");
$result.=&Apache::edit::modifiedfield($token);
@@ -408,6 +400,7 @@ sub end_xlabel {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
@@ -422,8 +415,7 @@ sub start_ylabel {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
$result .= ' |
'.
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
+ &Apache::edit::editfield('',$text,'',20,1);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/function");
$result.=&Apache::edit::modifiedfield($token);
@@ -436,6 +428,7 @@ sub end_ylabel {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
@@ -459,8 +452,7 @@ sub start_label {
$result .= &edit_attributes($target,$token,\%label_defaults);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
$result .= ' |
'.
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
+ &Apache::edit::editfield('',$text,'',20,1);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));
@@ -496,7 +488,7 @@ sub start_curve {
$tagstack->[-1]);
push (@curves,\%curve);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token,'Plot Curve');
+ $result .= &Apache::edit::tag_start($target,$token,'Curve');
$result .= &edit_attributes($target,$token,\%curve_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
@@ -536,9 +528,7 @@ sub start_function {
$result .= &Apache::edit::tag_start($target,$token,'Curve Function');
my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
$result .= ' |
'.
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
-
+ &Apache::edit::editfield('',$text,'',20,1);
} elsif ($target eq 'modified') {
# Why do I do this?
my $text=$$parser[-1]->get_text("/function");
@@ -552,6 +542,7 @@ sub end_function {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
+ $result .= &Apache::edit::end_table();
}
return $result;
}
@@ -599,8 +590,7 @@ sub start_data {
$result .= &Apache::edit::tag_start($target,$token,'Curve Data');
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
$result .= ' |
'.
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
+ &Apache::edit::editfield('',$text,'',20,1);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/data");
$result.=&Apache::edit::modifiedfield($token);
@@ -613,6 +603,7 @@ sub end_data {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
+ $result .= &Apache::edit::end_table();
}
return $result;
}
@@ -824,7 +815,7 @@ sub insert_plot {
# plot attributes
$result .= '{'default'}.
+ $result .= ' '.$attr.'="'.$plot_defaults{$attr}->{'default'}.
"\"\n";
}
$result .= ">\n";
@@ -847,7 +838,7 @@ sub insert_key {
my $result;
$result .= ' {'default'}.
+ $result .= ' '.$attr.'="'.$key_defaults{$attr}->{'default'}.
"\"\n";
}
$result .= " />\n";
@@ -858,18 +849,22 @@ sub insert_axis{
my $result;
$result .= ' {'default'}.
+ $result .= ' '.$attr.'="'.$axis_defaults{$attr}->{'default'}.
"\"\n";
}
$result .= " />\n";
return $result;
}
+sub insert_title { return " \n"; }
+sub insert_title { return " \n"; }
+sub insert_title { return " \n"; }
+
sub insert_label {
my $result;
$result .= ' \n";
@@ -880,7 +875,7 @@ sub insert_curve {
my $result;
$result .= ' {'default'}."\"\n";
}
$result .= " >\n";
|