gvpr library is used instead of pipes

now all smyrna attributes can be modified via gvpr scripts

diff --git a/cmd/smyrna/smyrna.vcproj b/cmd/smyrna/smyrna.vcproj
index 62c310790b23c659d1dda3dc13ee2630fa6d9a41..f6ffdbc19089387422964f8e7b3124bc1a700bec 100644 (file)
--- a/cmd/smyrna/smyrna.vcproj
+++ b/cmd/smyrna/smyrna.vcproj
@@ -62,7 +62,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="mspng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib gladeui-1.lib glcomp.lib cgraph.lib gvc.lib xdot.lib topfish.lib ingraphs.lib neatogen.lib gts.lib User32.lib Gdi32.lib shlwapi.lib regex_win32.lib $(NOINHERIT)"
+                               AdditionalDependencies="asprintf.lib ast.lib atk-1.0.lib bz2.lib cairo.lib cdt.lib cgraph.lib charset.lib croco-0.6.lib expat.lib expatw.lib expr.lib fontconfig.lib freetype.lib Gdi32.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glade-2.0.lib gladeui-1.lib glcomp.lib glib-2.0.lib glu32.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib gtk-win32-2.0.lib gts.lib gvc.lib gvprlib.lib hs_regex.lib iconv.lib ingraphs.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib libgtkglext-win32-1.0.dll.a ltdl.lib mspng.lib neatogen.lib opengl32.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib regex_win32.lib rsvg-2.lib sfio.lib shlwapi.lib tiff.lib topfish.lib User32.lib vmalloc.lib xdot.lib xml2.lib zdll.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\glade_setup\lib;&quot;C:\graphviz-ms\bin&quot;;C:\gtk\lib;C:\GnuWin32\lib;&quot;C:\Projects\graphviz2\lib\zlib-1.2.3\lib&quot;;C:\Projects\cairo_build\lib;C:\Projects\ATT\GTK\GTKTest2\lib;C:\GtkGLExt\1.0\lib;C:\GTK\2.0\bin;C:\GTK\2.0\lib"
@@ -137,7 +137,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="mspng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib regex_win32.lib zdll.lib gladeui-1.lib glcomp.lib cgraph.lib gvc.lib xdot.lib topfish.lib ingraphs.lib neatogen.lib gts.lib $(NOINHERIT)"
+                               AdditionalDependencies="asprintf.lib ast.lib atk-1.0.lib bz2.lib cairo.lib cdt.lib cgraph.lib charset.lib croco-0.6.lib expat.lib expatw.lib expr.lib fontconfig.lib freetype.lib Gdi32.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glade-2.0.lib gladeui-1.lib glcomp.lib glib-2.0.lib glu32.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib gtk-win32-2.0.lib gts.lib gvc.lib gvprlib.lib hs_regex.lib iconv.lib ingraphs.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib libgtkglext-win32-1.0.dll.a ltdl.lib mspng.lib neatogen.lib opengl32.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib regex_win32.lib rsvg-2.lib sfio.lib shlwapi.lib tiff.lib topfish.lib User32.lib vmalloc.lib xdot.lib xml2.lib zdll.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\glade_setup\lib;&quot;C:\graphviz-ms\bin&quot;;C:\gtk\lib;C:\GnuWin32\lib;&quot;C:\Projects\graphviz2\lib\zlib-1.2.3\lib&quot;;C:\Projects\cairo_build\lib;C:\Projects\ATT\GTK\GTKTest2\lib;C:\GtkGLExt\1.0\lib;C:\GTK\2.0\bin;C:\GTK\2.0\lib"

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 48d8723caba287f0ecc63e8e9a98a86ebd8e5bc8..ec7e1f0bfee82bc0c4c9e863adce76fc235534fb 100644 (file)
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -289,13 +289,6 @@ typedef struct _graph_data {
     float offsetx;
     float offsety;
     float offsetz;
-
-    topview_node **selectedNodes;
-    topview_edge **selectedEdges;
-
-    int selectedGraphsCount;
-    int selectedNodesCount;
-    int selectedEdgesCount;
 } graph_data;
 
 typedef struct {

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 5fcf0ea1a3e65a38a66679109272e7d7a5c87f35..7f0eaff1806851ce42a19941b49be2e9a40d4bed 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -464,12 +464,8 @@ void init_viewport(ViewInfo * view)
     set_viewport_settings_from_template(view, view->default_attributes);
     view->dfltViewType = VT_NONE;
     view->dfltEngine = GVK_NONE;
-       view->Topview->Graphdata.selectedNodesCount=0;
        view->Topview->Graphdata.GraphFileName=(char*)0;
        view->Topview->Graphdata.Modified=0;
-       view->Topview->Graphdata.selectedEdges=0;
-       view->Topview->Graphdata.selectedEdgesCount=0;
-       view->Topview->Graphdata.selectedNodes=0;
        view->colschms=NULL;
        view->flush=1;
 
@@ -478,48 +474,6 @@ void init_viewport(ViewInfo * view)
 }
 
 
-/* load_graph_params:
- * run once right after loading graph
- */
-static void load_graph_params(Agraph_t * graph)
-{
-       view->Topview->Graphdata.Modified=0;
-       view->Topview->Graphdata.selectedEdges=NULL;
-       view->Topview->Graphdata.selectedNodes=NULL;
-       view->Topview->Graphdata.selectedEdgesCount=0;
-       view->Topview->Graphdata.selectedEdgesCount=0;
-
-
-}
-
-/* attach_object_custom_data_to_graph:
- * run once or to reset all data !! prev data is removed
- */
-#if 0
-static int attach_object_custom_data_to_graph(Agraph_t * graph)
-{
-    Agnode_t *n;
-    Agedge_t *e;
-    Agraph_t *s;
-
-    agbindrec(graph, "custom_graph_data", sizeof(custom_graph_data), FALSE);//graph custom data
-    init_object_custom_data(graph, graph);     //attach to graph itself
-    n = agfstnode(graph);
-
-    for (s = agfstsubg(graph); s; s = agnxtsubg(s))
-       init_object_custom_data(graph, s);      //attach to subgraph 
-
-    for (n = agfstnode(graph); n; n = agnxtnode(graph, n)) {
-       init_object_custom_data(graph, n);      //attach to node
-       for (e = agfstout(graph, n); e; e = agnxtout(graph, e)) {
-           init_object_custom_data(graph, e);  //attach to edge
-       }
-    }
-    return 1;
-
-}
-#endif
-
 /* update_graph_params:
  * adds gledit params
  * assumes custom_graph_data has been attached to the graph.
@@ -614,7 +568,6 @@ static Agraph_t *loadGraph(char *filename)
                fclose (input_file);
                return 0;
     }
-       load_graph_params(g);
        view->Topview->Graphdata.GraphFileName = strdup (filename);
        return g;
 }

diff --git a/graphviz.sln b/graphviz.sln
index e03e39daf170a65885ea5cf50575b6a8ecadd237..507369cf3b85dd36ecadd2d3e1ccc810854c09cd 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -72,10 +72,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot", "cmd\dot\dot.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_neato_layout", "plugin\neato_layout\gvplugin_neato_layout.vcproj", "{92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}"
        ProjectSection(ProjectDependencies) = postProject
-               {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
-               {8E82D6BD-74D0-48C3-887A-1754EA71DA5A} = {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}
                {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
                {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
+               {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
+               {8E82D6BD-74D0-48C3-887A-1754EA71DA5A} = {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patchwork", "lib\patchwork\gvpatchwork.vcproj", "{6BD77BDE-151D-4824-A8BC-9F067662F7AB}"
@@ -197,6 +197,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvtest", "cmd\tester\gvtest
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osage", "lib\osage\osage.vcproj", "{8E82D6BD-74D0-48C3-887A-1754EA71DA5A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "cmd\gvprlib\gvprlib.vcproj", "{1068DA13-0BB3-43A7-8776-6F519003EEBD}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -423,6 +425,10 @@ Global
                {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Debug|Win32.Build.0 = Debug|Win32
                {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Release|Win32.ActiveCfg = Release|Win32
                {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Release|Win32.Build.0 = Release|Win32
+               {1068DA13-0BB3-43A7-8776-6F519003EEBD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {1068DA13-0BB3-43A7-8776-6F519003EEBD}.Debug|Win32.Build.0 = Debug|Win32
+               {1068DA13-0BB3-43A7-8776-6F519003EEBD}.Release|Win32.ActiveCfg = Release|Win32
+               {1068DA13-0BB3-43A7-8776-6F519003EEBD}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/share/gui/smyrna.glade b/share/gui/smyrna.glade
index b23999f31d804edeb7547ae9fe88f2cac904c9b9..29f268a048f5cd80033b3509bdec9b328fc0f70c 100755 (executable)
--- a/share/gui/smyrna.glade
+++ b/share/gui/smyrna.glade
@@ -4590,7 +4590,7 @@ topview</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
+  <property name="destroy_with_parent">True</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -7433,6 +7433,7 @@ Custom</property>
                          <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
                          <property name="focus_on_click">True</property>
+                         <signal name="clicked" handler="on_gvprbuttonsave_clicked" last_modification_time="Mon, 01 Jun 2009 16:23:07 GMT"/>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
@@ -7499,33 +7500,6 @@ Custom</property>
              <property name="type">tab</property>
            </packing>
          </child>
-
-         <child>
-           <placeholder/>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="label115">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">    UI    </property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">tab</property>
-           </packing>
-         </child>
        </widget>
        <packing>
          <property name="padding">0</property>