'.
+ &Apache::edit::editfield('',$text,'',20,1).
+ &Apache::edit::end_table();
+ } elsif ($target eq 'modified') {
+ # Why do I do this?
+ my $text=$$parser[-1]->get_text("/function");
+ $result.=&Apache::edit::modifiedfield($token);
}
return $result;
}
@@ -288,32 +530,54 @@ sub end_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target eq 'web') {
- # This routine should never return anything.
+ } elsif ($target eq 'edit') {
}
return $result;
}
+
##------------------------------------------------------------ curve data
sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if (exists($curves[-1]->{'function'})) {
- &Apache::lonxml::warning('Use of precludes use of . The will be omitted in favor of the declaration.');
- delete($curves[-1]->{'function'});
- }
- my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
- $datatext =~ s/(\s+$|^\s+)//g;
- $datatext =~ s/\s+/ /g;
- if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {
- &Apache::lonxml::warning('Malformed data: '.$datatext);
- $datatext = '';
- }
- # Need to do some error checking on the @data array -
- # make sure it's all numbers and make sure each array
- # is of the same length.
- my @data = split /[, ]/,$datatext;
- push( @{$curves[-1]->{'data'}},\@data;
if ($target eq 'web') {
- # This routine should never return anything.
+ if (exists($curves[-1]->{'function'})) {
+ &Apache::lonxml::warning('Use of precludes use of .'.
+ '. The will be omitted in favor of '.
+ 'the declaration.');
+ delete($curves[-1]->{'function'});
+ }
+ my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
+ $datatext =~ s/\s+/ /g;
+ # Need to do some error checking on the @data array -
+ # make sure it's all numbers and make sure each array
+ # is of the same length.
+ my @data;
+ if ($datatext =~ /,/) {
+ @data = split /,/,$datatext;
+ } else { # Assume it's space seperated.
+ @data = split / /,$datatext;
+ }
+ for (my $i=0;$i<=$#data;$i++) {
+ # Check that it's non-empty
+ if (! defined($data[$i])) {
+ &Apache::lonxml::warning(
+ 'undefined value. Replacing with '.
+ ' pi/e = 1.15572734979092');
+ $data[$i] = 1.15572734979092;
+ }
+ # Check that it's a number
+ if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
+ &Apache::lonxml::warning(
+ 'Bad value of '.$data[$i].' Replacing with '.
+ ' pi/e = 1.15572734979092');
+ $data[$i] = 1.15572734979092;
+ }
+ }
+ push @{$curves[-1]->{'data'}},\@data;
+ } elsif ($target eq 'edit') {
+ } elsif ($target eq 'modified') {
+ my $text=$$parser[-1]->get_text("/data");
+ $result.=&Apache::edit::modifiedfield($token);
}
return $result;
}
@@ -322,7 +586,7 @@ sub end_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target eq 'web') {
- # This routine should never return anything.
+ } elsif ($target eq 'edit') {
}
return $result;
}
@@ -331,9 +595,13 @@ sub end_data {
sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);
if ($target eq 'web') {
- # This routine should never return anything.
+ &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
+ $tagstack->[-1]);
+ } elsif ($target eq 'edit') {
+ $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &edit_attributes($target,$token,\%axis_defaults);
+ } elsif ($target eq 'modified') {
}
return $result;
}
@@ -342,112 +610,270 @@ sub end_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target eq 'web') {
- # This routine should never return anything.
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_end($target,$token);
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args
+ ($token,$parstack,$safeeval,keys %axis_defaults);
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.= &Apache::edit::handle_insert();
+ }
}
return $result;
}
+###################################################################
+## ##
+## Utility Functions ##
+## ##
+###################################################################
+
+##----------------------------------------------------------- set_defaults
+sub set_defaults {
+ my ($var,$defaults) = @_;
+ my $key;
+ foreach $key (keys %$defaults) {
+ $var->{$key} = $defaults->{$key}->{'default'};
+ }
+}
+
##------------------------------------------------------------------- misc
sub get_attributes{
- %values = %{shift};
- %defaults = %{shift};
- $parstack = shift;
- $safeeval = shift;
- $tag = shift;
- my $attr;
- foreach $attr (keys %defaults) {
- $values{$attr} = &Apache::lonxml::get_param($attr,$parstack,$safeeval);
- if ($values{$attr} eq '' | !defined($values{$attr})) {
- $values{$attr} = $defaults{$attr};
+ my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
+ foreach my $attr (keys %{$defaults}) {
+ $values->{$attr} =
+ &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+ if ($values->{$attr} eq '' | !defined($values->{$attr})) {
+ $values->{$attr} = $defaults->{$attr}->{'default'};
next;
}
- my $test = $defaults{$attr}->{'test'};
- if (! &$test($values{$attr})) {
+ my $test = $defaults->{$attr}->{'test'};
+ if (! &$test($values->{$attr})) {
&Apache::lonxml::warning
($tag.':'.$attr.': Bad value.'.'Replacing your value with : '
- .$defaults{$attr} );
- $values{$attr} = $defaults{$attr};
+ .$defaults->{$attr}->{'default'} );
+ $values->{$attr} = $defaults->{$attr}->{'default'};
+ }
}
return ;
}
-
+##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
- my $fh = shift;
my $gnuplot_input = '';
+ my $curve;
# Collect all the colors
my @Colors;
push @Colors, $plot{'bgcolor'};
push @Colors, $plot{'fgcolor'};
- push @Colors, $axis{'color'};
- push @Colors, $axis{'color'};
- foreach $curve (@Curves) {
- push @Colors, ($curve{'color'} ne '' ?
- $curve{'color'} :
- $plot{'fgcolor'} );
+ push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
+ foreach $curve (@curves) {
+ push @Colors, ($curve->{'color'} ne '' ?
+ $curve->{'color'} :
+ $plot{'fgcolor'} );
}
# set term
$gnuplot_input .= 'set term gif ';
$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
$gnuplot_input .= $plot{'font'} . ' ';
- $gnuplot_input .= 'size ' . $plot{'width'} . ' ';
- $gnuplot_input .= $plot{'height'} . ' ';
+ $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
$gnuplot_input .= "@Colors\n";
- # title, xlabel, ylabel
- {
- $gnuplot_input .<<"ENDLABELS";
-set title $title->{'text'}
-set xlabel $xlabel->{'text'}
-set ylabel $ylabel->{'text'}
-set xrange $axis->{'xmin'}:$axis->{'xmax'}
-set yrange $axis->{'ymin'}:$axis->{'ymax'}
-ENDLABELS
+ # grid
+ $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
+ # border
+ $gnuplot_input .= ($plot{'border'} eq 'on'?
+ 'set border'.$/ :
+ 'set noborder'.$/ ); # title, xlabel, ylabel
+ $gnuplot_input .= "set output\n";
+ $gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
+ if (defined(%axis)) {
+ $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
+ $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
}
# Key
- if (defined($key{'pos'})) {
- $gnuplot_input .= 'set key '.$key->{'pos'}.' ';
- $gnuplot_input .= ($key->{'box'} eq 'on' ? 'box ' : 'nobox ');
- if ($key->{'title'} ne '') {
- $gnuplot_input .= 'title "'$key->{'title'}.'"\n';
- } else {
- $gnuplot_input .= '\n';
- }
+ if (defined(%key)) {
+ $gnuplot_input .= 'set key '.$key{'pos'}.' ';
+ if ($key{'title'} ne '') {
+ $gnuplot_input .= 'title "'.$key{'title'}.'" ';
+ }
+ $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
} else {
- $gnuplot_input .= 'set nokey\n';
- }
- # axis
- $gnuplot_input .= 'set xrange ['.$axis{'xmin'}.':'.$axis{'xmin'}.']\n';
- $gnuplot_input .= 'set yrange ['.$axis{'ymin'}.':'.$axis{'ymin'}.']\n';
+ $gnuplot_input .= 'set nokey'.$/;
+ }
# labels
+ my $label;
foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
- $label->{'x'}.','.$label->{'y'}.'\n';
+ $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;
}
# curves
$gnuplot_input .= 'plot ';
my $datatext = '';
- foreach $curve (@curves) {
+ for (my $i = 0;$i<=$#curves;$i++) {
+ $curve = $curves[$i];
+ $gnuplot_input.= ', ' if ($i > 0);
if (exists($curve->{'function'})) {
- $gnuplot_input.= $curve->{'function'}.' with '.$curve->{'linestyle'};
+ $gnuplot_input.=
+ $curve->{'function'}.' title "'.
+ $curve->{'name'}.'" with '.
+ $curve->{'linestyle'};
} elsif (exists($curve->{'data'})) {
- $gnuplot_input.= '\'-\' with '.$curve->{'linestyle'};
+ $gnuplot_input.= '\'-\' title "'.
+ $curve->{'name'}.'" with '.
+ $curve->{'linestyle'};
my @Data = @{$curve->{'data'}};
- for ($i =0; $i<=$#Data; $i++) {
+ my @Data0 = @{$Data[0]};
+ for (my $i =0; $i<=$#Data0; $i++) {
+ my $dataset;
foreach $dataset (@Data) {
- $datatext .= $dataset[$i] . ' ';
+ $datatext .= $dataset->[$i] . ' ';
}
- $datatext .='\n';
+ $datatext .= $/;
}
- $datatext .='\n';
+ $datatext .=$/;
}
}
- $gnuplot_input .= $datatext;
- print $fh $gnuplot_input;
+ $gnuplot_input .= $/.$datatext;
+ return $gnuplot_input;
+}
+
+#---------------------------------------------- check_inputs
+sub check_inputs {
+ ## Note: no inputs, no outputs - this acts only on global variables.
+ ## Make sure we have all the input we need:
+ if (! defined(%plot )) { &set_defaults(\%plot,\%plot_defaults); }
+ if (! defined(%key )) {} # No key for this plot, thats okay
+ if (! defined(%axis )) { &set_defaults(\%axis,\%axis_defaults); }
+ if (! defined($title )) {} # No title for this plot, thats okay
+ if (! defined($xlabel)) {} # No xlabel for this plot, thats okay
+ if (! defined($ylabel)) {} # No ylabel for this plot, thats okay
+ if ($#labels < 0) { } # No labels for this plot, thats okay
+ if ($#curves < 0) {
+ &Apache::lonxml::warning("No curves specified for plot!!!!");
+ return '';
+ }
+ my $curve;
+ foreach $curve (@curves) {
+ if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
+ &Apache::lonxml::warning("One of the curves specified did not contain any or declarations\n");
+ return '';
+ }
+ }
+}
+
+#------------------------------------------------ make_edit
+sub edit_attributes {
+ my ($target,$token,$defaults) = @_;
+ my $result;
+ foreach my $attr (%$defaults) {
+ if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
+ $result .= &Apache::edit::text_arg(
+ $defaults->{$attr}->{'description'},
+ $attr,
+ $token);
+ } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
+ $result .= &Apache::edit::select_arg(
+ $defaults->{$attr}->{'description'},
+ $attr,
+ $defaults->{$attr}->{'choices'},
+ $token);
+ }
+ }
+ return $result;
}
-1;
-__END__
+###################################################################
+## ##
+## Insertion functions for editing plots ##
+## ##
+###################################################################
+
+#------------------------------------------------ insert_xxxxxxx
+sub insert_plot {
+ my $result;
+ # plot attributes
+ $result .= '{'default'}.
+ "\"\n";
+ }
+ $result .= ">\n";
+ # Add the components
+ $result .= &insert_key();
+ $result .= &insert_axis();
+ $result .= &insert_label();
+ $result .= &insert_curve();
+ $result .= &insert_function();
+ $result .= "\n";
+ $result .= &insert_curve();
+ $result .= &insert_data();
+ $result .= "\n";
+ # close up the
+ $result .= "\n";
+ return $result;
+}
+sub insert_key {
+ my $result;
+ $result .= ' {'default'}.
+ "\"\n";
+ }
+ $result .= " />\n";
+ return $result;
+}
+sub insert_axis{
+ my $result;
+ $result .= ' {'default'}.
+ "\"\n";
+ }
+ $result .= " />\n";
+ return $result;
+}
+
+sub insert_label {
+ my $result;
+ $result .= ' \n";
+ return $result;
+}
+
+sub insert_curve {
+ my $result;
+ $result .= ' {'default'}."\"\n";
+ }
+ $result .= " >\n";
+}
+
+sub insert_function {
+ my $result;
+ $result .= "\n";
+ return $result;
+}
+
+sub insert_data {
+ my $result;
+ $result .= " \n";
+ $result .= " \n";
+ return $result;
+}
+
+##----------------------------------------------------------------------
+1;
+__END__
|