| Index: trunk/extensions/SemanticResultFormats/GoogleCharts/SRF_GoogleBar.php |
| — | — | @@ -19,15 +19,10 @@ |
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | | - public function getResult($results, $params, $outputmode) { |
| 24 | | - $result = parent::getResult($results, $params, $outputmode); |
| 25 | | - $this->readParameters($params,$outputmode); |
| 26 | | - return array($result, 'isHTML' => true); |
| 27 | | - } |
| 28 | | - |
| 29 | 23 | protected function getResultText($res, $outputmode) { |
| 30 | 24 | global $smwgIQRunningNumber; |
| 31 | | - |
| | 25 | + $this->isHTML = true; |
| | 26 | + |
| 32 | 27 | $t = ""; |
| 33 | 28 | // print all result rows |
| 34 | 29 | $first = true; |
| Index: trunk/extensions/SemanticResultFormats/GoogleCharts/SRF_GooglePie.php |
| — | — | @@ -25,15 +25,10 @@ |
| 26 | 26 | } |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | | - public function getResult($results, $params, $outputmode) { |
| 30 | | - $result = parent::getResult($results, $params, $outputmode); |
| 31 | | - $this->readParameters($params,$outputmode); |
| 32 | | - return array($result, 'isHTML' => true); |
| 33 | | - } |
| 34 | | - |
| 35 | 29 | protected function getResultText($res, $outputmode) { |
| 36 | 30 | global $smwgIQRunningNumber; |
| 37 | | - |
| | 31 | + $this->isHTML = true; |
| | 32 | + |
| 38 | 33 | $t = ""; |
| 39 | 34 | // print all result rows |
| 40 | 35 | $first = true; |
| — | — | @@ -58,7 +53,6 @@ |
| 59 | 54 | } |
| 60 | 55 | } |
| 61 | 56 | return '<img src="http://chart.apis.google.com/chart?cht=p3&chs=' . $this->m_width . 'x' . $this->m_height . '&chds=0,' . $max . '&chd=t:' . $t . '&chl=' . $n . '" width="' . $this->m_width . '" height="' . $this->m_height . '" />'; |
| 62 | | - |
| 63 | 57 | } |
| 64 | 58 | |
| 65 | 59 | } |
| \ No newline at end of file |
| Index: trunk/extensions/SemanticResultFormats/GraphViz/SRF_Graph.php |
| — | — | @@ -25,16 +25,7 @@ |
| 26 | 26 | protected $m_graphSize=""; |
| 27 | 27 | protected $m_labelArray = array(); |
| 28 | 28 | protected $m_graphColors = array("black","red","green","blue","darkviolet","gold","deeppink","brown","bisque","darkgreen","yellow","darkblue","magenta","steelblue2"); |
| 29 | | - public function getResult($results, $params, $outputmode) { |
| 30 | 29 | |
| 31 | | - $result = parent::getResult($results, $params, $outputmode); |
| 32 | | - |
| 33 | | - $this->readParameters($params,$outputmode); |
| 34 | | - |
| 35 | | - return array($result, 'isHTML' => true); |
| 36 | | - |
| 37 | | - } |
| 38 | | - |
| 39 | 30 | protected function readParameters($params,$outputmode) { |
| 40 | 31 | |
| 41 | 32 | SMWResultPrinter::readParameters($params,$outputmode); |
| — | — | @@ -79,6 +70,7 @@ |
| 80 | 71 | } |
| 81 | 72 | protected function getResultText($res, $outputmode) { |
| 82 | 73 | $wgGraphVizSettings = new GraphVizSettings; |
| | 74 | + $this->isHTML = true; |
| 83 | 75 | |
| 84 | 76 | $key=0; |
| 85 | 77 | // Create text graph |