Changeset 7331

Timestamp:

2004-05-13T20:43:56+12:00 (20 years ago)

Author:

davidb

Message:

Collage classifier extended to include "dynamic"
parameters: that is to say parameters specified
as options to the Perl classifier that affect
the collaging at runtime, such as specifying the
width and height of the applet and the background
colour.

File:

• trunk/gsdl/perllib/classify/Collage.pm (modified) (6 diffs)

trunk/gsdl/perllib/classify/Collage.pm

@@ -1 @@
-###########################################################################
+##########################################################################
 #
 # Collage.pm --
@@ -38 +38 @@
     'type' => "string",
     'deft' => "Collage",
-    'reqd' => "no" }];
+    'reqd' => "no" }, 
+      { 'name' => "geometry",
+    'desc' => "{BasClas.geometry}",
+    'type' => "string",
+    'deft' => "600x300",
+    'reqd' => "no" },
+      { 'name' => "verbosity",
+    'desc' => "{BasClas.verbosity}",
+    'type' => "string",
+    'deft' => "5",
+    'reqd' => "no" },
+      { 'name' => "maxDepth",
+    'desc' => "{BasClas.maxDepth}",
+    'type' => "string",
+    'deft' => "3"},
+#      { 'name' => "maxDownloads",
+#   'desc' => "{BasClas.maxDownloads}",
+#   'type' => "string",
+#   'deft' => "",
+#   'reqd' => "no" },
+      { 'name' => "maxDisplay",
+    'desc' => "{BasClas.maxDisplay}",
+    'type' => "string",
+    'deft' => "25",
+    'reqd' => "no" },
+      { 'name' => "imageType",
+    'desc' => "{BasClas.imageType}",
+    'type' => "string",
+    'deft' => ".jpg%.png",
+    'reqd' => "no" },
+      { 'name' => "bgcolor",
+    'desc' => "{BasClas.bgcolor}",
+    'type' => "string",
+    'deft' => "#96c29a",
+    'reqd' => "no" },
+      { 'name' => "refreshDelay",
+    'desc' => "{BasClas.refreshDelay}",
+    'type' => "string",
+    'deft' => "1500",
+    'reqd' => "no" },
+      { 'name' => "isJava2",
+    'desc' => "{BasClas.isJava2}",
+    'type' => "string",
+    'deft' => "auto",
+    'reqd' => "no" },
+      { 'name' => "imageMustNotHave",
+    'desc' => "{BasClas.imageMustNotHave}",
+    'type' => "string",
+    'deft' => "hl=\%x=\%gt=\%gc=\%.pr",
+    'reqd' => "no" },
+      { 'name' => "caption",
+    'desc' => "{BasClas.caption}",
+    'type' => "string",
+    'deft' => "",
+    'reqd' => "no" }
+      ];
+
+
+
 
 my $options = { 'name'     => "Collage",
@@ -58 +116 @@
     }   
 
-    my ($title, $list);
+    my ($title, $geometry, $verbosity, $maxDepth, $imageType, $bgcolor, $refreshDelay, $isJava2, $caption, $maxDisplay, $maxDownloads, $list);
 
     if (!parsargv::parse(\@_, 
-             q^buttonname/.*/^, \$title,
+             q^buttonname/.*/Collage^, \$title,
+             q^geometry/.*/600x300^, \$geometry,
+             q^verbosity/.*/3^, \$verbosity,
+             q^maxDepth/.*/3^, \$maxDepth,
+#            q^maxDownloads/.*/^, \$maxDownloads,
+             q^maxDisplay/.*/25^, \$maxDisplay,
+             q^imageType/.*/.jpg%.png^, \$imageType,
+             q^bgcolor/.*/\#96c29a^, \$bgcolor,
+             q^refreshDelay/.*/1200^, \$refreshDelay,
+             q^isJava2/.*/auto^, \$isJava2,
+             q^imageMustNotHave/.*/hl=\%x=\%gt=\%gc=\%.pr^, \$imageMustNotHave,
+             q^caption/.*/ ^, \$caption,
              "allow_extra_options")) {
     
@@ -76 +145 @@
     $self->{'list'} = $list;
     $self->{'title'} = $title;
-    
+    $self->{'geometry'} = $geometry;
+    $self->{'verbosity'} = $verbosity;
+    $self->{'maxDepth'} = $maxDepth;
+    $self->{'maxDownloads'} = $maxDownloads;
+    $self->{'maxDisplay'} = $maxDisplay;
+    $self->{'imageType'} = $imageType;
+    $self->{'bgcolor'} = $bgcolor;
+    $self->{'refreshDelay'} = $refreshDelay;
+    $self->{'isJava2'} = $isJava2;
+#    $self->{'imageMustNotHave'} = $imageMustNotHave;
+    $self->{'caption'} = $caption;
     return bless $self, $class;
 }
@@ -122 +201 @@
 
     return $classifyinfo;
+
 }
 
@@ -128 +208 @@
     my $self = shift (@_);
     my ($title, $childtype, $thistype) = @_;
-    
-    
+
+    my $geometry = $self->{'geometry'};
+    my ($x_dim,$y_dim) = ($geometry =~ m/^(.*)x(.*)$/);
+    my $verbosity = $self->{'verbosity'};
+    my $maxDepth = $self->{'maxDepth'};
+#    my $maxDownloads = $self->{'maxDownloads'};
+    my $maxDisplay = $self->{'maxDisplay'};
+    my $imageType = $self->{'imageType'};
+    my $bgcolor = $self->{'bgcolor'};
+    my $refreshDelay = $self->{'refreshDelay'};
+    my $isJava2 = $self->{'isJava2'};
+    my $imageMustNotHave = $self->{'imageMustNotHave'};
+    my $caption = $self->{'caption'};
+
+    if (!defined($maxDownloads)) {
+    $maxDownloads="";
+    }
+
+    my $parameters;
+
+    $parameters = "xdim=".$x_dim;
+    $parameters .= ";ydim=".$y_dim;
+    $parameters .= ";geometry=".$self->{'geometry'};
+    $parameters .= ";verbosity=".$self->{'verbosity'};
+    $parameters .= ";maxDepth=".$self->{'maxDepth'};
+#    $parameters .= ";maxDownloads=".$maxDownloads;
+    $parameters .= ";maxDisplay=".$self->{'maxDisplay'};
+    $parameters .= ";imageType=".$self->{'imageType'};
+    $parameters .= ";bgcolor=".$self->{'bgcolor'};
+    $parameters .= ";refreshDelay=".$self->{'refreshDelay'};
+    $parameters .= ";isJava2=".$self->{'isJava2'};
+    $parameters .= ";caption=".$self->{'caption'};
+
+#    $parameters .= ";imageMustNotHave=".$self->{'imageMustNotHave'};
+
     # organise into classification structure
     my %classifyinfo = ('thistype'=>$thistype,
             'childtype'=>$childtype,
             'Title'=>$title,
+                        'parameters'=> $parameters,
             'contains'=>[]);