summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--html/en/drv/gdk.html113
-rw-r--r--html/en/drv/svg.html93
-rw-r--r--html/en/history.html1
-rw-r--r--html/en/prod.html12
-rw-r--r--html/en/to_do.html1
-rw-r--r--html/wb/wb_usr.lua8
-rw-r--r--html/wb_search.txt16
-rw-r--r--html/wb_tree.html26
-rw-r--r--mak.vc9/cd.vcproj24
-rw-r--r--src/cd.def1
-rw-r--r--src/config.mak5
-rw-r--r--src/lua3/cdluactx.c24
-rw-r--r--src/lua5/cdlua5ctx.c22
-rw-r--r--test/cdtest/cdtest.led1
-rw-r--r--test/cdtest/cdtest_led.c594
-rw-r--r--test/cdtest/config.mak5
-rw-r--r--test/cdtest/drivers.c26
-rw-r--r--test/simple/.cvsignore1
-rw-r--r--test/simple/config.mak10
-rw-r--r--test/simple/iupmain.c1
-rw-r--r--test/simple/simple.c7
-rw-r--r--test/simple/simple.h1
-rw-r--r--test/simple/simple.led1
-rw-r--r--test/simple/simple_led.c3
24 files changed, 667 insertions, 329 deletions
diff --git a/html/en/drv/gdk.html b/html/en/drv/gdk.html
new file mode 100644
index 0000000..df5aab2
--- /dev/null
+++ b/html/en/drv/gdk.html
@@ -0,0 +1,113 @@
+<!doctype HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>GDK</title>
+<link rel="stylesheet" type="text/css" href="../../style.css">
+</head>
+
+<body>
+
+<h2>GDK Base Driver</h2>
+
+ <p>This driver represents a basic driver for all system-dependent drivers
+ implemented in the X-Windows system. The implementation uses the
+ <a href="http://library.gnome.org/devel/gdk/">GDK</a> and
+ <a href="http://library.gnome.org/devel/cairo/">Cairo</a> API
+ functions. This driver was designed for the GTK+ version 2, and can be
+ compiled and used in Microsoft Windows system.</p>
+
+<h3>Behavior of Functions</h3>
+<h4>Control&nbsp; </h4>
+<ul>
+ <li><a href="../func/other.html#cdPlay">
+ <font face="Courier"><strong>Play</strong></font></a>: does nothing, returns
+ <font face="Courier">CD_ERROR</font>. </li>
+</ul>
+<h4>Coordinate System and Clipping </h4>
+<ul>
+ <li>
+ <a href="../func/coordinates.html#cdUpdateYAxis">
+ <font face="Courier"><strong>UpdateYAxis</strong></font></a>: the
+ orientation of axis Y is the opposite to its orientation in the CD library.</li>
+</ul>
+<h4>Attributes </h4>
+<ul>
+ <li>
+ <a href="../func/lines.html#cdLineWidth">
+ <font face="Courier"><strong>LineWidth</strong></font></a>: if
+ <font face="Courier">width</font> is 1, the driver will use 0 for a better
+ performance.</li>
+ <li>
+ <a href="../func/lines.html#cdLineStyle">
+ <font face="Courier"><strong>LineStyle</strong></font></a>: thick lines have
+ style only in the line's direction. For example, you will see small rectangles
+ in a thick dotted line.</li>
+ <li>
+ <a href="../func/text.html#cdNativeFont">
+ <font face="Courier"><strong>NativeFont</strong></font></a>: also accepts the
+ X-Windows font string format. A scaled font is generated using the font size
+ and the font face.</li>
+ <li><a href="../func/text.html#cdFont">
+ <font face="Courier"><strong>Font</strong></font></a>: the old name &quot;System&quot;
+ is mapped to &quot;fixed&quot;. A scaled font is generated using the font size
+ and the font face.</li>
+</ul>
+<h4>Colors </h4>
+<ul>
+ <li>
+ <a href="../func/color.html#cdPalette">
+ <font face="Courier"><strong>Palette</strong></font></a>: When the number of
+ bits per pixel is smaller than or equal to 8, the driver will use the system
+ palette to solve colors passed as parameters to the canvas. The driver
+ allocates colors as they are requested - if a color cannot be allocated, the
+ closest color is used in the palette. For such, the driver sees all available
+ colors, in the current application and others. If one of the applications is
+ terminated, a color in the palette may become invalid and will only be updated
+ by the driver when it is requested again. For this reason, a call to <strong>
+ cdForeground </strong>or <strong>cdBackground</strong> or <strong>cdPalette</strong>
+ is recommended before drawing.<br>
+ When CD_FORCE is used, the driver forces color allocation.
+ This may imply changing colors in other applications when a cursor moves in
+ and out of the canvas. However, if the number of requested colors is smaller
+ than the maximum number of possible colors in the palette, then the first
+ colors in the default system palette will be preserved, minimizing this
+ problem.<br>
+ When CD_POLITE is used, all colors allocated by the driver are liberated, and
+ the requested colors are allocated. This is useful for the application to
+ prioritize the colors that will be allocated, causing other colors to be
+ mapped to their closest colors.<br>
+ Note that canvases in the same application interfere with one another, but
+ when a canvas is terminated it liberates all allocated colors.</li>
+</ul>
+<h4>Exclusive Attributes</h4>
+<ul>
+ <li>&quot;<b><font face="Courier">GC</font></b>&quot;:&nbsp; returns the GDK graphics
+ context (get only). In Lua is returned as a user data.</li>
+</ul>
+
+<ul>
+ <li>&quot;<b><font face="Courier">ROTATE</font></b>&quot;:&nbsp; allows the usage of 1
+ angle and 1 coordinate (x, y), that define a global rotation transformation
+ centered in the specified coordinate. Use 1 real and 2 integer values inside a
+ string (&quot;%g %d %d&quot; = angle x y). In this driver will change the
+ current transformation matrix, if removed will reset the current
+ transformation matrix.</li>
+</ul>
+
+<ul>
+ <li>&quot;<b><font face="Courier">ANTIALIAS</font></b>&quot;: controls the use of
+ anti-aliasing for the text, image zoom and line drawing primitives. Assumes
+ values &quot;1&quot; (active) and &quot;0&quot; (inactive). Default value: &quot;1&quot;.</li>
+</ul>
+
+<ul>
+ <li><b><font face="Courier">&quot;CAIROVERSION&quot;: </font></b>returns a string with
+ the Cairo version number. It is empty if the Cairo is not available.</li>
+</ul>
+
+</body>
+
+</html>
diff --git a/html/en/drv/svg.html b/html/en/drv/svg.html
new file mode 100644
index 0000000..e75451e
--- /dev/null
+++ b/html/en/drv/svg.html
@@ -0,0 +1,93 @@
+<!doctype HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>CD_SVG</title>
+<link rel="stylesheet" type="text/css" href="../../style.css">
+</head>
+
+<body>
+
+<h2 style="text-align: left">CD_SVG - CD Scalable Vector Graphics Driver (cdsvg.h)</h2>
+
+ <p>This driver allows the generation of a SVG file, a modularized language for
+ describing two-dimensional vector and mixed vector/raster graphics in XML. The
+ <a href="http://www.w3.org/TR/SVG/">SVG specification</a> is an open standard
+ that has been under development by the <a href="http://www.w3.org/">World Wide
+ Web Consortium</a> (W3C) since 1999.</p>
+
+<h3>Use</h3>
+
+ <p>The file is created by calling function <font face="Courier">
+ <a href="../func/init.html#cdCreateCanvas"><strong>cdCreateCanvas</strong></a>(CD_SVG,
+ Data)</font>. The <font face="Courier">Data</font> parameter is a string that must contain the filename and the canvas
+ dimensions, in the following format:</p>
+
+ <pre>&quot;<em>filename [widthxheight resolution]</em>&quot; or in C<em> &quot;<strong><tt>%s %gx%g %g</tt></strong>&quot;</em></pre>
+
+ <p>Only the parameter <font face="Courier">filename</font> is required. The filename must be inside double quotes (&quot;)
+ if it has spaces.<font face="Courier"> Width</font> and <font face="Courier">height</font> are provided in millimeters
+ (note the lowercase &quot;x&quot; between them), and their default value in pixels is <font face="Courier">INT_MAX</font> for
+ both dimensions. <font face="Courier">Resolution </font>is the number of pixels per millimeter; its default value is
+ &quot;3.78 pixels/mm&quot; (96 DPI). <font face="Courier">Width</font>, <font face="Courier">height</font> and
+ <font face="Courier">resolution</font> are real values.</p>
+ <p>Any amount of such canvases may exist simultaneously. It is important to note that a call to function
+ <a href="../func/init.html#cdKillCanvas"><font face="Courier"><strong>
+ cdKillCanvas</strong></font></a> is required to <b>close</b> the file properly.</p>
+ <h3>Behavior of Functions</h3>
+<h4>Control</h4>
+<dir>
+ <li><a href="http://www.tecgraf.puc-rio.br/cd/en/func/other.html#cdPlay">
+ <font face="Courier"><strong>Play</strong></font></a>: does nothing, returns
+ <font face="Courier">CD_ERROR</font>.</li>
+ <li><a href="http://www.tecgraf.puc-rio.br/cd/en/func/control.html#cdClear">
+ <font face="Courier"><strong>Clear</strong></font></a>: is simulated using
+ width and height to draw a rect.</li>
+</dir>
+<h4>Coordinate System and Clipping </h4>
+<dir>
+ <li><a href="../func/coordinates.html#cdUpdateYAxis"><font face="Courier">
+ <strong>UpdateYAxis</strong></font></a>: does nothing.</li>
+ <li><b>Complex Regions</b>: not supported.</li>
+</dir>
+<h4>Attributes</h4>
+<dir>
+ <li><a href="http://www.tecgraf.puc-rio.br/cd/en/func/text.html#cdFontDim">
+ <font face="Courier"><strong>FontDim</strong></font></a>: is simulated.</li>
+ <li><a href="http://www.tecgraf.puc-rio.br/cd/en/func/text.html#cdTextSize">
+ <font face="Courier"><strong>TextSize</strong></font></a>: is simulated.</li>
+ <li>
+ <a href="http://www.tecgraf.puc-rio.br/cd/en/func/attributes.html#cdWriteMode">
+ <font face="Courier"><strong>WriteMode</strong></font></a>: does nothing,
+ returns <font face="Courier">CD_REPLACE</font>.</li>
+</dir>
+<h4>Colors</h4>
+<dir>
+ <li><a href="../func/color.html#cdGetColorPlanes"><font face="Courier">
+ <strong>
+ GetColorPlanes</strong></font></a>: always returns 24.</li>
+ <li><a href="http://www.tecgraf.puc-rio.br/cd/en/func/color.html#cdPalette">
+ <font face="Courier"><strong>Palette</strong></font></a>: does nothing.</li>
+</dir>
+<h4>Primitives</h4>
+<dir>
+ <li><font face="Courier"><strong>
+ <a href="http://www.tecgraf.puc-rio.br/cd/en/func/marks.html#cdPixel">Pixel</a></strong></font>:
+ does not exist in SVG, is simulated using a circle with radius=0.1.</li>
+ <li>Floating point primitives are supported.</li>
+</dir>
+<h4>Client Images</h4>
+<dir>
+ <li><a href="../func/client.html#cdGetImageRGB"><font face="Courier"><strong>
+ GetImageRGB</strong></font></a>: does nothing.</li>
+</dir>
+<h4>Server Images</h4>
+<dir>
+ <li>All functions do nothing.</li>
+</dir>
+
+</body>
+
+</html>
diff --git a/html/en/history.html b/html/en/history.html
index ba6be12..9d82f3b 100644
--- a/html/en/history.html
+++ b/html/en/history.html
@@ -21,6 +21,7 @@
<h2>History of Changes</h2>
<h3>CVS (02/Dec/2009)</h3>
<ul>
+ <li><span style="color: #0000FF">New:</span> driver SVG.</li>
<li><span style="color: #0000FF">New:</span> function <strong>
CanvasYAxisMode</strong> to control the Y axis orientation.</li>
<li><span style="color: #0000FF">New:</span> functions <strong>
diff --git a/html/en/prod.html b/html/en/prod.html
index 8cabf53..36605d8 100644
--- a/html/en/prod.html
+++ b/html/en/prod.html
@@ -10,16 +10,13 @@
<h3><a name="Overview">Overview</a></h3>
- <p>CD is a platform-independent graphics library. It is implemented in several
- platforms using native graphics libraries: Microsoft Windows (GDI and GDI+)
+ <p>CD is a platform-independent graphics library. Its drivers are implemented in several
+ platforms, some use portable code, others use native graphics libraries, such
+ as Microsoft Windows (GDI and GDI+)
and X-Windows (XLIB). </p>
<p>The library contains functions to support both vector and image
applications, and the visualization surface can be either a canvas or a more
abstract surface, such as Clipboard, Metafile, PS, and so on.</p>
- <p>To make the Application Programmers Interface (API) simple, all data are
- standard C types (int, double or char). Thus the application program does not
- have to maintain parallel data structures to deal with the graphic library.
- </p>
<p>Furthermore, the list of parameters of the CD primitive functions contains
only the geometrical descriptions of the objects (line, circle, text, etc.).
Where these objects should appear and what is the their color, thickness, etc.
@@ -110,7 +107,8 @@ http://canvasdraw.cvs.sourceforge.net/canvasdraw/</a>.</p>
<a href="http://www.ssec.wisc.edu/~brianp/Mesa.html" target="_blank">Mesa</a>
libraries, for making the source code available, which helped us improve our
implementation of the Simulation driver and of the X-Windows driver. Thanks to
- Alan Richardson for the XVertex rotines. Thanks to
+ Alan Richardson for the XVertex rotines. Thanks to Lode Vandevenne for the
+ LodePNG rotines used in the SVG driver. Thanks to
Jason Perkins for the <a href="http://premake.sourceforge.net/">Premake</a>
tool.</p>
<p>The CD distribution includes the FreeType library, this is a third party
diff --git a/html/en/to_do.html b/html/en/to_do.html
index 2fc0e11..7fbceaf 100644
--- a/html/en/to_do.html
+++ b/html/en/to_do.html
@@ -19,7 +19,6 @@
<h3>CD</h3>
<ul>
<li class="style1">A new GDK base driver.</li>
- <li>A new SVG driver.</li>
<li>libEMF in UNIX.</li>
</ul>
<h3>MAC</h3>
diff --git a/html/wb/wb_usr.lua b/html/wb/wb_usr.lua
index fb8c4a7..8dbadf7 100644
--- a/html/wb/wb_usr.lua
+++ b/html/wb/wb_usr.lua
@@ -1000,6 +1000,10 @@ wb_usr.tree =
link= "drv/ps.html"
},
{
+ name= {nl= "SVG"},
+ link= "drv/svg.html"
+ },
+ {
name= {nl= "MF"},
link= "drv/mf.html"
},
@@ -1040,6 +1044,10 @@ wb_usr.tree =
link= "drv/sim.html"
},
{
+ name= {en= "GDK/Cairo"},
+ link= "drv/gdk.html"
+ },
+ {
name= {nl= "Win32"},
link= "drv/win32.html"
},
diff --git a/html/wb_search.txt b/html/wb_search.txt
index 6c1523f..a8b5c89 100644
--- a/html/wb_search.txt
+++ b/html/wb_search.txt
@@ -8,32 +8,34 @@ en/drv/sim.html
en/drv/native.html
en/func/control.html
en/drv/xrender.html
+en/drv/irgb.html
+en/drv/gdiplus.html
en/func/vectortext.html
en/cvs.html
en/func/init.html
-en/drv/irgb.html
+en/drv/win32.html
en/drv/picture.html
en/func/attributes.html
-en/drv/gdiplus.html
+en/drv/gdk.html
en/func/text.html
en/func/filled.html
en/prod.html
-en/drv/win32.html
-en/samples.html
en/drv/ps.html
+en/samples.html
en/drv/emf.html
-en/to_do.html
en/func/marks.html
-en/drv.html
+en/to_do.html
en/internal.html
+en/drv.html
en/drv/cgm.html
en/drv/mf.html
+en/drv/iup.html
en/drv/wmf.html
en/drv/pdf.html
en/drv/dxf.html
en/copyright.html
en/drv/dbufrgb.html
-en/drv/iup.html
+en/drv/svg.html
en/drv/xwin.html
en/drv/printer.html
en/cdluaim.html
diff --git a/html/wb_tree.html b/html/wb_tree.html
index f6d45f5..ed2fbb6 100644
--- a/html/wb_tree.html
+++ b/html/wb_tree.html
@@ -524,23 +524,25 @@
<div id="folder.6.4">
<p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link195folder.6.4" href="en/drv/pdf.html">PDF</a></p>
<p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link196folder.6.4" href="en/drv/ps.html">PS</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link197folder.6.4" href="en/drv/mf.html">MF</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link197folder.6.4" href="en/drv/svg.html">SVG</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link198folder.6.4" href="en/drv/mf.html">MF</a></p>
<p class="sep"><img src="wb_img/sepblank.png"><img src="wb_img/sepvertline.png"><img src="wb_img/sepnode.png"></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link198folder.6.4" href="en/drv/cgm.html">CGM</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link199folder.6.4" href="en/drv/dgn.html">DGN</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link200folder.6.4" href="en/drv/dxf.html">DXF</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link199folder.6.4" href="en/drv/cgm.html">CGM</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link200folder.6.4" href="en/drv/dgn.html">DGN</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link201folder.6.4" href="en/drv/dxf.html">DXF</a></p>
<p class="sep"><img src="wb_img/sepblank.png"><img src="wb_img/sepvertline.png"><img src="wb_img/sepnode.png"></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link201folder.6.4" href="en/drv/emf.html">EMF</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link202folder.6.4" href="en/drv/wmf.html">WMF</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/nodelast.png"><a class="el" name="link203folder.6.4" href="en/drv/debug.html">DEBUG</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link202folder.6.4" href="en/drv/emf.html">EMF</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/node.png"><a class="el" name="link203folder.6.4" href="en/drv/wmf.html">WMF</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/vertline.png"><img src="wb_img/nodelast.png"><a class="el" name="link204folder.6.4" href="en/drv/debug.html">DEBUG</a></p>
</div>
<p><img src="wb_img/blank.png"><img name="imgfolder.6.5" src="wb_img/plusnodelast.png" onclick="toggleFolder('folder.6.5')"> Base Drivers</p>
<div id="folder.6.5">
- <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link204folder.6.5" href="en/drv/sim.html">Simulation</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link205folder.6.5" href="en/drv/win32.html">Win32</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link206folder.6.5" href="en/drv/gdiplus.html">Win32 GDI+</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link207folder.6.5" href="en/drv/xwin.html">X-Win</a></p>
- <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/nodelast.png"><a class="el" name="link208folder.6.5" href="en/drv/xrender.html">XRender</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link205folder.6.5" href="en/drv/sim.html">Simulation</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link206folder.6.5" href="en/drv/gdk.html">GDK/Cairo</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link207folder.6.5" href="en/drv/win32.html">Win32</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link208folder.6.5" href="en/drv/gdiplus.html">Win32 GDI+</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/node.png"><a class="el" name="link209folder.6.5" href="en/drv/xwin.html">X-Win</a></p>
+ <p><img src="wb_img/blank.png"><img src="wb_img/blank.png"><img src="wb_img/nodelast.png"><a class="el" name="link210folder.6.5" href="en/drv/xrender.html">XRender</a></p>
</div>
</div>
</div>
diff --git a/mak.vc9/cd.vcproj b/mak.vc9/cd.vcproj
index 383787f..27ab993 100644
--- a/mak.vc9/cd.vcproj
+++ b/mak.vc9/cd.vcproj
@@ -369,6 +369,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\src\svg\cdsvg.c"
+ >
+ </File>
+ <File
RelativePath="..\src\drv\cgm.c"
>
<FileConfiguration
@@ -384,6 +388,26 @@
RelativePath="..\src\drv\cgm.h"
>
</File>
+ <Filter
+ Name="SVG"
+ >
+ <File
+ RelativePath="..\src\svg\base64.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\svg\base64.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\svg\lodepng.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\svg\lodepng.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="include"
diff --git a/src/cd.def b/src/cd.def
index 61ac5cf..004538b 100644
--- a/src/cd.def
+++ b/src/cd.def
@@ -15,6 +15,7 @@ EXPORTS
cdContextDBufferRGB
cdContextPicture
cdContextDebug
+ cdContextSVG
cdRedImage
cdGreenImage
diff --git a/src/config.mak b/src/config.mak
index 5465a06..05b5182 100644
--- a/src/config.mak
+++ b/src/config.mak
@@ -4,6 +4,9 @@ OPT = YES
DEFINES = CD_NO_OLD_INTERFACE
+SRCSVG = base64.c lodpng.c cdsvg.c
+SRCSVG := $(addprefix svg/, $(SRCSVG))
+
SRCINTCGM = circle.c ellipse.c intcgm1.c \
intcgm2.c intcgm4.c intcgm6.c list.c \
sism.c tparse.c bparse.c
@@ -27,7 +30,7 @@ SRCNULL := $(addprefix drv/, $(SRCNULL))
SRCCOMM = cd.c wd.c wdhdcpy.c rgb2map.c cd_vectortext.c cd_active.c \
cd_attributes.c cd_bitmap.c cd_image.c cd_primitives.c cd_text.c cd_util.c
-SRC = $(SRCCOMM) $(SRCINTCGM) $(SRCDRV) $(SRCSIM)
+SRC = $(SRCCOMM) $(SRCSVG) $(SRCINTCGM) $(SRCDRV) $(SRCSIM)
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
SRC += $(SRCWIN32)
diff --git a/src/lua3/cdluactx.c b/src/lua3/cdluactx.c
index fc09313..1ddd8e6 100644
--- a/src/lua3/cdluactx.c
+++ b/src/lua3/cdluactx.c
@@ -24,6 +24,7 @@
#include "cdclipbd.h"
#include "cdmf.h"
#include "cdps.h"
+#include "cdsvg.h"
#include "cddbuf.h"
#include "cdgdiplus.h"
@@ -779,6 +780,28 @@ static cdContextLUA cdluapsctx =
};
/***************************************************************************\
+* CD_SVG. *
+\***************************************************************************/
+static void *cdsvg_checkdata(int param)
+{
+ lua_Object data = lua_getparam(param);
+ if (!lua_isstring(data))
+ lua_error("cdCreateCanvas CD_SVG: data should be of type string!");
+
+ return lua_getstring(data);
+}
+
+static cdContextLUA cdluasvgctx =
+{
+ 0,
+ "CD_SVG",
+ cdContextSVG,
+ cdsvg_checkdata,
+ NULL,
+ 0
+};
+
+/***************************************************************************\
* CD_PRINTER. *
\***************************************************************************/
static void *cdprinter_checkdata(int param)
@@ -940,6 +963,7 @@ void cdlua_initdrivers(void)
cdlua_addcontext(&cdluacgmctx);
cdlua_addcontext(&cdluamfctx);
cdlua_addcontext(&cdluapsctx);
+ cdlua_addcontext(&cdluasvgctx);
cdlua_addcontext(&cdluaclipboardctx);
cdlua_addcontext(&cdluanativewindowctx);
cdlua_addcontext(&cdluaprinterctx);
diff --git a/src/lua5/cdlua5ctx.c b/src/lua5/cdlua5ctx.c
index e3bd19e..4d97f3b 100644
--- a/src/lua5/cdlua5ctx.c
+++ b/src/lua5/cdlua5ctx.c
@@ -1,5 +1,5 @@
/***************************************************************************\
-* $Id: cdlua5ctx.c,v 1.1 2008/10/17 06:10:42 scuri Exp $
+* $Id: cdlua5ctx.c,v 1.2 2009/12/02 20:31:02 scuri Exp $
* *
\***************************************************************************/
@@ -23,6 +23,7 @@
#include "cdclipbd.h"
#include "cdmf.h"
#include "cdps.h"
+#include "cdsvg.h"
#include "cddbuf.h"
#include "cdgdiplus.h"
@@ -688,6 +689,24 @@ static cdluaContext cdluapsctx =
};
/***************************************************************************\
+* CD_SVG. *
+\***************************************************************************/
+static void *cdsvg_checkdata( lua_State *L, int param)
+{
+ return (void *)luaL_checkstring(L, param);
+}
+
+static cdluaContext cdluasvgctx =
+{
+ 0,
+ "SVG",
+ cdContextSVG,
+ cdsvg_checkdata,
+ NULL,
+ 0
+};
+
+/***************************************************************************\
* CD_PRINTER. *
\***************************************************************************/
static void *cdprinter_checkdata(lua_State *L, int param)
@@ -793,6 +812,7 @@ void cdlua_initdrivers(lua_State * L, cdluaLuaState* cdL)
cdlua_addcontext(L, cdL, &cdluacgmctx);
cdlua_addcontext(L, cdL, &cdluamfctx);
cdlua_addcontext(L, cdL, &cdluapsctx);
+ cdlua_addcontext(L, cdL, &cdluasvgctx);
cdlua_addcontext(L, cdL, &cdluaclipboardctx);
cdlua_addcontext(L, cdL, &cdluanativewindowctx);
cdlua_addcontext(L, cdL, &cdluaprinterctx);
diff --git a/test/cdtest/cdtest.led b/test/cdtest/cdtest.led
index 2ef3593..35dbde2 100644
--- a/test/cdtest/cdtest.led
+++ b/test/cdtest/cdtest.led
@@ -374,6 +374,7 @@ mnSave = MENU
itPDF = ITEM[ACTIVE=NO]("PDF...", cmdPDF),
itPS = ITEM[ACTIVE=NO]("PS...", cmdPS),
itEPS = ITEM[ACTIVE=NO]("EPS...", cmdEPS),
+ itSVG = ITEM[ACTIVE=NO]("SVG...", cmdSVG),
itCGMt = ITEM[ACTIVE=NO]("CGMt...", cmdCGMt),
itCGMb = ITEM[ACTIVE=NO]("CGMb...", cmdCGMb),
itDGN = ITEM[ACTIVE=NO]("DGN...", cmdDGN),
diff --git a/test/cdtest/cdtest_led.c b/test/cdtest/cdtest_led.c
index a7d8d50..86109fe 100644
--- a/test/cdtest/cdtest_led.c
+++ b/test/cdtest/cdtest_led.c
@@ -4,7 +4,7 @@
#include <stdarg.h>
#include <iup.h>
-static Ihandle* named[ 172 ];
+static Ihandle* named[ 173 ];
static void image_imgLine (void)
{
@@ -415,20 +415,22 @@ void cdtest_loadled (void)
"ACTIVE", "NO", NULL ),
named[7] = IupSetAtt( "itEPS", IupItem( "EPS...", "cmdEPS" ),
"ACTIVE", "NO", NULL ),
- named[8] = IupSetAtt( "itCGMt", IupItem( "CGMt...", "cmdCGMt" ),
+ named[8] = IupSetAtt( "itSVG", IupItem( "SVG...", "cmdSVG" ),
"ACTIVE", "NO", NULL ),
- named[9] = IupSetAtt( "itCGMb", IupItem( "CGMb...", "cmdCGMb" ),
+ named[9] = IupSetAtt( "itCGMt", IupItem( "CGMt...", "cmdCGMt" ),
"ACTIVE", "NO", NULL ),
- named[10] = IupSetAtt( "itDGN", IupItem( "DGN...", "cmdDGN" ),
+ named[10] = IupSetAtt( "itCGMb", IupItem( "CGMb...", "cmdCGMb" ),
"ACTIVE", "NO", NULL ),
- named[11] = IupSetAtt( "itDXF", IupItem( "DXF...", "cmdDXF" ),
+ named[11] = IupSetAtt( "itDGN", IupItem( "DGN...", "cmdDGN" ),
"ACTIVE", "NO", NULL ),
- named[12] = IupSetAtt( "itEMF", IupItem( "EMF...", "cmdEMF" ),
+ named[12] = IupSetAtt( "itDXF", IupItem( "DXF...", "cmdDXF" ),
"ACTIVE", "NO", NULL ),
- named[13] = IupSetAtt( "itWMF", IupItem( "WMF...", "cmdWMF" ),
+ named[13] = IupSetAtt( "itEMF", IupItem( "EMF...", "cmdEMF" ),
+ "ACTIVE", "NO", NULL ),
+ named[14] = IupSetAtt( "itWMF", IupItem( "WMF...", "cmdWMF" ),
"ACTIVE", "NO", NULL ),
NULL), NULL );
- named[14] = IupSetAtt( "mnFile", IupMenu(
+ named[15] = IupSetAtt( "mnFile", IupMenu(
IupSetAtt( NULL, IupSubmenu( "Open",
named[0] /* mnOpen */
),
@@ -439,29 +441,29 @@ void cdtest_loadled (void)
),
"KEY", "K_S", NULL ),
IupSeparator(),
- named[15] = IupSetAtt( "itPrint", IupItem( "Print...", "cmdPrint" ),
+ named[16] = IupSetAtt( "itPrint", IupItem( "Print...", "cmdPrint" ),
"KEY", "K_P", NULL ),
IupSeparator(),
IupSetAtt( NULL, IupItem( "Exit", "cmdFileExit" ),
"KEY", "K_x", NULL ),
NULL), NULL );
- named[16] = IupSetAtt( "mnEdit", IupMenu(
- named[17] = IupSetAtt( "itEditUndo", IupItem( "Undo", "cmdEditUndo" ), NULL ),
+ named[17] = IupSetAtt( "mnEdit", IupMenu(
+ named[18] = IupSetAtt( "itEditUndo", IupItem( "Undo", "cmdEditUndo" ), NULL ),
IupSeparator(),
- named[18] = IupSetAtt( "itClipBoard", IupItem( "Copy as EMF/WMF", "cmdClipBoard" ),
+ named[19] = IupSetAtt( "itClipBoard", IupItem( "Copy as EMF/WMF", "cmdClipBoard" ),
"ACTIVE", "NO", NULL ),
- named[19] = IupSetAtt( "itClipBoardBitmap", IupItem( "Copy as Bitmap", "cmdClipBoardBitmap" ),
+ named[20] = IupSetAtt( "itClipBoardBitmap", IupItem( "Copy as Bitmap", "cmdClipBoardBitmap" ),
"ACTIVE", "NO", NULL ),
- named[20] = IupSetAtt( "itClipBoardMetafile", IupItem( "Copy as CD Metafile", "cmdClipBoardMetafile" ),
+ named[21] = IupSetAtt( "itClipBoardMetafile", IupItem( "Copy as CD Metafile", "cmdClipBoardMetafile" ),
"ACTIVE", "NO", NULL ),
- named[21] = IupSetAtt( "itClipBoardPaste", IupItem( "Paste", "cmdClipBoardPaste" ),
+ named[22] = IupSetAtt( "itClipBoardPaste", IupItem( "Paste", "cmdClipBoardPaste" ),
"ACTIVE", "NO", NULL ),
IupSeparator(),
IupItem( "Clear", "cmdEditClear" ),
IupSeparator(),
IupItem( "Options...", "cmdOptions" ),
NULL), NULL );
- named[22] = IupSetAtt( "mnPrimitives", IupMenu(
+ named[23] = IupSetAtt( "mnPrimitives", IupMenu(
IupItem( "Pixel...", "cmdPixel" ),
IupItem( "Mark...", "cmdMark" ),
IupItem( "Line...", "cmdLine" ),
@@ -476,143 +478,143 @@ void cdtest_loadled (void)
IupItem( "Server Image...", "cmdImage" ),
IupItem( "RGB Image...", "cmdImageRGB" ),
NULL), NULL );
- named[23] = IupSetAtt( "mnDraw", IupMenu(
+ named[24] = IupSetAtt( "mnDraw", IupMenu(
IupSetAtt( NULL, IupSubmenu( "Primitives",
- named[22] /* mnPrimitives */
+ named[23] /* mnPrimitives */
),
"KEY", "K_P", NULL ),
IupSeparator(),
IupItem( "Clipping...", "cmdClip" ),
IupItem( "Attributes...", "cmdAttributes" ),
IupSeparator(),
- named[24] = IupSetAtt( "itWDCanvas", IupItem( "Show WD Canvas", "cmdWDCanvas" ), NULL ),
- named[25] = IupSetAtt( "itPICCanvas", IupItem( "Show Picture Canvas", "cmdPICCanvas" ), NULL ),
+ named[25] = IupSetAtt( "itWDCanvas", IupItem( "Show WD Canvas", "cmdWDCanvas" ), NULL ),
+ named[26] = IupSetAtt( "itPICCanvas", IupItem( "Show Picture Canvas", "cmdPICCanvas" ), NULL ),
NULL),
"ISMENU", "YES", NULL );
- named[26] = IupSetAtt( "mnHelp", IupMenu(
+ named[27] = IupSetAtt( "mnHelp", IupMenu(
IupItem( "About...", "cmdHelpAbout" ),
NULL), NULL );
- named[27] = IupSetAtt( "mnMain", IupMenu(
+ named[28] = IupSetAtt( "mnMain", IupMenu(
IupSetAtt( NULL, IupSubmenu( "File",
- named[14] /* mnFile */
+ named[15] /* mnFile */
),
"KEY", "K_mF", NULL ),
IupSetAtt( NULL, IupSubmenu( "Edit",
- named[16] /* mnEdit */
+ named[17] /* mnEdit */
),
"KEY", "K_mE", NULL ),
IupSetAtt( NULL, IupSubmenu( "Draw",
- named[23] /* mnDraw */
+ named[24] /* mnDraw */
),
"KEY", "K_mD", NULL ),
IupSetAtt( NULL, IupSubmenu( "Help",
- named[26] /* mnHelp */
+ named[27] /* mnHelp */
),
"KEY", "K_mH", NULL ),
NULL), NULL );
- named[28] = IupSetAtt( "lbStatusLine", IupLabel( "Esta eh a barra de status do CDTest." ),
+ named[29] = IupSetAtt( "lbStatusLine", IupLabel( "Esta eh a barra de status do CDTest." ),
"EXPAND", "HORIZONTAL", NULL );
- named[29] = IupSetAtt( "btLine", IupButton( "", "cmdLine" ),
+ named[30] = IupSetAtt( "btLine", IupButton( "", "cmdLine" ),
"IMAGE", "imgLine",
"TIP", "Line", NULL );
- named[30] = IupSetAtt( "btBox", IupButton( "", "cmdBox" ),
+ named[31] = IupSetAtt( "btBox", IupButton( "", "cmdBox" ),
"IMAGE", "imgBox",
"TIP", "Box", NULL );
- named[31] = IupSetAtt( "btRect", IupButton( "", "cmdRect" ),
+ named[32] = IupSetAtt( "btRect", IupButton( "", "cmdRect" ),
"IMAGE", "imgRect",
"TIP", "Rect", NULL );
- named[32] = IupSetAtt( "btArc", IupButton( "", "cmdArc" ),
+ named[33] = IupSetAtt( "btArc", IupButton( "", "cmdArc" ),
"IMAGE", "imgArc",
"TIP", "Arc", NULL );
- named[33] = IupSetAtt( "btSector", IupButton( "", "cmdSector" ),
+ named[34] = IupSetAtt( "btSector", IupButton( "", "cmdSector" ),
"IMAGE", "imgSector",
"TIP", "Sector", NULL );
- named[34] = IupSetAtt( "btChord", IupButton( "", "cmdChord" ),
+ named[35] = IupSetAtt( "btChord", IupButton( "", "cmdChord" ),
"IMAGE", "imgChord",
"TIP", "Chord", NULL );
- named[35] = IupSetAtt( "btPixel", IupButton( "", "cmdPixel" ),
+ named[36] = IupSetAtt( "btPixel", IupButton( "", "cmdPixel" ),
"IMAGE", "imgPixel",
"TIP", "Pixel", NULL );
- named[36] = IupSetAtt( "btMark", IupButton( "", "cmdMark" ),
+ named[37] = IupSetAtt( "btMark", IupButton( "", "cmdMark" ),
"IMAGE", "imgMark",
"TIP", "Mark", NULL );
- named[37] = IupSetAtt( "btText", IupButton( "", "cmdText" ),
+ named[38] = IupSetAtt( "btText", IupButton( "", "cmdText" ),
"IMAGE", "imgText",
"TIP", "Text", NULL );
- named[38] = IupSetAtt( "btPoly", IupButton( "", "cmdPoly" ),
+ named[39] = IupSetAtt( "btPoly", IupButton( "", "cmdPoly" ),
"IMAGE", "imgPoly",
"TIP", "Polygon", NULL );
- named[39] = IupSetAtt( "btImageRGB", IupButton( "", "cmdImageRGB" ),
+ named[40] = IupSetAtt( "btImageRGB", IupButton( "", "cmdImageRGB" ),
"IMAGE", "imgImageRGB",
"TIP", "RGB Image", NULL );
- named[40] = IupSetAtt( "btImage", IupButton( "", "cmdImage" ),
+ named[41] = IupSetAtt( "btImage", IupButton( "", "cmdImage" ),
"IMAGE", "imgImage",
"TIP", "Server Image", NULL );
- named[41] = IupSetAtt( "btClip", IupButton( "", "cmdClip" ),
+ named[42] = IupSetAtt( "btClip", IupButton( "", "cmdClip" ),
"IMAGE", "imgClip",
"TIP", "Clipping Area", NULL );
- named[42] = IupSetAtt( "btCurPrim", IupButton( "", "cmdShowDialog" ),
+ named[43] = IupSetAtt( "btCurPrim", IupButton( "", "cmdShowDialog" ),
"IMAGE", "imgLine",
"TIP", "Show primitive dialog", NULL );
- named[43] = IupSetAtt( "lbMousePos", IupLabel( "( , )" ),
+ named[44] = IupSetAtt( "lbMousePos", IupLabel( "( , )" ),
"SIZE", "90", NULL );
- named[44] = IupSetAtt( "PrimBar", IupVbox(
- named[42] /* btCurPrim */,
+ named[45] = IupSetAtt( "PrimBar", IupVbox(
+ named[43] /* btCurPrim */,
IupSetAtt( NULL, IupFill(),
"SIZE", "20", NULL ),
- named[35] /* btPixel */,
- named[36] /* btMark */,
- named[29] /* btLine */,
- named[38] /* btPoly */,
- named[31] /* btRect */,
- named[30] /* btBox */,
- named[32] /* btArc */,
- named[33] /* btSector */,
- named[34] /* btChord */,
- named[37] /* btText */,
+ named[36] /* btPixel */,
+ named[37] /* btMark */,
+ named[30] /* btLine */,
+ named[39] /* btPoly */,
+ named[32] /* btRect */,
+ named[31] /* btBox */,
+ named[33] /* btArc */,
+ named[34] /* btSector */,
+ named[35] /* btChord */,
+ named[38] /* btText */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[40] /* btImage */,
- named[39] /* btImageRGB */,
+ named[41] /* btImage */,
+ named[40] /* btImageRGB */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[41] /* btClip */,
+ named[42] /* btClip */,
IupSetAtt( NULL, IupFill(),
"SIZE", "30", NULL ),
NULL),
"GAP", "2", NULL );
- named[45] = IupSetAtt( "cnvColorBar", IupCanvas( "cmdColorBarRepaint" ),
+ named[46] = IupSetAtt( "cnvColorBar", IupCanvas( "cmdColorBarRepaint" ),
"BUTTON_CB", "cmdColorBarButtonCB",
"RESIZE_CB", "cmdColorBarResizeCB",
"SIZE", "220x12",
"BORDER", "NO",
"EXPAND", "NO", NULL );
- named[46] = IupSetAtt( "cnvMain", IupCanvas( "cmdRepaint" ),
+ named[47] = IupSetAtt( "cnvMain", IupCanvas( "cmdRepaint" ),
"MOTION_CB", "cmdMotionCB",
"BUTTON_CB", "cmdButtonCB",
"RESIZE_CB", "cmdResizeCB", NULL );
- named[47] = IupSetAtt( "DeskTop", IupVbox(
+ named[48] = IupSetAtt( "DeskTop", IupVbox(
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupHbox(
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[44] /* PrimBar */,
+ named[45] /* PrimBar */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupVbox(
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
- named[43] /* lbMousePos */,
+ named[44] /* lbMousePos */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[46] /* cnvMain */,
+ named[47] /* cnvMain */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
- named[45] /* cnvColorBar */,
+ named[46] /* cnvColorBar */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[28] /* lbStatusLine */,
+ named[29] /* lbStatusLine */,
NULL),
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
@@ -620,8 +622,8 @@ void cdtest_loadled (void)
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
NULL), NULL );
- named[48] = IupSetAtt( "dlgMain", IupDialog(
- named[47] /* DeskTop */
+ named[49] = IupSetAtt( "dlgMain", IupDialog(
+ named[48] /* DeskTop */
),
"TITLE", "CD Test 5.3",
"MENU", "mnMain",
@@ -630,67 +632,67 @@ void cdtest_loadled (void)
"GETFOCUS_CB", "cmdGetFocusCB",
"KILLFOCUS_CB", "cmdKillFocusCB",
"CLOSE_CB", "cmdFileExit", NULL );
- named[49] = IupSetAtt( "cnvWDCanvas", IupCanvas( "cmdWDRepaint" ),
+ named[50] = IupSetAtt( "cnvWDCanvas", IupCanvas( "cmdWDRepaint" ),
"BORDER", "NO", NULL );
- named[50] = IupSetAtt( "dlgWDCanvas", IupDialog(
- named[49] /* cnvWDCanvas */
+ named[51] = IupSetAtt( "dlgWDCanvas", IupDialog(
+ named[50] /* cnvWDCanvas */
),
"TITLE", "WD Canvas",
"CLISE_CB", "cmdCloseWD",
"SIZE", "200x200",
"PARENTDIALOG", "dlgMain",
"GAP", "5x5", NULL );
- named[51] = IupSetAtt( "cnvPICCanvas", IupCanvas( "cmdPICRepaint" ),
+ named[52] = IupSetAtt( "cnvPICCanvas", IupCanvas( "cmdPICRepaint" ),
"BORDER", "NO", NULL );
- named[52] = IupSetAtt( "dlgPICCanvas", IupDialog(
- named[51] /* cnvPICCanvas */
+ named[53] = IupSetAtt( "dlgPICCanvas", IupDialog(
+ named[52] /* cnvPICCanvas */
),
"TITLE", "PIC Canvas",
"CLISE_CB", "cmdClosePIC",
"SIZE", "200x200",
"PARENTDIALOG", "dlgMain",
"GAP", "5x5", NULL );
- named[53] = IupSetAtt( "btOptionsHide", IupButton( "Hide", "cmdOptionsHide" ),
+ named[54] = IupSetAtt( "btOptionsHide", IupButton( "Hide", "cmdOptionsHide" ),
"SIZE", "30", NULL );
- named[54] = IupSetAtt( "tgSimulate", IupToggle( "Simulate", "cmdSimulate" ),
+ named[55] = IupSetAtt( "tgSimulate", IupToggle( "Simulate", "cmdSimulate" ),
"VALUE", "OFF",
"SIZE", "55", NULL );
- named[55] = IupSetAtt( "tgStretchPlay", IupToggle( "Stretch Play", "cmdStretchPlay" ),
+ named[56] = IupSetAtt( "tgStretchPlay", IupToggle( "Stretch Play", "cmdStretchPlay" ),
"VALUE", "OFF",
"SIZE", "70", NULL );
- named[56] = IupSetAtt( "tgNoBuffering", IupToggle( "No buffering", "cmdNoBuffering" ),
+ named[57] = IupSetAtt( "tgNoBuffering", IupToggle( "No buffering", "cmdNoBuffering" ),
"VALUE", "ON", NULL );
- named[57] = IupSetAtt( "tgImageBuffer", IupToggle( "CD_DBUFFER", "cmdImageBuffer" ), NULL );
- named[58] = IupSetAtt( "tgRGBBuffer", IupToggle( "CD_DBUFFERRGB", "cmdRGBBuffer" ), NULL );
- named[59] = IupSetAtt( "rdBuffering", IupRadio(
+ named[58] = IupSetAtt( "tgImageBuffer", IupToggle( "CD_DBUFFER", "cmdImageBuffer" ), NULL );
+ named[59] = IupSetAtt( "tgRGBBuffer", IupToggle( "CD_DBUFFERRGB", "cmdRGBBuffer" ), NULL );
+ named[60] = IupSetAtt( "rdBuffering", IupRadio(
IupVbox(
- named[56] /* tgNoBuffering */,
- named[57] /* tgImageBuffer */,
- named[58] /* tgRGBBuffer */,
+ named[57] /* tgNoBuffering */,
+ named[58] /* tgImageBuffer */,
+ named[59] /* tgRGBBuffer */,
NULL)
), NULL );
- named[60] = IupSetAtt( "OptionsDesktop", IupVbox(
+ named[61] = IupSetAtt( "OptionsDesktop", IupVbox(
IupSetAtt( NULL, IupVbox(
IupSetAtt( NULL, IupFrame(
- named[59] /* rdBuffering */
+ named[60] /* rdBuffering */
),
"TITLE", "Buffering:",
"MARGIN", "5x5",
"SIZE", "80", NULL ),
IupSetAtt( NULL, IupFill(),
"SIZE", "10", NULL ),
- named[54] /* tgSimulate */,
- named[55] /* tgStretchPlay */,
+ named[55] /* tgSimulate */,
+ named[56] /* tgStretchPlay */,
IupSetAtt( NULL, IupFill(),
"SIZE", "10", NULL ),
- named[53] /* btOptionsHide */,
+ named[54] /* btOptionsHide */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
NULL),
"GAP", "2", NULL ),
NULL), NULL );
- named[61] = IupSetAtt( "dlgOptions", IupDialog(
- named[60] /* OptionsDesktop */
+ named[62] = IupSetAtt( "dlgOptions", IupDialog(
+ named[61] /* OptionsDesktop */
),
"TITLE", "Options",
"PARENTDIALOG", "dlgMain",
@@ -698,7 +700,7 @@ void cdtest_loadled (void)
"MINBOX", "NO",
"RESIZE", "NO",
"MARGIN", "5x2", NULL );
- named[62] = IupSetAtt( "lstTextAlignment", IupList( "cmdTextAlignment" ),
+ named[63] = IupSetAtt( "lstTextAlignment", IupList( "cmdTextAlignment" ),
"1", "CD_NORTH",
"2", "CD_SOUTH",
"3", "CD_EAST",
@@ -714,11 +716,11 @@ void cdtest_loadled (void)
"DROPDOWN", "YES",
"VALUE", "10",
"SIZE", "89", NULL );
- named[63] = IupSetAtt( "txtMarkSize", IupText( "cmdInteger" ),
+ named[64] = IupSetAtt( "txtMarkSize", IupText( "cmdInteger" ),
"NC", "4",
"SIZE", "20x12",
"VALUE", "10", NULL );
- named[64] = IupSetAtt( "lstMarkType", IupList( "cmdMarkType" ),
+ named[65] = IupSetAtt( "lstMarkType", IupList( "cmdMarkType" ),
"1", "CD_PLUS",
"2", "CD_STAR",
"3", "CD_CIRCLE",
@@ -731,14 +733,14 @@ void cdtest_loadled (void)
"DROPDOWN", "YES",
"VALUE", "2",
"SIZE", "80", NULL );
- named[65] = IupSetAtt( "lstWriteMode", IupList( "cmdWriteMode" ),
+ named[66] = IupSetAtt( "lstWriteMode", IupList( "cmdWriteMode" ),
"1", "CD_REPLACE",
"2", "CD_XOR",
"3", "CD_NOT_XOR",
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[66] = IupSetAtt( "lstFontTypeFace", IupList( "cmdFontTypeFace" ),
+ named[67] = IupSetAtt( "lstFontTypeFace", IupList( "cmdFontTypeFace" ),
"1", "CD_SYSTEM",
"2", "CD_COURIER",
"3", "CD_TIMES_ROMAN",
@@ -746,27 +748,27 @@ void cdtest_loadled (void)
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[67] = IupSetAtt( "lstLineCap", IupList( "cmdLineCap" ),
+ named[68] = IupSetAtt( "lstLineCap", IupList( "cmdLineCap" ),
"1", "CD_CAPFLAT",
"2", "CD_CAPSQUARE",
"3", "CD_CAPROUND",
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[68] = IupSetAtt( "lstLineJoin", IupList( "cmdLineJoin" ),
+ named[69] = IupSetAtt( "lstLineJoin", IupList( "cmdLineJoin" ),
"1", "CD_BEVEL",
"2", "CD_MITER",
"3", "CD_ROUND",
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[69] = IupSetAtt( "lstFillMode", IupList( "cmdFillMode" ),
+ named[70] = IupSetAtt( "lstFillMode", IupList( "cmdFillMode" ),
"1", "CD_EVENODD",
"2", "CD_WINDING",
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[70] = IupSetAtt( "lstFontStyle", IupList( "cmdFontStyle" ),
+ named[71] = IupSetAtt( "lstFontStyle", IupList( "cmdFontStyle" ),
"1", "CD_PLAIN",
"2", "CD_BOLD",
"3", "CD_ITALIC",
@@ -774,19 +776,19 @@ void cdtest_loadled (void)
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[71] = IupSetAtt( "txtLineWidth", IupText( "cmdInteger" ),
+ named[72] = IupSetAtt( "txtLineWidth", IupText( "cmdInteger" ),
"SIZE", "30",
"NC", "3",
"VALUE", "1", NULL );
- named[72] = IupSetAtt( "txtFontSize", IupText( "cmdInteger" ),
+ named[73] = IupSetAtt( "txtFontSize", IupText( "cmdInteger" ),
"SIZE", "30",
"NC", "3",
"VALUE", "12", NULL );
- named[73] = IupSetAtt( "txtTextOrientation", IupText( "cmdInteger" ),
+ named[74] = IupSetAtt( "txtTextOrientation", IupText( "cmdInteger" ),
"SIZE", "30",
"NC", "3",
"VALUE", "0", NULL );
- named[74] = IupSetAtt( "lstLineStyle", IupList( "cmdLineStyle" ),
+ named[75] = IupSetAtt( "lstLineStyle", IupList( "cmdLineStyle" ),
"1", "CD_CONTINUOUS",
"2", "CD_DASHED",
"3", "CD_DOTTED",
@@ -796,19 +798,19 @@ void cdtest_loadled (void)
"VALUE", "1",
"DROPDOWN", "YES",
"SIZE", "80", NULL );
- named[75] = IupSetAtt( "tgSolid", IupToggle( "CD_SOLID", "cmdSolid" ),
+ named[76] = IupSetAtt( "tgSolid", IupToggle( "CD_SOLID", "cmdSolid" ),
"VALUE", "ON", NULL );
- named[76] = IupSetAtt( "tgHatch", IupToggle( "CD_HATCH", "cmdHatch" ), NULL );
- named[77] = IupSetAtt( "tgStipple", IupToggle( "CD_STIPPLE", "cmdStipple" ), NULL );
- named[78] = IupSetAtt( "tgPattern", IupToggle( "CD_PATTERN", "cmdPattern" ), NULL );
- named[79] = IupSetAtt( "lstOpacity", IupList( "cmdOpacity" ),
+ named[77] = IupSetAtt( "tgHatch", IupToggle( "CD_HATCH", "cmdHatch" ), NULL );
+ named[78] = IupSetAtt( "tgStipple", IupToggle( "CD_STIPPLE", "cmdStipple" ), NULL );
+ named[79] = IupSetAtt( "tgPattern", IupToggle( "CD_PATTERN", "cmdPattern" ), NULL );
+ named[80] = IupSetAtt( "lstOpacity", IupList( "cmdOpacity" ),
"1", "CD_OPAQUE",
"2", "CD_TRANSPARENT",
"VALUE", "2",
"DROPDOWN", "YES",
"SIZE", "80",
"ACTIVE", "YES", NULL );
- named[80] = IupSetAtt( "lstHatchStyle", IupList( "cmdHatchStyle" ),
+ named[81] = IupSetAtt( "lstHatchStyle", IupList( "cmdHatchStyle" ),
"1", "CD_HORIZONTAL",
"2", "CD_VERTICAL",
"3", "CD_FDIAGONAL",
@@ -819,35 +821,35 @@ void cdtest_loadled (void)
"DROPDOWN", "YES",
"SIZE", "80",
"ACTIVE", "YES", NULL );
- named[81] = IupSetAtt( "btAttributesHide", IupButton( "Hide", "cmdAttributesHide" ),
+ named[82] = IupSetAtt( "btAttributesHide", IupButton( "Hide", "cmdAttributesHide" ),
"SIZE", "30", NULL );
- named[82] = IupSetAtt( "rdInteriorStyle", IupRadio(
+ named[83] = IupSetAtt( "rdInteriorStyle", IupRadio(
IupVbox(
- named[75] /* tgSolid */,
- named[76] /* tgHatch */,
- named[77] /* tgStipple */,
- named[78] /* tgPattern */,
+ named[76] /* tgSolid */,
+ named[77] /* tgHatch */,
+ named[78] /* tgStipple */,
+ named[79] /* tgPattern */,
NULL)
), NULL );
- named[83] = IupSetAtt( "AttributesDesktop", IupVbox(
+ named[84] = IupSetAtt( "AttributesDesktop", IupVbox(
IupHbox(
IupSetAtt( NULL, IupVbox(
IupLabel( "Write Mode:" ),
- named[65] /* lstWriteMode */,
+ named[66] /* lstWriteMode */,
IupSetAtt( NULL, IupFill(),
"SIZE", "4", NULL ),
IupSetAtt( NULL, IupFrame(
IupVbox(
IupLabel( "Back Opacity:" ),
- named[79] /* lstOpacity */,
+ named[80] /* lstOpacity */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Fill Mode:" ),
- named[69] /* lstFillMode */,
+ named[70] /* lstFillMode */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupSetAtt( NULL, IupFrame(
- named[82] /* rdInteriorStyle */
+ named[83] /* rdInteriorStyle */
),
"TITLE", "Interior Style:",
"MARGIN", "5x5",
@@ -855,7 +857,7 @@ void cdtest_loadled (void)
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Hatch Style:" ),
- named[80] /* lstHatchStyle */,
+ named[81] /* lstHatchStyle */,
NULL)
),
"TITLE", "Fill Attributes",
@@ -865,43 +867,43 @@ void cdtest_loadled (void)
IupSetAtt( NULL, IupFrame(
IupVbox(
IupLabel( "Mark Type:" ),
- named[64] /* lstMarkType */,
+ named[65] /* lstMarkType */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Mark Size:" ),
- named[63] /* txtMarkSize */,
+ named[64] /* txtMarkSize */,
NULL)
),
"TITLE", "Mark Attributes",
"MARGIN", "5x5", NULL ),
IupSetAtt( NULL, IupFill(),
"SIZE", "10", NULL ),
- named[81] /* btAttributesHide */,
+ named[82] /* btAttributesHide */,
NULL),
"GAP", "2", NULL ),
IupSetAtt( NULL, IupVbox(
IupSetAtt( NULL, IupFrame(
IupVbox(
IupLabel( "Font Typeface:" ),
- named[66] /* lstFontTypeFace */,
+ named[67] /* lstFontTypeFace */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Font Style:" ),
- named[70] /* lstFontStyle */,
+ named[71] /* lstFontStyle */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Font Size:" ),
- named[72] /* txtFontSize */,
+ named[73] /* txtFontSize */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupSetAtt( NULL, IupLabel( "Text Alignment:" ),
"SIZE", "x9", NULL ),
- named[62] /* lstTextAlignment */,
+ named[63] /* lstTextAlignment */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupSetAtt( NULL, IupLabel( "Text Orientation:" ),
"SIZE", "x9", NULL ),
- named[73] /* txtTextOrientation */,
+ named[74] /* txtTextOrientation */,
NULL)
),
"TITLE", "Text Attributes",
@@ -911,19 +913,19 @@ void cdtest_loadled (void)
IupSetAtt( NULL, IupFrame(
IupVbox(
IupLabel( "Line Style:" ),
- named[74] /* lstLineStyle */,
+ named[75] /* lstLineStyle */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Line Width:" ),
- named[71] /* txtLineWidth */,
+ named[72] /* txtLineWidth */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Line Cap:" ),
- named[67] /* lstLineCap */,
+ named[68] /* lstLineCap */,
IupSetAtt( NULL, IupFill(),
"SIZE", "2", NULL ),
IupLabel( "Line Join:" ),
- named[68] /* lstLineJoin */,
+ named[69] /* lstLineJoin */,
NULL)
),
"TITLE", "Line Attributes",
@@ -932,8 +934,8 @@ void cdtest_loadled (void)
"GAP", "2", NULL ),
NULL),
NULL), NULL );
- named[84] = IupSetAtt( "dlgAttributes", IupDialog(
- named[83] /* AttributesDesktop */
+ named[85] = IupSetAtt( "dlgAttributes", IupDialog(
+ named[84] /* AttributesDesktop */
),
"TITLE", "Attributes",
"PARENTDIALOG", "dlgMain",
@@ -942,67 +944,67 @@ void cdtest_loadled (void)
"RESIZE", "NO",
"CLOSE_CB", "cmdAttributesHide",
"MARGIN", "5x2", NULL );
- named[85] = IupSetAtt( "txtLBX1", IupText( "cmdInteger" ),
+ named[86] = IupSetAtt( "txtLBX1", IupText( "cmdInteger" ),
"NC", "8",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[86] = IupSetAtt( "txtLBX2", IupText( "cmdInteger" ),
+ named[87] = IupSetAtt( "txtLBX2", IupText( "cmdInteger" ),
"NC", "8",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[87] = IupSetAtt( "txtLBY1", IupText( "cmdInteger" ),
+ named[88] = IupSetAtt( "txtLBY1", IupText( "cmdInteger" ),
"NC", "8",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[88] = IupSetAtt( "txtLBY2", IupText( "cmdInteger" ),
+ named[89] = IupSetAtt( "txtLBY2", IupText( "cmdInteger" ),
"NC", "8",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[89] = IupSetAtt( "btLBDraw", IupButton( "Draw", "cmdDraw" ),
+ named[90] = IupSetAtt( "btLBDraw", IupButton( "Draw", "cmdDraw" ),
"SIZE", "30", NULL );
- named[90] = IupSetAtt( "btLBHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[91] = IupSetAtt( "btLBHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[91] = IupSetAtt( "LBData", IupVbox(
+ named[92] = IupSetAtt( "LBData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "X1:" ),
"SIZE", "15x9", NULL ),
- named[85] /* txtLBX1 */,
+ named[86] /* txtLBX1 */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y1:" ),
"SIZE", "15x9", NULL ),
- named[87] /* txtLBY1 */,
+ named[88] /* txtLBY1 */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "X2:" ),
"SIZE", "15x9", NULL ),
- named[86] /* txtLBX2 */,
+ named[87] /* txtLBX2 */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y2:" ),
"SIZE", "15x9", NULL ),
- named[88] /* txtLBY2 */,
+ named[89] /* txtLBY2 */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[92] = IupSetAtt( "LBDeskTop", IupVbox(
+ named[93] = IupSetAtt( "LBDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[91] /* LBData */,
+ named[92] /* LBData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[89] /* btLBDraw */,
+ named[90] /* btLBDraw */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[90] /* btLBHide */,
+ named[91] /* btLBHide */,
IupFill(),
NULL),
NULL), NULL );
- named[93] = IupSetAtt( "dlgLB", IupDialog(
- named[92] /* LBDeskTop */
+ named[94] = IupSetAtt( "dlgLB", IupDialog(
+ named[93] /* LBDeskTop */
),
"TITLE", "Line Parameters",
"PARENTDIALOG", "dlgMain",
@@ -1011,86 +1013,86 @@ void cdtest_loadled (void)
"RESIZE", "NO",
"CLOSE_CB", "cmdMsgHide",
"MARGIN", "5x5", NULL );
- named[94] = IupSetAtt( "txtASXC", IupText( "cmdInteger" ),
+ named[95] = IupSetAtt( "txtASXC", IupText( "cmdInteger" ),
"NC", "4",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[95] = IupSetAtt( "txtASYC", IupText( "cmdInteger" ),
+ named[96] = IupSetAtt( "txtASYC", IupText( "cmdInteger" ),
"NC", "4",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[96] = IupSetAtt( "txtASW", IupText( "cmdInteger" ),
+ named[97] = IupSetAtt( "txtASW", IupText( "cmdInteger" ),
"NC", "4",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[97] = IupSetAtt( "txtASH", IupText( "cmdInteger" ),
+ named[98] = IupSetAtt( "txtASH", IupText( "cmdInteger" ),
"NC", "4",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[98] = IupSetAtt( "txtASAngle1", IupText( "cmdReal" ),
+ named[99] = IupSetAtt( "txtASAngle1", IupText( "cmdReal" ),
"NC", "10",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[99] = IupSetAtt( "txtASAngle2", IupText( "cmdReal" ),
+ named[100] = IupSetAtt( "txtASAngle2", IupText( "cmdReal" ),
"NC", "10",
"SIZE", "30x12",
"VALUE", "360", NULL );
- named[100] = IupSetAtt( "btASDraw", IupButton( "Draw", "cmdDraw" ),
+ named[101] = IupSetAtt( "btASDraw", IupButton( "Draw", "cmdDraw" ),
"SIZE", "30", NULL );
- named[101] = IupSetAtt( "btASHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[102] = IupSetAtt( "btASHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[102] = IupSetAtt( "ASData", IupVbox(
+ named[103] = IupSetAtt( "ASData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "Xc:" ),
"SIZE", "30x9", NULL ),
- named[94] /* txtASXC */,
+ named[95] /* txtASXC */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Yc:" ),
"SIZE", "30x9", NULL ),
- named[95] /* txtASYC */,
+ named[96] /* txtASYC */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "W:" ),
"SIZE", "30x9", NULL ),
- named[96] /* txtASW */,
+ named[97] /* txtASW */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "H:" ),
"SIZE", "30x9", NULL ),
- named[97] /* txtASH */,
+ named[98] /* txtASH */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "Angle1:" ),
"SIZE", "30x9", NULL ),
- named[98] /* txtASAngle1 */,
+ named[99] /* txtASAngle1 */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Angle2:" ),
"SIZE", "30x9", NULL ),
- named[99] /* txtASAngle2 */,
+ named[100] /* txtASAngle2 */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[103] = IupSetAtt( "ASDeskTop", IupVbox(
+ named[104] = IupSetAtt( "ASDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[102] /* ASData */,
+ named[103] /* ASData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[100] /* btASDraw */,
+ named[101] /* btASDraw */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[101] /* btASHide */,
+ named[102] /* btASHide */,
IupFill(),
NULL),
NULL), NULL );
- named[104] = IupSetAtt( "dlgAS", IupDialog(
- named[103] /* ASDeskTop */
+ named[105] = IupSetAtt( "dlgAS", IupDialog(
+ named[104] /* ASDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Arc Parameters",
@@ -1099,48 +1101,48 @@ void cdtest_loadled (void)
"RESIZE", "NO",
"CLOSE_CB", "cmdMsgHide",
"MARGIN", "5x5", NULL );
- named[105] = IupSetAtt( "txtPixelX", IupText( "cmdInteger" ),
+ named[106] = IupSetAtt( "txtPixelX", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[106] = IupSetAtt( "txtPixelY", IupText( "cmdInteger" ),
+ named[107] = IupSetAtt( "txtPixelY", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[107] = IupSetAtt( "btPixelDraw", IupButton( "Draw", "cmdDraw" ),
+ named[108] = IupSetAtt( "btPixelDraw", IupButton( "Draw", "cmdDraw" ),
"SIZE", "30", NULL );
- named[108] = IupSetAtt( "btPixelHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[109] = IupSetAtt( "btPixelHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[109] = IupSetAtt( "PixelData", IupVbox(
+ named[110] = IupSetAtt( "PixelData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "X:" ),
"SIZE", "10x9", NULL ),
- named[105] /* txtPixelX */,
+ named[106] /* txtPixelX */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y:" ),
"SIZE", "10x9", NULL ),
- named[106] /* txtPixelY */,
+ named[107] /* txtPixelY */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[110] = IupSetAtt( "PixelDeskTop", IupVbox(
+ named[111] = IupSetAtt( "PixelDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[109] /* PixelData */,
+ named[110] /* PixelData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[107] /* btPixelDraw */,
+ named[108] /* btPixelDraw */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[108] /* btPixelHide */,
+ named[109] /* btPixelHide */,
IupFill(),
NULL),
NULL), NULL );
- named[111] = IupSetAtt( "dlgPixel", IupDialog(
- named[110] /* PixelDeskTop */
+ named[112] = IupSetAtt( "dlgPixel", IupDialog(
+ named[111] /* PixelDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Pixel Parameters",
@@ -1149,50 +1151,50 @@ void cdtest_loadled (void)
"RESIZE", "NO",
"CLOSE_CB", "cmdMsgHide",
"MARGIN", "5x5", NULL );
- named[112] = IupSetAtt( "txtMarkX", IupText( "cmdInteger" ),
+ named[113] = IupSetAtt( "txtMarkX", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[113] = IupSetAtt( "txtMarkY", IupText( "cmdInteger" ),
+ named[114] = IupSetAtt( "txtMarkY", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[114] = IupSetAtt( "btMarkDraw", IupButton( "Draw", "cmdDraw" ),
+ named[115] = IupSetAtt( "btMarkDraw", IupButton( "Draw", "cmdDraw" ),
"SIZE", "30", NULL );
- named[115] = IupSetAtt( "btMarkHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[116] = IupSetAtt( "btMarkHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[116] = IupSetAtt( "MarkData", IupVbox(
+ named[117] = IupSetAtt( "MarkData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupFill(),
IupSetAtt( NULL, IupLabel( "X:" ),
"SIZE", "10x9", NULL ),
- named[112] /* txtMarkX */,
+ named[113] /* txtMarkX */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y:" ),
"SIZE", "10x9", NULL ),
- named[113] /* txtMarkY */,
+ named[114] /* txtMarkY */,
IupFill(),
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[117] = IupSetAtt( "MarkDeskTop", IupVbox(
+ named[118] = IupSetAtt( "MarkDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[116] /* MarkData */,
+ named[117] /* MarkData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[114] /* btMarkDraw */,
+ named[115] /* btMarkDraw */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[115] /* btMarkHide */,
+ named[116] /* btMarkHide */,
IupFill(),
NULL),
NULL), NULL );
- named[118] = IupSetAtt( "dlgMark", IupDialog(
- named[117] /* MarkDeskTop */
+ named[119] = IupSetAtt( "dlgMark", IupDialog(
+ named[118] /* MarkDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Mark Parameters",
@@ -1201,59 +1203,59 @@ void cdtest_loadled (void)
"RESIZE", "NO",
"CLOSE_CB", "cmdMsgHide",
"MARGIN", "5x5", NULL );
- named[119] = IupSetAtt( "txtTextX", IupText( "cmdInteger" ),
+ named[120] = IupSetAtt( "txtTextX", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[120] = IupSetAtt( "txtTextY", IupText( "cmdInteger" ),
+ named[121] = IupSetAtt( "txtTextY", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[121] = IupSetAtt( "txtTextS", IupText( "cmdString" ),
+ named[122] = IupSetAtt( "txtTextS", IupText( "cmdString" ),
"NC", "100",
"SIZE", "89x12",
"VALUE", "Text", NULL );
- named[122] = IupSetAtt( "btTextDraw", IupButton( "Draw", "cmdDraw" ),
+ named[123] = IupSetAtt( "btTextDraw", IupButton( "Draw", "cmdDraw" ),
"SIZE", "30", NULL );
- named[123] = IupSetAtt( "btTextHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[124] = IupSetAtt( "btTextHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[124] = IupSetAtt( "TextData", IupVbox(
+ named[125] = IupSetAtt( "TextData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "X:" ),
"SIZE", "10x9", NULL ),
- named[119] /* txtTextX */,
+ named[120] /* txtTextX */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y:" ),
"SIZE", "10x9", NULL ),
- named[120] /* txtTextY */,
+ named[121] /* txtTextY */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupHbox(
IupVbox(
IupSetAtt( NULL, IupLabel( "Text:" ),
"SIZE", "25x9", NULL ),
- named[121] /* txtTextS */,
+ named[122] /* txtTextS */,
NULL),
NULL),
NULL), NULL );
- named[125] = IupSetAtt( "TextDeskTop", IupVbox(
+ named[126] = IupSetAtt( "TextDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[124] /* TextData */,
+ named[125] /* TextData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[122] /* btTextDraw */,
+ named[123] /* btTextDraw */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[123] /* btTextHide */,
+ named[124] /* btTextHide */,
IupFill(),
NULL),
NULL), NULL );
- named[126] = IupSetAtt( "dlgText", IupDialog(
- named[125] /* TextDeskTop */
+ named[127] = IupSetAtt( "dlgText", IupDialog(
+ named[126] /* TextDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Text Parameters",
@@ -1262,24 +1264,24 @@ void cdtest_loadled (void)
"CLOSE_CB", "cmdMsgHide",
"RESIZE", "NO",
"MARGIN", "5x5", NULL );
- named[127] = IupSetAtt( "tgOpenLines", IupToggle( "CD_OPEN_LINES", "cmdOpenLines" ),
+ named[128] = IupSetAtt( "tgOpenLines", IupToggle( "CD_OPEN_LINES", "cmdOpenLines" ),
"VALUE", "ON", NULL );
- named[128] = IupSetAtt( "tgClosedLines", IupToggle( "CD_CLOSED_LINES", "cmdClosedLines" ), NULL );
- named[129] = IupSetAtt( "tgFilled", IupToggle( "CD_FILL", "cmdFill" ), NULL );
- named[130] = IupSetAtt( "tgClip", IupToggle( "CD_CLIP", "cmdPolyClip" ), NULL );
- named[131] = IupSetAtt( "tgBezier", IupToggle( "CD_BEZIER", "cmdPolyBezier" ), NULL );
- named[132] = IupSetAtt( "btPolyHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[129] = IupSetAtt( "tgClosedLines", IupToggle( "CD_CLOSED_LINES", "cmdClosedLines" ), NULL );
+ named[130] = IupSetAtt( "tgFilled", IupToggle( "CD_FILL", "cmdFill" ), NULL );
+ named[131] = IupSetAtt( "tgClip", IupToggle( "CD_CLIP", "cmdPolyClip" ), NULL );
+ named[132] = IupSetAtt( "tgBezier", IupToggle( "CD_BEZIER", "cmdPolyBezier" ), NULL );
+ named[133] = IupSetAtt( "btPolyHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[133] = IupSetAtt( "rdMode", IupRadio(
+ named[134] = IupSetAtt( "rdMode", IupRadio(
IupVbox(
- named[127] /* tgOpenLines */,
- named[128] /* tgClosedLines */,
- named[129] /* tgFilled */,
- named[130] /* tgClip */,
- named[131] /* tgBezier */,
+ named[128] /* tgOpenLines */,
+ named[129] /* tgClosedLines */,
+ named[130] /* tgFilled */,
+ named[131] /* tgClip */,
+ named[132] /* tgBezier */,
NULL)
), NULL );
- named[134] = IupSetAtt( "PolyDesktop", IupVbox(
+ named[135] = IupSetAtt( "PolyDesktop", IupVbox(
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupHbox(
@@ -1288,7 +1290,7 @@ void cdtest_loadled (void)
IupHbox(
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[133] /* rdMode */,
+ named[134] /* rdMode */,
NULL)
),
"TITLE", "Polygon Mode:", NULL ),
@@ -1298,14 +1300,14 @@ void cdtest_loadled (void)
"SIZE", "10", NULL ),
IupHbox(
IupFill(),
- named[132] /* btPolyHide */,
+ named[133] /* btPolyHide */,
IupFill(),
NULL),
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
NULL), NULL );
- named[135] = IupSetAtt( "dlgPoly", IupDialog(
- named[134] /* PolyDesktop */
+ named[136] = IupSetAtt( "dlgPoly", IupDialog(
+ named[135] /* PolyDesktop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Polygon Parameters",
@@ -1313,77 +1315,77 @@ void cdtest_loadled (void)
"MINBOX", "NO",
"RESIZE", "NO",
"CLOSE_CB", "cmdMsgHide", NULL );
- named[136] = IupSetAtt( "txtClipXmin", IupText( "cmdInteger" ),
+ named[137] = IupSetAtt( "txtClipXmin", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[137] = IupSetAtt( "txtClipXmax", IupText( "cmdInteger" ),
+ named[138] = IupSetAtt( "txtClipXmax", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[138] = IupSetAtt( "txtClipYmin", IupText( "cmdInteger" ),
+ named[139] = IupSetAtt( "txtClipYmin", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[139] = IupSetAtt( "txtClipYmax", IupText( "cmdInteger" ),
+ named[140] = IupSetAtt( "txtClipYmax", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[140] = IupSetAtt( "btClipOff", IupButton( "Off", "cmdClipOff" ),
+ named[141] = IupSetAtt( "btClipOff", IupButton( "Off", "cmdClipOff" ),
"SIZE", "30", NULL );
- named[141] = IupSetAtt( "btClipArea", IupButton( "Area", "cmdClipArea" ),
+ named[142] = IupSetAtt( "btClipArea", IupButton( "Area", "cmdClipArea" ),
"SIZE", "30", NULL );
- named[142] = IupSetAtt( "btClipPoly", IupButton( "Polygon", "cmdClipPoly" ),
+ named[143] = IupSetAtt( "btClipPoly", IupButton( "Polygon", "cmdClipPoly" ),
"SIZE", "50", NULL );
- named[143] = IupSetAtt( "btClipHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[144] = IupSetAtt( "btClipHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[144] = IupSetAtt( "ClipData", IupVbox(
+ named[145] = IupSetAtt( "ClipData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "Xmin:" ),
"SIZE", "25x9", NULL ),
- named[136] /* txtClipXmin */,
+ named[137] /* txtClipXmin */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Ymin:" ),
"SIZE", "25x9", NULL ),
- named[138] /* txtClipYmin */,
+ named[139] /* txtClipYmin */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "Xmax:" ),
"SIZE", "25x9", NULL ),
- named[137] /* txtClipXmax */,
+ named[138] /* txtClipXmax */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Ymax:" ),
"SIZE", "25x9", NULL ),
- named[139] /* txtClipYmax */,
+ named[140] /* txtClipYmax */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[145] = IupSetAtt( "ClipDeskTop", IupVbox(
+ named[146] = IupSetAtt( "ClipDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[144] /* ClipData */,
+ named[145] /* ClipData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[140] /* btClipOff */,
+ named[141] /* btClipOff */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[141] /* btClipArea */,
+ named[142] /* btClipArea */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[142] /* btClipPoly */,
+ named[143] /* btClipPoly */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[143] /* btClipHide */,
+ named[144] /* btClipHide */,
IupFill(),
NULL),
NULL), NULL );
- named[146] = IupSetAtt( "dlgClip", IupDialog(
- named[145] /* ClipDeskTop */
+ named[147] = IupSetAtt( "dlgClip", IupDialog(
+ named[146] /* ClipDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Clipping",
@@ -1392,72 +1394,72 @@ void cdtest_loadled (void)
"MINBOX", "NO",
"RESIZE", "NO",
"MARGIN", "5x5", NULL );
- named[147] = IupSetAtt( "txtImageX", IupText( "cmdInteger" ),
+ named[148] = IupSetAtt( "txtImageX", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[148] = IupSetAtt( "txtImageY", IupText( "cmdInteger" ),
+ named[149] = IupSetAtt( "txtImageY", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[149] = IupSetAtt( "txtImageW", IupText( "cmdInteger" ),
+ named[150] = IupSetAtt( "txtImageW", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[150] = IupSetAtt( "txtImageH", IupText( "cmdInteger" ),
+ named[151] = IupSetAtt( "txtImageH", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[151] = IupSetAtt( "btImagePut", IupButton( "Put", "cmdImagePut" ),
+ named[152] = IupSetAtt( "btImagePut", IupButton( "Put", "cmdImagePut" ),
"SIZE", "30", NULL );
- named[152] = IupSetAtt( "btImageGet", IupButton( "Get", "cmdImageGet" ),
+ named[153] = IupSetAtt( "btImageGet", IupButton( "Get", "cmdImageGet" ),
"SIZE", "30", NULL );
- named[153] = IupSetAtt( "btImageHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[154] = IupSetAtt( "btImageHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[154] = IupSetAtt( "ImageData", IupVbox(
+ named[155] = IupSetAtt( "ImageData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "X:" ),
"SIZE", "30x9", NULL ),
- named[147] /* txtImageX */,
+ named[148] /* txtImageX */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y:" ),
"SIZE", "30x9", NULL ),
- named[148] /* txtImageY */,
+ named[149] /* txtImageY */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "Width:" ),
"SIZE", "30x9", NULL ),
- named[149] /* txtImageW */,
+ named[150] /* txtImageW */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Height:" ),
"SIZE", "30x9", NULL ),
- named[150] /* txtImageH */,
+ named[151] /* txtImageH */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[155] = IupSetAtt( "ImageDeskTop", IupVbox(
+ named[156] = IupSetAtt( "ImageDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[154] /* ImageData */,
+ named[155] /* ImageData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[152] /* btImageGet */,
+ named[153] /* btImageGet */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[151] /* btImagePut */,
+ named[152] /* btImagePut */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[153] /* btImageHide */,
+ named[154] /* btImageHide */,
IupFill(),
NULL),
NULL), NULL );
- named[156] = IupSetAtt( "dlgImage", IupDialog(
- named[155] /* ImageDeskTop */
+ named[157] = IupSetAtt( "dlgImage", IupDialog(
+ named[156] /* ImageDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "Server Image",
@@ -1466,72 +1468,72 @@ void cdtest_loadled (void)
"CLOSE_CB", "cmdMsgHide",
"RESIZE", "NO",
"MARGIN", "5x5", NULL );
- named[157] = IupSetAtt( "txtImageRGBX", IupText( "cmdInteger" ),
+ named[158] = IupSetAtt( "txtImageRGBX", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[158] = IupSetAtt( "txtImageRGBY", IupText( "cmdInteger" ),
+ named[159] = IupSetAtt( "txtImageRGBY", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[159] = IupSetAtt( "txtImageRGBW", IupText( "cmdInteger" ),
+ named[160] = IupSetAtt( "txtImageRGBW", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[160] = IupSetAtt( "txtImageRGBH", IupText( "cmdInteger" ),
+ named[161] = IupSetAtt( "txtImageRGBH", IupText( "cmdInteger" ),
"NC", "5",
"SIZE", "30x12",
"VALUE", "0", NULL );
- named[161] = IupSetAtt( "btImageRGBPut", IupButton( "Put", "cmdImageRGBPut" ),
+ named[162] = IupSetAtt( "btImageRGBPut", IupButton( "Put", "cmdImageRGBPut" ),
"SIZE", "30", NULL );
- named[162] = IupSetAtt( "btImageRGBGet", IupButton( "Get", "cmdImageRGBGet" ),
+ named[163] = IupSetAtt( "btImageRGBGet", IupButton( "Get", "cmdImageRGBGet" ),
"SIZE", "30", NULL );
- named[163] = IupSetAtt( "btImageRGBHide", IupButton( "Hide", "cmdMsgHide" ),
+ named[164] = IupSetAtt( "btImageRGBHide", IupButton( "Hide", "cmdMsgHide" ),
"SIZE", "30", NULL );
- named[164] = IupSetAtt( "ImageRGBData", IupVbox(
+ named[165] = IupSetAtt( "ImageRGBData", IupVbox(
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "X:" ),
"SIZE", "30x9", NULL ),
- named[157] /* txtImageRGBX */,
+ named[158] /* txtImageRGBX */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Y:" ),
"SIZE", "30x9", NULL ),
- named[158] /* txtImageRGBY */,
+ named[159] /* txtImageRGBY */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupSetAtt( NULL, IupHbox(
IupSetAtt( NULL, IupLabel( "Width:" ),
"SIZE", "30x9", NULL ),
- named[159] /* txtImageRGBW */,
+ named[160] /* txtImageRGBW */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupSetAtt( NULL, IupLabel( "Height:" ),
"SIZE", "30x9", NULL ),
- named[160] /* txtImageRGBH */,
+ named[161] /* txtImageRGBH */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
NULL), NULL );
- named[165] = IupSetAtt( "ImageRGBDeskTop", IupVbox(
+ named[166] = IupSetAtt( "ImageRGBDeskTop", IupVbox(
IupHbox(
IupFill(),
- named[164] /* ImageRGBData */,
+ named[165] /* ImageRGBData */,
IupFill(),
NULL),
IupHbox(
IupFill(),
- named[162] /* btImageRGBGet */,
+ named[163] /* btImageRGBGet */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[161] /* btImageRGBPut */,
+ named[162] /* btImageRGBPut */,
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
- named[163] /* btImageRGBHide */,
+ named[164] /* btImageRGBHide */,
IupFill(),
NULL),
NULL), NULL );
- named[166] = IupSetAtt( "dlgImageRGB", IupDialog(
- named[165] /* ImageRGBDeskTop */
+ named[167] = IupSetAtt( "dlgImageRGB", IupDialog(
+ named[166] /* ImageRGBDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "RGB Image",
@@ -1540,8 +1542,8 @@ void cdtest_loadled (void)
"CLOSE_CB", "cmdMsgHide",
"RESIZE", "NO",
"MARGIN", "5x5", NULL );
- named[167] = IupSetAtt( "btCDTest", IupButton( "Close", "cmdCloseAbout" ), NULL );
- named[168] = IupSetAtt( "AboutDeskTop", IupHbox(
+ named[168] = IupSetAtt( "btCDTest", IupButton( "Close", "cmdCloseAbout" ), NULL );
+ named[169] = IupSetAtt( "AboutDeskTop", IupHbox(
IupFill(),
IupSetAtt( NULL, IupVbox(
IupLabel( "CD Test 5.3" ),
@@ -1555,16 +1557,16 @@ void cdtest_loadled (void)
IupSetAtt( NULL, IupFill(),
"SIZE", "5", NULL ),
IupLabel( "CD Library Version" ),
- named[169] = IupSetAtt( "lblVersion", IupLabel( "" ), NULL ),
- named[167] /* btCDTest */,
+ named[170] = IupSetAtt( "lblVersion", IupLabel( "" ), NULL ),
+ named[168] /* btCDTest */,
NULL),
"ALIGNMENT", "ACENTER", NULL ),
IupFill(),
NULL),
"MARGIN", "5x5",
"GAP", "2", NULL );
- named[170] = IupSetAtt( "dlgHelpAbout", IupDialog(
- named[168] /* AboutDeskTop */
+ named[171] = IupSetAtt( "dlgHelpAbout", IupDialog(
+ named[169] /* AboutDeskTop */
),
"PARENTDIALOG", "dlgMain",
"TITLE", "About",
diff --git a/test/cdtest/config.mak b/test/cdtest/config.mak
index 6a71b59..fc1fb4a 100644
--- a/test/cdtest/config.mak
+++ b/test/cdtest/config.mak
@@ -4,13 +4,16 @@ SRC = cdtest.c cdtest_led.c colorbar.c drivers.c list.c rubber.c
ifeq "$(TEC_SYSNAME)" "Win32"
SRC += cdtest.rc
+ LEDC = $(IUP)/bin/$(TEC_SYSNAME)/ledc
+else
+ LEDC = $(IUP)/bin/$(TEC_UNAME)/ledc
endif
USE_CD=Yes
USE_IUP3=Yes
cdtest_led.c: cdtest.led
- $(IUP)/bin/$(TEC_UNAME)/ledc -f cdtest_loadled -o cdtest_led.c cdtest.led
+ $(LEDC) -f cdtest_loadled -o cdtest_led.c cdtest.led
USE_STATIC = Yes
diff --git a/test/cdtest/drivers.c b/test/cdtest/drivers.c
index 62e92aa..dd23331 100644
--- a/test/cdtest/drivers.c
+++ b/test/cdtest/drivers.c
@@ -33,6 +33,7 @@ extern tCTC ctgc;
#define DGN
#define PDF
#define CDDBG
+#define SVG
static int LoadCanvas(char* ctx_name, cdContext* ctx, char *filename)
{
@@ -197,6 +198,27 @@ static int fEPS(void)
}
#endif
+/*-------------------------------------------------------------------------*/
+/* Copia o conteudo do canvas para um arquivo SVG. */
+/*-------------------------------------------------------------------------*/
+#ifdef SVG
+#include <cdsvg.h>
+
+static int fSVG(void)
+{
+ char filename[1024]="*.svg";
+ char data[1024];
+
+ if (IupGetFile(filename)>=0)
+ {
+ sprintf(data, "%s -s%d", filename, (int)(ctgc.res * 25.4));
+ return SaveCanvas("CD_SVG", CD_SVG, data);
+ }
+
+ return IUP_DEFAULT;
+}
+#endif
+
#ifdef PDF
#include <cdpdf.h>
@@ -428,6 +450,10 @@ void DriversInit(void)
IupSetFunction("cmdPS", (Icallback) fPS);
IupSetFunction("cmdEPS", (Icallback) fEPS);
#endif
+#ifdef SVG
+ IupSetAttribute(IupGetHandle("itSVG"), IUP_ACTIVE, IUP_YES);
+ IupSetFunction("cmdSVG", (Icallback) fSVG);
+#endif
#ifdef PDF
IupSetAttribute(IupGetHandle("itPDF"), IUP_ACTIVE, IUP_YES);
IupSetFunction("cmdPDF", (Icallback) fPDF);
diff --git a/test/simple/.cvsignore b/test/simple/.cvsignore
index c29a181..9c20a41 100644
--- a/test/simple/.cvsignore
+++ b/test/simple/.cvsignore
@@ -19,3 +19,4 @@ Makefile
*.ncb
*.opt
*.user
+svg \ No newline at end of file
diff --git a/test/simple/config.mak b/test/simple/config.mak
index fee0960..9598d84 100644
--- a/test/simple/config.mak
+++ b/test/simple/config.mak
@@ -2,12 +2,18 @@ APPNAME = simple
SRC = simple.c simple_led.c iupmain.c
-DBG = Yes
+#DBG = Yes
USE_CD=Yes
USE_IUP3=Yes
+ifeq "$(TEC_SYSNAME)" "Win32"
+ LEDC = $(IUP)/bin/$(TEC_SYSNAME)/ledc
+else
+ LEDC = $(IUP)/bin/$(TEC_UNAME)/ledc
+endif
+
simple_led.c: simple.led
- ledc -f simple_loadled -o simple_led.c simple.led
+ $(LEDC) -f simple_loadled -o simple_led.c simple.led
USE_STATIC = Yes
diff --git a/test/simple/iupmain.c b/test/simple/iupmain.c
index 562d06c..e8af887 100644
--- a/test/simple/iupmain.c
+++ b/test/simple/iupmain.c
@@ -49,6 +49,7 @@ int main(int argc, char** argv)
IupSetFunction("SimpleDrawPDF", (Icallback) SimpleDrawPDF);
IupSetFunction("SimpleDrawPS", (Icallback) SimpleDrawPS);
IupSetFunction("SimpleDrawEPS", (Icallback) SimpleDrawEPS);
+ IupSetFunction("SimpleDrawSVG", (Icallback) SimpleDrawSVG);
IupSetFunction("SimpleDrawWMF", (Icallback) SimpleDrawWMF);
IupSetFunction("SimpleDrawPrint", (Icallback) SimpleDrawPrint);
IupSetFunction("SimpleDrawPrintDialog", (Icallback) SimpleDrawPrintDialog);
diff --git a/test/simple/simple.c b/test/simple/simple.c
index 82eeb9c..586256d 100644
--- a/test/simple/simple.c
+++ b/test/simple/simple.c
@@ -22,6 +22,7 @@
#include "cdprint.h"
#include "cdps.h"
#include "cdpdf.h"
+#include "cdsvg.h"
#include "cdwmf.h"
#include "cdiup.h"
#include "cddbuf.h"
@@ -303,6 +304,12 @@ int SimpleDrawPS(void)
return 0;
}
+int SimpleDrawSVG(void)
+{
+ DrawCanvasDriver(CD_SVG, "simple.svg");
+ return 0;
+}
+
int SimpleDrawPDF(void)
{
DrawCanvasDriver(CD_PDF, "simple.pdf");
diff --git a/test/simple/simple.h b/test/simple/simple.h
index 123b31c..933b714 100644
--- a/test/simple/simple.h
+++ b/test/simple/simple.h
@@ -25,6 +25,7 @@ int SimpleDrawMetafile(void);
int SimpleDrawPDF(void);
int SimpleDrawPS(void);
int SimpleDrawEPS(void);
+int SimpleDrawSVG(void);
int SimpleDrawWMF(void);
int SimpleDrawPrint(void);
int SimpleDrawPrintDialog(void);
diff --git a/test/simple/simple.led b/test/simple/simple.led
index cdf4430..63f3dc2 100644
--- a/test/simple/simple.led
+++ b/test/simple/simple.led
@@ -19,6 +19,7 @@ mnSaveAs = MENU
ITEM("PDF", SimpleDrawPDF),
ITEM("PS", SimpleDrawPS),
ITEM("EPS", SimpleDrawEPS),
+ ITEM("SVG", SimpleDrawSVG),
ITEM("WMF", SimpleDrawWMF)
)
diff --git a/test/simple/simple_led.c b/test/simple/simple_led.c
index 07eebc8..626b849 100644
--- a/test/simple/simple_led.c
+++ b/test/simple/simple_led.c
@@ -1,4 +1,4 @@
-/* Arquivo gerado automaticamente por ledc 2.5 */
+/* Automatically generated by Iup ledc 2.6 */
#include <stdlib.h>
#include <stdarg.h>
@@ -44,6 +44,7 @@ void simple_loadled (void)
IupItem( "PDF", "SimpleDrawPDF" ),
IupItem( "PS", "SimpleDrawPS" ),
IupItem( "EPS", "SimpleDrawEPS" ),
+ IupItem( "SVG", "SimpleDrawSVG" ),
IupItem( "WMF", "SimpleDrawWMF" ),
NULL), NULL );
named[2] = decl( "mnFile", IupMenu(
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 22:26:27 +0000