Adding the graphing engine.

docs/changelog/6.x.x.txt

@@ -131,6 +131,7 @@
  - fix [ 1172613 ] Header Tag Not Accessibility Friendly
  - fix [ 1340839 ] If can't use item in adminConsole don't display it
  - fix [ 1473937 ] scratch->set not taking.
+ - Added a graphing engine and tied it into the Poll asset (Martin Kamerbeek / Procolix)
 
 6.8.8
  - fix [ 1452466 ] File size not set in File asset (Thanks to Eric S)

docs/gotcha.txt

@@ -42,6 +42,9 @@ save you many hours of grief.
 	Net::Subnets
 	DateTime::Format::Mail
 	Net::POP3
+	POSIX
+	List::Util
+	Color::Calc
 
  * The upgrade script is going to convert your WebGUI config files
 	from the current PlainConfig format to the new JSON format.

docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl

@@ -27,16 +27,20 @@
 	<tmpl_var form.submit>
 	<tmpl_var form.end>
 <tmpl_else>
-	<tmpl_loop answer_loop>
-		<span class="pollAnswer"><tmpl_var answer.text><br /></span>
-		<table cellpadding=0 cellspacing=0 border=0>
-		<tr>
-			<td width="<tmpl_var answer.graphWidth>" class="pollColor">^Spacer(1,1);</td>
-			<td class="pollAnswer">&nbsp;&nbsp;<tmpl_var answer.percent>% (<tmpl_var answer.total>)</td>
-		</tr>
-		</table>
-	</tmpl_loop>
-	<span class="pollAnswer"><hr size="1"><b><tmpl_var responses.label>:</b> <tmpl_var responses.total></span>
+	<tmpl_if hasImageGraph>
+		<img src="<tmpl_var graphUrl>" />
+	<tmpl_else>
+		<tmpl_loop answer_loop>
+			<span class="pollAnswer"><tmpl_var answer.text><br /></span>
+			<table cellpadding=0 cellspacing=0 border=0>
+			<tr>
+				<td width="<tmpl_var answer.graphWidth>" class="pollColor">^Spacer(1,1);</td>
+				<td class="pollAnswer">&nbsp;&nbsp;<tmpl_var answer.percent>% (<tmpl_var answer.total>)</td>
+			</tr>
+			</table>
+		</tmpl_loop>
+		<span class="pollAnswer"><hr size="1"><b><tmpl_var responses.label>:</b> <tmpl_var responses.total></span>
+	</tmpl_if>
 </tmpl_if>
 </div>
 

docs/upgrades/upgrade_6.8.8-6.99.0.pl

@@ -53,6 +53,7 @@ updateScratch();
 installSQLForm();
 addResizableTextareas();
 addScratchKeys();
+addGraphing();
 
 finish($session); # this line required
 
@@ -1066,7 +1067,82 @@ ENDOFQUERY5
 	$session->config->addToArray("assets","WebGUI::Asset::Wobject::SQLForm");
 }
 
+sub addGraphing {
+	print "\tAdding graphing system.\n" unless ($quiet);
+	
+	# Create palette and color manager tables.
+	$session->db->write(<<GRAPH1
+create table imageColor (
+	colorId			varchar(22) binary not null primary key,
+	name			varchar(255) not null default 'untitled',
+	fillTriplet		char(7) not null default '#000000',
+	fillAlpha		char(2) not null default '00',
+	strokeTriplet		char(7) not null default '#000000',
+	strokeAlpha		char(2) not null default '00'
+);
+GRAPH1
+);
 
+	$session->db->write(<<GRAPH2
+create table imagePalette (
+	paletteId		varchar(22) binary not null primary key,
+	name			varchar(255) not null default 'untitled'
+);
+GRAPH2
+);
+	
+	$session->db->write(<<GRAPH3
+create table imagePaletteColors (
+	paletteId		varchar(22) binary not null,
+	colorId			varchar(22) binary not null,
+	paletteOrder		int(11) not null,
+	primary key(paletteId, paletteOrder)
+);
+GRAPH3
+);
+
+	# Insert default palette
+	$session->db->write(<<GR1
+INSERT INTO `imageColor` VALUES 
+	('UVL-iDSq7VTks3RCH2FEWg','Green','#31ca31','99','#31ca31','00'),
+	('3Tf0W_tkAjR902FJcGZxCg','Blue','#007dff','99','#007dff','00'),
+	('fuFripVJ4es4bUBPOq3ENQ','Yellow','#ffda08','99','#ffda08','00'),
+	('n3yfk8JGilmChSer2xuZ0w','Orange','#FF8000','99','#FF8000','00'),
+	('W683fO6r8uHgZ-Z-VodY7w','Red','#FF2000','99','#FF2000','00'),
+	('pSnxDIInB9r0n06q6kKV3w','Purple','#FF00B0','99','#FF00B0','00');
+GR1
+);
+
+	$session->db->write(q|INSERT INTO `imagePalette` VALUES ('defaultPalette','Default palette')|);
+
+	$session->db->write(<<GR2
+INSERT INTO `imagePaletteColors` VALUES 
+	('defaultPalette','UVL-iDSq7VTks3RCH2FEWg',1),
+	('defaultPalette','3Tf0W_tkAjR902FJcGZxCg',2),
+	('defaultPalette','fuFripVJ4es4bUBPOq3ENQ',3),
+	('defaultPalette','n3yfk8JGilmChSer2xuZ0w',4),
+	('defaultPalette','W683fO6r8uHgZ-Z-VodY7w',5),
+	('defaultPalette','pSnxDIInB9r0n06q6kKV3w',6);
+GR2
+);	
+
+	# Create fontmanager tables.
+	$session->db->write(<<GRAPH4
+create table imageFont (
+	fontId 			varchar(22) binary not null primary key, 
+	name 			varchar(255), 
+	storageId 		varchar(22), 
+	filename 		varchar(255)
+);
+GRAPH4
+);
+
+	$session->db->write(q|insert into imageFont (fontId, name, filename) values ('defaultFont', 'WebGUI default font', 'default.ttf')|);
+
+	# Update Poll table.
+	$session->db->write('alter table Poll add column graphConfiguration text');
+	$session->db->write('alter table Poll add column generateGraph tinyint(1)');
+}
 
 # ---- DO NOT EDIT BELOW THIS LINE ----