Merge lp:~zorba-coders/zorba/project_tag_image into lp:zorba/image-module

Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Chris Hillery
Approved revision: 57
Merged at revision: 56
Proposed branch: lp:~zorba-coders/zorba/project_tag_image
Merge into: lp:zorba/image-module
Diff against target: 138 lines (+4/-86)
5 files modified
src/com/zorba-xquery/www/modules/image/animation.xq (+1/-1)
src/com/zorba-xquery/www/modules/image/basic.xq (+1/-1)
src/com/zorba-xquery/www/modules/image/graphviz.xq (+0/-82)
src/com/zorba-xquery/www/modules/image/manipulation.xq (+1/-1)
src/com/zorba-xquery/www/modules/image/paint.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/project_tag_image
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+169640@code.launchpad.net

Commit message

- updated project TAG
- removed graphviz module file that is a left over from the time Graphviz moved to a separate module branch

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) wrote :

Were there any graphviz test cases here?

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job project_tag_image-2013-06-15T22-37-43.165Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

> Were there any graphviz test cases here?
The module itself was the last thing needed to ge removed from image branch after Graphviz was moved to a separate module branch.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job project_tag_image-2013-06-17T09-04-39.75Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/image/animation.xq'
2--- src/com/zorba-xquery/www/modules/image/animation.xq 2011-08-13 00:08:33 +0000
3+++ src/com/zorba-xquery/www/modules/image/animation.xq 2013-06-15 17:10:37 +0000
4@@ -21,7 +21,7 @@
5
6 : @author Daniel Thomas
7 : @library <a href="http://www.imagemagick.org/Magick++/">Magick++ C++ Library</a>
8- : @project image
9+ : @project Zorba/Image/Animation
10 :)
11 module namespace anim = 'http://www.zorba-xquery.com/modules/image/animation';
12
13
14=== modified file 'src/com/zorba-xquery/www/modules/image/basic.xq'
15--- src/com/zorba-xquery/www/modules/image/basic.xq 2012-11-09 08:41:54 +0000
16+++ src/com/zorba-xquery/www/modules/image/basic.xq 2013-06-15 17:10:37 +0000
17@@ -40,7 +40,7 @@
18 :
19 : @author Daniel Thomas
20 : @library <a href="http://www.imagemagick.org/Magick++/">Magick++ C++ Library</a>
21- : @project image
22+ : @project Zorba/Image/Basic
23 :
24 :)
25 module namespace basic = 'http://www.zorba-xquery.com/modules/image/basic';
26
27=== removed file 'src/com/zorba-xquery/www/modules/image/graphviz.xq'
28--- src/com/zorba-xquery/www/modules/image/graphviz.xq 2011-08-01 11:26:35 +0000
29+++ src/com/zorba-xquery/www/modules/image/graphviz.xq 1970-01-01 00:00:00 +0000
30@@ -1,82 +0,0 @@
31-xquery version "1.0";
32-
33-(:
34- : Copyright 2006-2009 The FLWOR Foundation.
35- :
36- : Licensed under the Apache License, Version 2.0 (the "License");
37- : you may not use this file except in compliance with the License.
38- : You may obtain a copy of the License at
39- :
40- : http://www.apache.org/licenses/LICENSE-2.0
41- :
42- : Unless required by applicable law or agreed to in writing, software
43- : distributed under the License is distributed on an "AS IS" BASIS,
44- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
45- : See the License for the specific language governing permissions and
46- : limitations under the License.
47- :)
48-
49-(:~
50- : <p>Module that provides functions for generating SVG graphs.</p>
51- :
52- : <p>The module provides two function for generating graphs given in the :
53- : <ul><li>DOT language (see <a href="http://www.graphviz.org/">
54- : http://www.graphviz.org</a>)</li><li>or in the XML-based Graph eXchange
55- : Language (see <a href="http://www.gupro.de/GXL/">http://www.gupro.de/GXL/</a>),
56- : respectively.</li></ul>
57- : Both functions use the Graphviz Visualization Library in order to
58- : layout and render the graphs. As a result, both return a sequence
59- : of (document)-nodes (one for each input graph).
60- : These nodes are instances of the Scalable Vector Graphics (SVG) format.
61- : SVG is a language for describing two-dimensional graphics and
62- : graphical applications in XML. More information about SVG can
63- : be found at <a href="http://www.w3.org/Graphics/SVG/">http://www.w3.org/Graphics/SVG/</a>.
64- : As second parameters, both functions take a sequence of strings that
65- : are parameters for the graph generation and rendering algorithms.
66- : Currently, only the empty-sequence is allowed here.
67- : These parameters exist for future use.</p>
68- : <p>Please note that this feature is only available on Unix-based
69- : platforms (i.e. not on Windows).</p>
70- :
71- : @author <a href="http://www.28msec.com/home/index">28msec</a>
72- : @library <a href="http://www.graphviz.org/">Graphviz - Graph Visualization Software</a>
73- : @project image
74- :)
75-module namespace gr = "http://www.zorba-xquery.com/modules/image/graphviz";
76-
77-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
78-declare option ver:module-version "1.0";
79-
80-(:~
81- : Layout one ore more graphs given in the DOT language and render
82- : them as SVG. For example,
83- :
84- : <p><code>
85- : dot("digraph mygraph { p -> q }", ())
86- : </code></p>
87- :
88- : @param $dot A dot description of the graph to render.
89- : @param $params Parameters to configure the layout and rendering
90- : process. Currently, only the empty-sequence is allowed here.
91- : @return A graph for each item in the sequence given using the first
92- : parameter. The result sequence consists of items which are
93- : instance of the SVG data model.
94- :)
95-declare function gr:dot(
96- $dot as xs:string*,
97- $params as xs:string*) as node()* external;
98-
99-(:~
100- : Layout one ore more graphs given in the GXL language and render
101- : them as SVG.
102- :
103- : @param $gxl A GXL description of the graph to render.
104- : @param $params Parameters to configure the layout and rendering
105- : process. Currently, only the empty-sequence is allowed here.
106- : @return A graph for each item in the sequence given using the first
107- : parameter. The result sequence consists of items which are
108- : instance of the SVG data model.
109- :)
110-declare function gr:gxl(
111- $gxl as node()*,
112- $params as xs:string*) as node()* external;
113
114=== modified file 'src/com/zorba-xquery/www/modules/image/manipulation.xq'
115--- src/com/zorba-xquery/www/modules/image/manipulation.xq 2011-08-18 21:23:27 +0000
116+++ src/com/zorba-xquery/www/modules/image/manipulation.xq 2013-06-15 17:10:37 +0000
117@@ -41,7 +41,7 @@
118 :
119 : @author Daniel Thomas
120 : @library <a href="http://www.imagemagick.org/Magick++/">Magick++ C++ Library</a>
121- : @project image
122+ : @project Zorba/Image/Manipulation
123 :
124 :)
125 module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
126
127=== modified file 'src/com/zorba-xquery/www/modules/image/paint.xq'
128--- src/com/zorba-xquery/www/modules/image/paint.xq 2011-08-07 00:38:36 +0000
129+++ src/com/zorba-xquery/www/modules/image/paint.xq 2013-06-15 17:10:37 +0000
130@@ -33,7 +33,7 @@
131 :
132 : @author Daniel Thomas
133 : @library <a href="http://www.imagemagick.org/Magick++/">Magick++ C++ Library</a>
134- : @project image
135+ : @project Zorba/Image/Paint
136 :
137 :)
138 module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';

Subscribers

People subscribed via source and target branches

to all changes: