]> granicus.if.org Git - graphviz/commitdiff
gvedit temporary file fix , smyrna patches for complex polygons,fontconfig fix during...
authorarif <devnull@localhost>
Mon, 1 Feb 2010 19:19:53 +0000 (19:19 +0000)
committerarif <devnull@localhost>
Mon, 1 Feb 2010 19:19:53 +0000 (19:19 +0000)
17 files changed:
graphviz.sln
lib/glcomp/glcomplabel.c
lib/graph/graph.def
lib/graph/graph.h
windows/cmd/fc-fix/fc-fix.cpp
windows/cmd/fc-fix/fc-fix.vcproj
windows/cmd/gvedit/GVedit.exe [deleted file]
windows/cmd/gvedit/GVedit.html [deleted file]
windows/gvedit/GraphX.bpr
windows/gvedit/UEditor.h
windows/gvedit/UPreProcess.cpp
windows/gvedit/USettings.cpp
windows/gvedit/USettings.dfm
windows/gvedit/USettings.h
windows/gvedit/Umain.cpp
windows/gvedit/Umain.dfm
windows/gvedit/props.txt [new file with mode: 0644]

index 1d9c194981275f4d5adf3627f9cef2890f768848..9c235c7499be3e8778424a1dfab6da4555e2ac4f 100644 (file)
@@ -216,6 +216,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "lib\gvpr\gvprlib
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_visio", "plugin\visio\gvplugin_visio.vcproj", "{213561C9-8E82-4156-8F8F-2300CC46CA16}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotgen2", "lib\dotgen2\dotgen2.vcproj", "{6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig_fix", "windows\cmd\fc-fix\fc-fix.vcproj", "{0DEA6915-263C-4570-B25C-E0A449894D45}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapp", "cmd\test\testapp\testapp.vcproj", "{89B96246-FDE7-4780-98DD-261523BEBC48}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -355,7 +361,6 @@ Global
                {2EF2B285-6C4F-4707-A584-FF76727C4775}.Release|Win32.ActiveCfg = Release|Win32
                {2EF2B285-6C4F-4707-A584-FF76727C4775}.Release|Win32.Build.0 = Release|Win32
                {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Debug|Win32.ActiveCfg = Debug|Win32
-               {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Debug|Win32.Build.0 = Debug|Win32
                {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Release|Win32.ActiveCfg = Release|Win32
                {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Release|Win32.Build.0 = Release|Win32
                {A37FB355-3178-4008-8E11-E7E21AE660DA}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -422,7 +427,6 @@ Global
                {86DDD3C7-E71D-49FC-9137-E2514607721E}.Release|Win32.ActiveCfg = Release|Win32
                {86DDD3C7-E71D-49FC-9137-E2514607721E}.Release|Win32.Build.0 = Release|Win32
                {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.ActiveCfg = Debug|Win32
-               {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.Build.0 = Debug|Win32
                {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.ActiveCfg = Release|Win32
                {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.Build.0 = Release|Win32
                {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -457,6 +461,18 @@ Global
                {213561C9-8E82-4156-8F8F-2300CC46CA16}.Debug|Win32.Build.0 = Debug|Win32
                {213561C9-8E82-4156-8F8F-2300CC46CA16}.Release|Win32.ActiveCfg = Release|Win32
                {213561C9-8E82-4156-8F8F-2300CC46CA16}.Release|Win32.Build.0 = Release|Win32
+               {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Debug|Win32.ActiveCfg = Debug|Win32
+               {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Debug|Win32.Build.0 = Debug|Win32
+               {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Release|Win32.ActiveCfg = Release|Win32
+               {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Release|Win32.Build.0 = Release|Win32
+               {0DEA6915-263C-4570-B25C-E0A449894D45}.Debug|Win32.ActiveCfg = Debug|Win32
+               {0DEA6915-263C-4570-B25C-E0A449894D45}.Debug|Win32.Build.0 = Debug|Win32
+               {0DEA6915-263C-4570-B25C-E0A449894D45}.Release|Win32.ActiveCfg = Release|Win32
+               {0DEA6915-263C-4570-B25C-E0A449894D45}.Release|Win32.Build.0 = Release|Win32
+               {89B96246-FDE7-4780-98DD-261523BEBC48}.Debug|Win32.ActiveCfg = Debug|Win32
+               {89B96246-FDE7-4780-98DD-261523BEBC48}.Debug|Win32.Build.0 = Debug|Win32
+               {89B96246-FDE7-4780-98DD-261523BEBC48}.Release|Win32.ActiveCfg = Release|Win32
+               {89B96246-FDE7-4780-98DD-261523BEBC48}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index baa52f42b5c42f9c3eeff788c0b0841be33f4c45..fa1d8401287ab6f74076565ce384b415ed4b75c4 100644 (file)
@@ -64,6 +64,9 @@ static void update_font(glCompLabel * p,char* text,char* desc,int fs)
 {
 
     glCompFont* temp=p->common.font;
+    if (strlen(text) >512)
+       return ;
+
     p->common.font=new_font(p->common.compset,text,&p->common.color,temp->type,desc,fs,temp->is2D);
     if(temp)
        delete_font(temp);
index 850eda412f150e0f0766e91eaa85cb471bd98d9b..5cdc170c045c4fb4b441a4676364530709c53522 100644 (file)
@@ -114,3 +114,4 @@ TrieTransTbl
 agsetiodisc
 agputc
 agputs
+testDLL
index eafdec4c0c03401f1a6441ab4d1262ab8db28e12..0d6e0a7c6e0496fe9b37ff955c5a0cf675b7abb3 100644 (file)
@@ -134,18 +134,21 @@ extern "C" {
 #define extern  __IMPORT__
 #endif
 #endif
-
 /*visual studio*/
 #ifdef WIN32_DLL
 #ifndef GRAPH_EXPORTS
 #define extern __declspec(dllimport)
+#else
+#define extern __declspec(dllexport)
 #endif
+
 #endif
 /*end visual studio*/
+    extern int testDLL(char* data);
     extern char *agstrcanon(char *, char *);
     extern char *agcanonical(char *);
     extern char *agcanon(char *);
-    extern int aghtmlstr(char *s);
+//    extern int aghtmlstr(char *s);
     extern char *agget(void *, char *);
     extern char *agxget(void *, int);
     extern int agset(void *, char *, char *);
@@ -218,7 +221,7 @@ extern "C" {
     extern void agwarningf(char *fmt, ...);
 
     extern char *agstrdup(char *);
-    extern char *agstrdup_html(char *s);
+//    extern char *agstrdup_html(char *s);
     extern void agstrfree(char *);
 
     typedef enum { AGNODE = 1, AGEDGE, AGGRAPH } agobjkind_t;
index f876f43dcee5e784ecb695235212788c5fb1df8c..9c9b0174737f3f242ff749a647ab0751c52b1a80 100644 (file)
Binary files a/windows/cmd/fc-fix/fc-fix.cpp and b/windows/cmd/fc-fix/fc-fix.cpp differ
index b537152875061e64842eb87ab63c20fe9095afcc..726118fc5dcba759fee865adac8f878aade8b605 100644 (file)
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="fc-fix"
+       Name="fontconfig_fix"
        ProjectGUID="{0DEA6915-263C-4570-B25C-E0A449894D45}"
        RootNamespace="fc-fix"
        Keyword="Win32Proj"
@@ -19,7 +19,8 @@
                        Name="Debug|Win32"
                        OutputDirectory="Debug"
                        IntermediateDirectory="Debug"
-                       ConfigurationType="1"
+                       ConfigurationType="2"
+                       CharacterSet="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -39,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_DLL;FC_FIX_LIB"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="msi.lib"
+                               OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
+                               AdditionalLibraryDirectories="C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Lib"
+                               IgnoreDefaultLibraryNames=""
+                               ModuleDefinitionFile=""
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
@@ -93,7 +99,7 @@
                        Name="Release|Win32"
                        OutputDirectory="Release"
                        IntermediateDirectory="Release"
-                       ConfigurationType="1"
+                       ConfigurationType="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_DLL;FC_FIX_LIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
+                               AdditionalDependencies="Msi.lib"
+                               OutputFile="y:/$(ProjectName).dll"
                                LinkIncremental="2"
+                               AdditionalLibraryDirectories="C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Lib"
+                               ModuleDefinitionFile=""
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"
diff --git a/windows/cmd/gvedit/GVedit.exe b/windows/cmd/gvedit/GVedit.exe
deleted file mode 100755 (executable)
index a78d8e3..0000000
Binary files a/windows/cmd/gvedit/GVedit.exe and /dev/null differ
diff --git a/windows/cmd/gvedit/GVedit.html b/windows/cmd/gvedit/GVedit.html
deleted file mode 100644 (file)
index 696ee92..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=Generator content="Microsoft Word 11 (filtered)">
-<title>GVedit Help</title>
-<style>
-<!--
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-       {margin:0in;
-       margin-bottom:.0001pt;
-       font-size:12.0pt;
-       font-family:"Times New Roman";}
-@page Section1
-       {size:8.5in 11.0in;
-       margin:1.0in 1.25in 1.0in 1.25in;}
-div.Section1
-       {page:Section1;}
--->
-</style>
-
-</head>
-
-<body lang=EN-US>
-
-<div class=Section1>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u>Introduction</u></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'>GVedit<span style='color:black'> is a
-Graphviz tool for creating, viewing, editing and processing DOT files. It
-allows users to set attributes of graphs with dialogue boxes and save them
-for future use. GVedit users can also take advantage of the simple 
-instant previewing feature of the program.</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'>Menu system</span></u></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>GVedit's main menu bar
-provides basic file options such as <b>Open</b>, <b>Save</b>, <b>Save As</b> and simple editing
-operations such as <b>Cut</b>, <b>Copy</b> and <b>Paste</b>. Most of the common commands
-also have standard keyboard shortcuts.
-Below you will find a list of the menu items and brief information on
-each of them.</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-<p class=MsoNormal><b><span style='color:black'>File:</span></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>New: Creates a blank text
-window. You can use it to write a description of a graph in the DOT language.
-New graphs are not saved to disk until you save them manually.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Open: Opens a file
-dialogue box to select and load a DOT file into the editor. Each file is opened in a
-new window and does not affect other open graphs.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Save: Saves the active
-graph to disk. If the active graph is new and does not have a name, 
-it opens a <b>Save As</b> dialogue to allow you
-to specify the file's name before saving.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Save as: Opens a <b>Save As</b>
-dialogue to save the active graph. You can save a graph under different names but
-you will always be working with the most recently saved graph.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-Close: Closes the active graph window. If there are any unsaved changes,
-you get a dialogue box asking if you want to
-save the changes before closing the graph.</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal><b><span style='color:black'>Edit:</span></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Undo : This command
-rolls back the last thing that you have done within the active graph. </span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Cut : Removes selected
-text and keeps it in the clipboard. </span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Copy: Copies selected
-text to the clipboard. </span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-Paste: Inserts the text from the clipboard into the cursor position on the 
-active graph.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Find: Opens the find
-dialogue box to allow you to locate desired text in a graph.</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-<p class=MsoNormal><b><span style='color:black'>Graphviz</span></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Run: Processes the active
-graph with the last attributes that were used for it. If the active graph has
-never been processed before, it opens the settings window.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Settings: Opens the
-settings window. Details of this window are given below.
-</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-<p class=MsoNormal><b><span style='color:black'>View</span></b></p>
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Cascade:
-Sets the style for handling multiple windows to cascade, in which each
-new window overlaps the previous one.
-</span></p>
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Tile:
-Sets the style for handling multiple windows to tiling, in which the
-open graph windows partition the root window. 
-</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-<p class=MsoNormal><b><span style='color:black'>Help</span></b></p>
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-Help: Opens a manual page describing how to use this program.
-</span></p>
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-Graphviz on net: Opens a browser window on the Graphviz home page.
-</span></p>
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-About GVedit: Provides version information about the program.
-</span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'>Tool bar</span></u></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>Under the menu bar,
-there is a toolbar with five buttons on it. These buttons are nothing but shortcuts
-to some menu items. Each button has a tool tip attached to it to
-indicate its purpose.</span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'><span style='text-decoration:none'>&nbsp;</span></span></u></b></p>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'>Working with multiple graphs; the active graph</span></u></b><span
-style='color:black'>.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-GVedit allows you to have multiple graphs open at the same time. At any
-time, there is a single active graph. 
-Anything you do using either the GVedit menus or the settings window affects the
-active graph. When you go to the settings window, you always see the 
-settings of active graph.
-The settings of each graph are maintained separately.
-</span></p>
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-To make a graph active, click on its window.
-The background of the active graph window is white 
-while all others are gray. 
-</span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'><span style='text-decoration:none'>&nbsp;</span></span></u></b></p>
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'>Settings window</span></u></b></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-With the settings window,
-you can select the layout engine, set the output type and file,
-and set any attributes that are available with the Graphviz release 
-installed on your computer.</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'><b>Layout engine:</b>
-Graphviz provides five different graph layouts. You can select
-the one which best fits your needs. More information about these layouts 
-can be found at the <A HREF="http://www.graphviz.org">Graphviz home page</A>
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'><b>Output file name:</b>
-This field allows you to specify the output file name. 
-You can either type in the name, or use the
-small button by the text box to open a file
-dialogue box.
-This field corresponds to the \96o option of Graphviz. 
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><b><span style='color:black'>Output
-file type:</span></b><span style='color:black'> This drop down list allows 
-you to select the output file type. The output file name's extension is changed
-accordingly.
-This field corresponds to the \96T option of Graphviz. 
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><b><span style='color:black'>Graphviz
-bin folder:</span></b><span style='color:black'>You usually do not need to
-enter anything here. During the Graphviz installation, locations of the Graphviz
-files are stored in the registry and GVedit retrieves it from there. If, 
-for some reason, Graphviz files are not where they are supposed to be 
-and GVedit can not
-find them, you can edit this information manually.
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><b><span style='color:black'>
-Preview Output file:</span></b><span style='color:black'> 
-If this box is checked,
-GVedit creates a low-quality preview of the output and shows it in a 
-separate window. It is a convenient way to preview the results without 
-executing another viewing program.
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><b><span style='color:black'>
-Apply cairo filter:</span></b><span style='color:black'> 
-If this output format is supported by the cairo library, this box becomes
-active. If checked, output will be generated using the cairo library
-rather than the default renderer. 
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><b><span style='color:black'>Attributes:</span></b><span style='color:black'>
-On the lower half of the settings window, you will see two dropdown lists,
-one small text box, and a larger text editing area. GVedit processes the
-contents of the large box as additional, generic graph, node or edge attributes.
-(These correspond to the \96G, \96N, and \96E command-line options of Graphviz.) 
-You can either type directly in the large text box,
-or use the drop down lists to pick
-an allowed scope and one of the common attribute names.
-For details of these attributes, refer to the
-<A HREF="http://www.graphviz.org/doc/info/attrs.html">page of Graphviz attributes.</A>
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-If you specify an attribute using the drop down lists, you need to click on the
-<b>Add</b> button to register the attribute.
-If you do not click on 
-<b>Add</b> button, the attribute that you entered will not be 
-added to the large box, hence will not be processed.
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>As an
-example, assume that we would like to have a graph drawn 
-with a green background.
-First, click on the scope list and select <b>graph</b>; 
-then click on the name list and
-select <b>bgcolor</b>; and then type <tt>green</tt> to the value box. 
-Finally, click on the <b>Add</b> button to send the attribute to large box. 
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-Belowe the <b>Add</b> button is a <b>Help</b> button. Clicking on this
-will open a browser window on the Graphviz page describing the supported
-attributes.
-</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>
-Under the large box, there are 3 small buttons, plus 
-<b>Cancel</b> and <b>OK</b> buttons. The first button is used to
-clear the attributes box; 
-the second one is used to load an existing text file into the attributes box;
-and the last one is used to save the attributes to a text file for later use. 
-The <b>Cancel</b> button closes the window without processing anything; 
-the <b>OK</b> button processes the
-active document file with the settings on the screen and closes the settings
-window. If you check the preview check box, you will see the preview of the
-graph layout on the screen.</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><b><u><span
-style='color:black'>Console window</span></u></b></p>
-
-<p class=MsoNormalstyle='text-indent:.5in'><span style='color:black'>
-At the bottom of the
-main window, there is a console window where you can see the results of your
-actions. This provides a trace of your layout actions, showing the
-Graphviz command corresponding to the active graph's settings. It also
-displays warnings from GVedit, as well as the output of the 
-executed Graphviz programs. 
-By right clicking on the console window, you will get a menu providing some
-additional functions, such as clearing or saving the console logs.</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal style='text-indent:.5in'><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-<p class=MsoNormal><span style='color:black'> </span></p>
-
-<p class=MsoNormal><span style='color:black'>&nbsp;</span></p>
-
-</div>
-
-</body>
-
-</html>
index 260d35701fe46fc530772c420bbfcf3fc64a4d41..467bc709a3435864ff48d06064a819569053ae86 100644 (file)
@@ -104,9 +104,6 @@ ProductName=
 ProductVersion=1.0.0.0
 Comments=
 
-[Excluded Packages]
-c:\program files\borland\cbuilder6\Projects\Bpl\TMSUnicodeDEC6.bpl=TMS Unicode Component Pack
-
 [HistoryLists\hlIncludePath]
 Count=5
 Item0=C:\MyProjects\access;cgraph;C:\Program Files\Borland\CBuilder6\Projects;C:\Projects\ATT\GraphvizEditor;$(BCB)\include;$(BCB)\include\vcl;C:\Projects\ATT\GTK\GTKTest2\lib\cdt
index 7c08940afbafe160b07d802d143699738a8f5caa..f8bae3f017e2efa32a877fbb2374b38628a84997 100644 (file)
@@ -75,6 +75,7 @@ bool TfrmEditor::SwitchToPreview()
         Panel2->Visible=false;
         Timer1->Enabled=true;
         Image1->Picture=NULL;
+        return true;
 }
 
 bool TfrmEditor::ChangeFileName(AnsiString NewFileName,bool newfile)
@@ -103,8 +104,7 @@ bool TfrmEditor::SaveAs()
                 catch(...)
                 {;}
         }
-        else
-                return false;
+        return false;
 
 }
 bool TfrmEditor::Save()
index 9963dba3ee156ca863ef7353e75039ad7e89b86d..3ec073946f7fd92be9a1314bb91e98341a752867 100644 (file)
@@ -19,10 +19,11 @@ __fastcall TfrmPre::TfrmPre(TComponent* Owner)
 {
 }
 //---------------------------------------------------------------------------
+extern AnsiString getIniFile();
 void __fastcall TfrmPre::FormShow(TObject *Sender)
 {
         TIniFile *ini;
-        AnsiString FileName=ExtractFilePath( Application->ExeName)+"Settings.ini" ;
+        AnsiString FileName=getIniFile() ;
         if(FileExists(FileName))
         {
                 ini = new TIniFile(FileName);
index 5e806711a038356ce8cfae3aa34b65fe55589ee8..18327e68d6b1de8e77df31ae77939d2c8855bad5 100644 (file)
@@ -43,10 +43,6 @@ __fastcall TfrmSettings::TfrmSettings(TComponent* Owner)
 int TfrmSettings::Init(bool silent)
 {
 
-        DeleteFile(ExtractFilePath(Application->ExeName)+"__temp.dot");
-        DeleteFile(ExtractFilePath(Application->ExeName)+"__temp2.dot");
-        DeleteFile(ExtractFilePath(Application->ExeName)+"__temp.jpg");
-
         int Engine;
         AnsiString OutputFile;
         int OutputType;
@@ -91,6 +87,7 @@ int TfrmSettings::Init(bool silent)
 
         }
     }
+    return -1;
 }
 
 void __fastcall TfrmSettings::Button6Click(TObject *Sender)
@@ -132,6 +129,28 @@ void __fastcall TfrmSettings::BitBtn2Click(TObject *Sender)
 
 }
 //---------------------------------------------------------------------------
+AnsiString getIniFile()
+{
+        char bf[5012];
+        SHGetSpecialFolderPath(NULL,bf,CSIDL_LOCAL_APPDATA,1);
+        AnsiString rv=AnsiString(bf);
+        rv=rv+"\\Settings.ini";
+        if(!FileExists(rv))/*create content of the ini file as first time*/
+        {
+                TStringList* sl=new TStringList();
+                sl->Add("[Settings]");
+                sl->Add("Layout=0");
+                sl->Add("Output=6");
+                sl->Add("Preview=1");
+                sl->Add("InitialDir1=C:\\");
+                sl->Add("InitialDir2=C:\\");
+                sl->Add("InitialDir3=C:\\");
+                sl->Add("binPath=C:\\Program Files\\Graphviz2.26\\bin\\");
+                sl->Add("init=1");
+                sl->SaveToFile(rv);
+        }
+        return rv;
+}
 
 void __fastcall TfrmSettings::FormCreate(TObject *Sender)
 {
@@ -139,7 +158,7 @@ void __fastcall TfrmSettings::FormCreate(TObject *Sender)
         //load Graphviz bin Folder
 
         AnsiString binPath;
-        AnsiString FileName=ExtractFilePath( Application->ExeName)+"Settings.ini" ;
+        AnsiString FileName=getIniFile();
         TIniFile *ini;
         ini = new TIniFile(FileName);
         preprocflag=false;
@@ -175,36 +194,7 @@ void __fastcall TfrmSettings::FormCreate(TObject *Sender)
                 SD2->InitialDir=ini->ReadString( "Settings", "InitialDir2", "");
                 OD1->InitialDir=ini->ReadString( "Settings", "InitialDir3", "");
         }
-        //fix graphviz fontconfig file
-        AnsiString path= ExtractFilePath(Application->ExeName);
-        path=StringReplace(path,"\\bin","\\etc\\fonts",TReplaceFlags () << rfReplaceAll);
-        path=path+"fonts.conf";
-        if(!ini->ReadBool("Settings","init",false))
-        {
-                if(FileExists(path))
-                {
-
-                               char a[512];
-                       char bf[512];
-                       char fontFolder[512];
-                           LPITEMIDLIST pidl;
-                    if (SHGetSpecialFolderLocation(Handle,CSIDL_FONTS,&pidl) == NOERROR)
-                    {
-                        SHGetPathFromIDList(pidl,fontFolder)  ;
-                        Memo2->Lines->LoadFromFile(path);
-                        Memo2->Text=StringReplace(Memo2->Text,"#WINDOWSFONTDIR#",AnsiString(fontFolder),TReplaceFlags () << rfReplaceAll);
-                        Memo2->Lines->SaveToFile(path);
-                        ini->WriteBool("Settings","init",true);
-                    }
-                }
-        }
         delete ini;
-
-
-
-
-
-
 }
 //---------------------------------------------------------------------------
 
@@ -369,6 +359,7 @@ bool runproc(AnsiString szExeName,AnsiString szCommandLine,AnsiString tempFile,A
                         DeleteFile(tempFile);
                    delete tmpString;
         }
+        return true;
 }
 
 void __fastcall TfrmSettings::Button3Click(TObject *Sender)
@@ -505,7 +496,7 @@ bool preproc()
 
 
         TIniFile *ini;
-        AnsiString FileName=ExtractFilePath( Application->ExeName)+"Settings.ini" ;
+        AnsiString FileName=getIniFile() ;
         preprocflag=false;
         if(FileExists(FileName))
         {
@@ -637,8 +628,9 @@ BOOL CreateChildProcess()
    {
       CloseHandle(piProcInfo.hProcess);
       CloseHandle(piProcInfo.hThread);
-      return bFuncRetn;
    }
+   return bFuncRetn;
+
 }
 
 VOID WriteToPipe(VOID)
index e713172823ab548b6daa403389ad2879b69949fb..ac641e3cfb32f6f5e73f1a53a4de6dad7d2a4a4a 100644 (file)
@@ -100,15 +100,14 @@ object frmSettings: TfrmSettings
       Style = csDropDownList
       Anchors = [akLeft, akTop, akRight]
       ItemHeight = 13
-      ItemIndex = 0
       TabOrder = 0
-      Text = 'dot'
       Items.Strings = (
         'dot'
         'neato'
         'twopi'
         'circo'
-        'fdp')
+        'fdp'
+        'sfdp')
     end
     object Edit1: TEdit
       Left = 111
index cfb00163f000ccb41e1d4a3113bc72c574dcb9e0..c38e53689d3f2f3fbbef29cd3af6a33be4b5ffd7 100644 (file)
@@ -118,7 +118,7 @@ bool TfrmSettings::LoadAttrs(AnsiString Engine,AnsiString Scope)
         }
         ComboBox4->ItemIndex=0;
 
-
+         return true;
 
 }
 bool TfrmSettings::DeleteIniKeys(TComboBox* A)
@@ -142,6 +142,7 @@ bool TfrmSettings::DeleteIniKeys(TComboBox* A)
                 }
                 A->Items->Strings[ind]=data2;
         }
+        return true;
 
 }
 
index d3186b5f56b80cdb576688fd9e866098d1080335..e302471288eb5ab52816210896bce8d1280125c2 100644 (file)
@@ -8,7 +8,6 @@
 #include "Application.h"
 #include "USettings.h"
 #include "UAbout.h"
-#include "cgraph.h"
 #include "UPreProcess.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
index 9f428f3878b13e5f092c8ca4f74c3dd114eefb22..87cfe541cb7a780f9e33c78eae8c6caa06754691 100644 (file)
@@ -1,9 +1,9 @@
 object frmMain: TfrmMain
-  Left = 457
-  Top = 111
+  Left = 283
+  Top = 153
   Width = 1138
   Height = 855
-  Caption = 'GVedit v:0.99 beta'
+  Caption = 'GVedit v:1.01 '
   Color = clGray
   DefaultMonitor = dmPrimary
   Font.Charset = DEFAULT_CHARSET
diff --git a/windows/gvedit/props.txt b/windows/gvedit/props.txt
new file mode 100644 (file)
index 0000000..90c3de8
--- /dev/null
@@ -0,0 +1,97 @@
+"Damping", "0.99", GRAPH, NEATO
+"Epsilon", "", GRAPH, NEATO
+"URL", "", ANY_ELEMENT, ALL_ENGINES
+"arrowhead", "normal", EDGE, ALL_ENGINES
+"arrowsize", "1.0", EDGE, ALL_ENGINES
+"arrowtail", "normal", EDGE, ALL_ENGINES
+"bb", "", GRAPH, ALL_ENGINES
+"bgcolor", "", GRAPH Or CLUSTER, ALL_ENGINES
+"bottomlabel", "", NODE, ALL_ENGINES
+"center", "false", GRAPH, ALL_ENGINES
+"clusterrank", "local", GRAPH, DOT
+"color", "black", EDGE Or NODE Or CLUSTER, ALL_ENGINES
+"comment", "", EDGE Or NODE Or GRAPH, ALL_ENGINES
+"compound", "false", GRAPH, DOT
+"concentrate", "false", GRAPH, DOT
+"constraint", "true", EDGE, DOT
+"decorate", "false", EDGE, ALL_ENGINES
+"dir", "forward", EDGE, ALL_ENGINES
+"distortion", "0.0", NODE, ALL_ENGINES
+"fillcolor", "lightgrey", NODE Or CLUSTER, ALL_ENGINES
+"fixedsize", "false", NODE, ALL_ENGINES
+"fontcolor", "black", EDGE Or NODE Or GRAPH Or CLUSTER, ALL_ENGINES
+"fontname", "Times-Roman", EDGE Or NODE Or GRAPH Or CLUSTER, ALL_ENGINES
+"fontpath", "", GRAPH, ALL_ENGINES
+"fontsize", "14.0", EDGE Or NODE Or GRAPH Or CLUSTER, ALL_ENGINES
+"group", "", NODE, DOT
+"headURL", "", EDGE, ALL_ENGINES
+"headlabel", "", EDGE, ALL_ENGINES
+"headport", "center", EDGE, ALL_ENGINES
+"height", "0.5", NODE, ALL_ENGINES
+"label", "", EDGE Or NODE Or GRAPH Or CLUSTER, ALL_ENGINES
+"labelangle", "-25.0", EDGE, ALL_ENGINES
+"labeldistance", "1.0", EDGE, ALL_ENGINES
+"labelfloat", "false", EDGE, ALL_ENGINES
+"labelfontcolor", "black", EDGE, ALL_ENGINES
+"labelfontname", "Times-Roman", EDGE, ALL_ENGINES
+"labelfontsize", "11.0", EDGE, ALL_ENGINES
+"labeljust", "", ANY_ELEMENT, DOT
+"labelloc", "t", GRAPH Or CLUSTER, DOT
+"layer", "", EDGE Or NODE, ALL_ENGINES
+"layers", "", GRAPH, ALL_ENGINES
+"len", "1.0", EDGE, NEATO
+"lhead", "", EDGE, DOT
+"lp", "", EDGE Or GRAPH Or CLUSTER, ALL_ENGINES
+"ltail", "", EDGE, DOT
+"margin", "", GRAPH, ALL_ENGINES
+"maxiter", "", GRAPH, NEATO
+"mclimit", "1.0", GRAPH, DOT
+"minlen", "1", EDGE, DOT
+"model", "", GRAPH, NEATO
+"nodesep", "0.25", GRAPH, DOT
+"normalize", "false", GRAPH, NEATO
+"nslimit", "", GRAPH, DOT
+"ordering", "", GRAPH, DOT
+"orientation", "0.0", NODE, ALL_ENGINES
+"orientation", "", GRAPH, ALL_ENGINES
+"overlap", "", GRAPH, NEATO
+"pack", "false", GRAPH, NEATO
+"page", "", GRAPH, ALL_ENGINES
+"pagedir", "", GRAPH, ALL_ENGINES
+"pencolor", "black", CLUSTER, ALL_ENGINES
+"peripheries", "0", NODE, ALL_ENGINES
+"pin", "false", NODE, NEATO
+"pos", "", EDGE Or NODE, ALL_ENGINES
+"quantum", "0.0", GRAPH, ALL_ENGINES
+"rank", "", SUBGRAPH, DOT
+"rankdir", "", GRAPH, DOT
+"ranksep", "", GRAPH, ALL_ENGINES
+"ratio", "", GRAPH, ALL_ENGINES
+"rects", "", NODE, ALL_ENGINES
+"regular", "false", NODE, ALL_ENGINES
+"remincross", "false", GRAPH, DOT
+"rotate", "0", GRAPH, ALL_ENGINES
+"samehead", "", EDGE, DOT
+"sametail", "", EDGE, DOT
+"samplepoints", "8", GRAPH, ALL_ENGINES
+"searchsize", "30", GRAPH, DOT
+"sep", "0.01", GRAPH, NEATO
+"shape", "ellipse", NODE, ALL_ENGINES
+"shapefile", "", NODE, ALL_ENGINES
+"showboxes", "0", EDGE Or NODE Or GRAPH, DOT
+"sides", "4", NODE, ALL_ENGINES
+"size", "", GRAPH, ALL_ENGINES
+"skew", "0.0", NODE, ALL_ENGINES
+"splines", "false", GRAPH, NEATO
+"start", "", GRAPH, ALL_ENGINES
+"style", "", EDGE Or NODE, ALL_ENGINES
+"stylesheet", "", GRAPH, ALL_ENGINES
+"tailURL", "", EDGE, ALL_ENGINES
+"taillabel", "", EDGE, ALL_ENGINES
+"tailport", "center", EDGE, ALL_ENGINES
+"toplabel", "", NODE, ALL_ENGINES
+"vertices", "", NODE, ALL_ENGINES
+"voro_margin", "0.05", GRAPH, NEATO
+"weight", "", EDGE, DOT Or NEATO
+"width", "0.75", NODE, ALL_ENGINES
+"z", "0.0", NODE, ALL_ENGINES