From 41632f2f530360cfaa44a87621fb1740d1ac55c8 Mon Sep 17 00:00:00 2001 From: arif Date: Thu, 26 Mar 2009 16:12:17 +0000 Subject: [PATCH] regex code inclusion removed topview node filtering improved --- cmd/smyrna/topview.c | 23 +++--- cmd/smyrna/tvnodes.c | 180 ++++++++++++++++++++++--------------------- graphviz.sln | 85 ++++++++++---------- lib/gvc.vcproj | 6 +- 4 files changed, 151 insertions(+), 143 deletions(-) diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c index 8b2fe0584..773674e50 100755 --- a/cmd/smyrna/topview.c +++ b/cmd/smyrna/topview.c @@ -467,8 +467,10 @@ static void drawtopviewedges(Agraph_t * g) glBegin(GL_LINES); set_topview_options(); - for (ind = 0; ((ind < view->Topview->Edgecount) && view->drawedges);ind++) { - if (((view->Topview->Edges[ind].x1 / view->zoom * -1 > + for (ind = 0; ((ind < view->Topview->Edgecount) && view->drawedges);ind++) + { + + if (((view->Topview->Edges[ind].x1 / view->zoom * -1 > view->clipX1) && (view->Topview->Edges[ind].x1 / view->zoom * -1 < view->clipX2) @@ -487,6 +489,9 @@ static void drawtopviewedges(Agraph_t * g) view->clipY2)) || (view->active_camera >= 0)) { e = &view->Topview->Edges[ind]; + if (!get_color_from_edge(e)) + continue; + //select_topview_edge(e); if (OD_Selected(e->Node1->Node) == 1) { //tail is selected @@ -511,15 +516,13 @@ static void drawtopviewedges(Agraph_t * g) dddy = 0; dddz = 0; } - if (get_color_from_edge(e)) - { - glVertex3f(e->Node1->distorted_x - ddx, + glVertex3f(e->Node1->distorted_x - ddx, e->Node1->distorted_y - ddy, e->Node1->distorted_z - ddz); - glVertex3f(e->Node2->distorted_x - dddx, + glVertex3f(e->Node2->distorted_x - dddx, e->Node2->distorted_y - dddy, - e->Node2->distorted_z - ddz); - } + e->Node2->distorted_z - ddz); + } } glEnd(); @@ -536,8 +539,8 @@ static int drawtopviewlabels(Agraph_t * g) topview_node *v; for (ind = 0; ind < view->Topview->Nodecount; ind++) { v = &view->Topview->Nodes[ind]; - if (!node_visible(v->Node)) - break; + if (!node_visible(v->Node)) + continue; draw_topview_label(v, 1); } return 1; diff --git a/cmd/smyrna/tvnodes.c b/cmd/smyrna/tvnodes.c index d52ad1922..cd2ccfb6d 100755 --- a/cmd/smyrna/tvnodes.c +++ b/cmd/smyrna/tvnodes.c @@ -139,72 +139,64 @@ int validate_node(tv_node * TV_Node) data_attr2 = agget(view->g[view->activeGraph], "DataAttribute2"); - if (TV_Nodes.filtered) { - int valid = 1; - if ((MP_Flag == 1) || (!n)) { - n = tree_from_filter_string(TV_Nodes.filter.filter_string); - MP_Flag = 0; - buf = - agget(view->Topview->Nodes[TV_Node->index].Node, - data_attr1); - if (buf) { - if (strcmp(TV_Nodes.filter.min_data1, buf)) - valid = 0; - } - } - if (data_attr1 && TV_Nodes.filter.max_data1 - && agget(view->Topview->Nodes[TV_Node->index].Node, - data_attr1)) { - if (strcmp - (agget - (view->Topview->Nodes[TV_Node->index].Node, data_attr1), - TV_Nodes.filter.min_data1)) - valid = 0; - } - //string data checks attr2 - if (data_attr2 && TV_Nodes.filter.min_data2 - && agget(view->Topview->Nodes[TV_Node->index].Node, - data_attr2)) { - if (strcmp - (TV_Nodes.filter.min_data2, - agget(view->Topview->Nodes[TV_Node->index].Node, - data_attr2))) - valid = 0; - } - if (data_attr2 && TV_Nodes.filter.max_data2 - && agget(view->Topview->Nodes[TV_Node->index].Node, - data_attr2)) { - - if (strcmp - (agget - (view->Topview->Nodes[TV_Node->index].Node, data_attr2), - TV_Nodes.filter.min_data2)) - valid = 0; - - } - if (strlen(TV_Nodes.filter.filter_string) > 0) - valid = evaluate_expresions(TV_Node, n); - //if show only highlighted - if (TV_Nodes.filter.highlighted >= 0) { - if (OD_Highlighted(view->Topview->Nodes[TV_Node->index].Node) - != TV_Nodes.filter.highlighted) - valid = 0; - } - //if show only visibles - if (TV_Nodes.filter.visible >= 0) { - if (OD_Visible(view->Topview->Nodes[TV_Node->index].Node) - != TV_Nodes.filter.visible) - valid = 0; - } - //if show only selected - if (TV_Nodes.filter.selected >= 0) { - if (OD_Selected(view->Topview->Nodes[TV_Node->index].Node) - != TV_Nodes.filter.selected) - valid = 0; - } - return valid; - } else - return 1; + if (TV_Nodes.filtered) + { + int valid = 1; + if ((MP_Flag == 1) || (!n)) + { + n = tree_from_filter_string(TV_Nodes.filter.filter_string); + MP_Flag = 0; + buf =agget(view->Topview->Nodes[TV_Node->index].Node,data_attr1); + if (buf) + { + if (strcmp(TV_Nodes.filter.min_data1, buf)) + valid = 0; + } + } + if (data_attr1 && strlen(TV_Nodes.filter.max_data1) && agget(view->Topview->Nodes[TV_Node->index].Node,data_attr1)) + { + if (strcmp(agget(view->Topview->Nodes[TV_Node->index].Node, data_attr1), TV_Nodes.filter.min_data1)) + valid = 0; + } + //string data checks attr2 + if (data_attr2 && strlen(TV_Nodes.filter.min_data2) && agget(view->Topview->Nodes[TV_Node->index].Node,data_attr2)) + { + if (strcmp(TV_Nodes.filter.min_data2,agget(view->Topview->Nodes[TV_Node->index].Node,data_attr2))) + valid = 0; + } + if (data_attr2 && strlen(TV_Nodes.filter.max_data2) + && agget(view->Topview->Nodes[TV_Node->index].Node, + data_attr2)) + { + + if (strcmp(agget(view->Topview->Nodes[TV_Node->index].Node, data_attr2),TV_Nodes.filter.min_data2)) + valid = 0; + + } + if (strlen(TV_Nodes.filter.filter_string) > 0) + valid = evaluate_expresions(TV_Node, n); + //if show only highlighted + if (TV_Nodes.filter.highlighted >= 0) + { + if (OD_Highlighted(view->Topview->Nodes[TV_Node->index].Node)!= TV_Nodes.filter.highlighted) + valid = 0; + } + //if show only visibles + if (TV_Nodes.filter.visible >= 0) + { + if (OD_Visible(view->Topview->Nodes[TV_Node->index].Node)!= TV_Nodes.filter.visible) + valid = 0; + } + //if show only selected + if (TV_Nodes.filter.selected >= 0) + { + if (OD_Selected(view->Topview->Nodes[TV_Node->index].Node)!= TV_Nodes.filter.selected) + valid = 0; + } + return valid; + } + else + return 1; } static int update_node_gui_objects(tv_node * TV_Node) @@ -502,18 +494,22 @@ int prepare_page_history(void) TV_Nodes.activepage = -1; reset_page_History(); push_to_page_history(0); - for (i = 0; i < view->Topview->Nodecount; i++) { - tvn.index = i; - if (validate_node(&tvn)) { - count++; - view->Topview->Nodes[i].valid = 1; - } else - view->Topview->Nodes[i].valid = 0; - if (count == TV_Nodes.recordperpage) { - push_to_page_history(i + 1); - TV_Nodes.pagecount++; - count = 0; - } + for (i = 0; i < view->Topview->Nodecount; i++) + { + tvn.index = i; + if (validate_node(&tvn)) + { + count++; + view->Topview->Nodes[i].valid = 1; + } + else + view->Topview->Nodes[i].valid = 0; + if (count == TV_Nodes.recordperpage) + { + push_to_page_history(i + 1); + TV_Nodes.pagecount++; + count = 0; + } } spn = (GtkSpinButton *) glade_xml_get_widget(xml, "spnTVGotopage"); gtk_spin_button_set_value(spn, 0); @@ -685,6 +681,12 @@ int apply_filter_from_gui(void) } +static cache_validate_node(tv_node* tvn) +{ + + return view->Topview->Nodes[tvn->index].valid; +} + int tv_select_all(void) { @@ -692,7 +694,7 @@ int tv_select_all(void) int i; for (i = 0; i < view->Topview->Nodecount; i++) { tvn.index = i; - if (validate_node(&tvn)) { + if (cache_validate_node(&tvn)) { select_node(view->g[view->activeGraph], view->Topview->Nodes[i].Node); } @@ -709,7 +711,7 @@ int tv_unselect_all() int i; for (i = 0; i < view->Topview->Nodecount; i++) { tvn.index = i; - if (validate_node(&tvn)) { + if (cache_validate_node(&tvn)) { deselect_node(view->g[view->activeGraph], view->Topview->Nodes[i].Node); } @@ -723,11 +725,13 @@ int tv_highligh_all(void) { tv_node tvn; int i; - for (i = 0; i < view->Topview->Nodecount; i++) { - tvn.index = i; - if (validate_node(&tvn)) { - OD_Highlighted(view->Topview->Nodes[i].Node) = 1; - } + for (i = 0; i < view->Topview->Nodecount; i++) + { + tvn.index = i; + if (cache_validate_node(&tvn)) + { + OD_Highlighted(view->Topview->Nodes[i].Node) = 1; + } } apply_filter_from_gui(); return 1; @@ -741,7 +745,7 @@ int tv_unhighligh_all(void) int i; for (i = 0; i < view->Topview->Nodecount; i++) { tvn.index = i; - if (validate_node(&tvn)) { + if (cache_validate_node(&tvn)) { OD_Highlighted(view->Topview->Nodes[i].Node) = 0; } } @@ -756,7 +760,7 @@ int tv_show_all(void) int i; for (i = 0; i < view->Topview->Nodecount; i++) { tvn.index = i; - if (validate_node(&tvn)) { + if (cache_validate_node(&tvn)) { OD_Visible(view->Topview->Nodes[i].Node) = 1; } } @@ -773,7 +777,7 @@ int tv_hide_all(void) int i; for (i = 0; i < view->Topview->Nodecount; i++) { tvn.index = i; - if (validate_node(&tvn)) { + if (cache_validate_node(&tvn)) { OD_Visible(view->Topview->Nodes[i].Node) = 0; } } diff --git a/graphviz.sln b/graphviz.sln index fc61bbff7..519851e14 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -10,11 +10,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdt", "lib\cdt\cdt.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvc", "lib\gvc.vcproj", "{15229511-9F6C-48A5-9194-660CA6492563}" ProjectSection(ProjectDependencies) = postProject - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} - {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} - {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} + {1DE8628B-271E-49B3-A9B7-A53519E1CA65} = {1DE8628B-271E-49B3-A9B7-A53519E1CA65} {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} + {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph", "lib\graph\graph.vcproj", "{A8018B47-1FB9-4966-A02C-1F64D65C33C9}" @@ -26,54 +27,54 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgraph", "lib\cgraph\cgraph EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_core", "plugin\core\gvplugin_core.vcproj", "{AE706502-3203-4815-BF50-4D73BF96BA58}" ProjectSection(ProjectDependencies) = postProject - {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} - {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} - {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} - {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} - {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} - {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} - {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} - {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} - {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} + {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} + {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} + {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} + {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} + {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} + {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} + {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_dot_layout", "plugin\dot_layout\gvplugin_dot_layout.vcproj", "{189E64E3-8A67-4477-8B18-3B174C03F6B9}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot", "cmd\dot\dot.vcproj", "{A334BA89-79FC-40E4-8D42-4852ECD2505B}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} - {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} - {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} - {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} - {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} - {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} - {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} - {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} - {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} - {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} - {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} - {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} - {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} = {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} - {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} - {189E64E3-8A67-4477-8B18-3B174C03F6B9} = {189E64E3-8A67-4477-8B18-3B174C03F6B9} - {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} {42C526F9-36E5-4B20-92CA-265C90058651} = {42C526F9-36E5-4B20-92CA-265C90058651} + {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {189E64E3-8A67-4477-8B18-3B174C03F6B9} = {189E64E3-8A67-4477-8B18-3B174C03F6B9} + {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} + {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} = {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} + {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} + {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} + {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} + {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} + {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} + {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} + {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} + {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection 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 - {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} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patchwork", "lib\patchwork\gvpatchwork.vcproj", "{6BD77BDE-151D-4824-A8BC-9F067662F7AB}" @@ -95,8 +96,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_pango", "plugin\pa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gd", "plugin\gd\gvplugin_gd.vcproj", "{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "lib\gd\gd.vcproj", "{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}" @@ -113,10 +114,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpsc", "lib\vpsc\vpsc.vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpr", "cmd\gvpr\gvpr.vcproj", "{397C6B2C-B305-4CB2-B8CE-2366B508AB7C}" ProjectSection(ProjectDependencies) = postProject - {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} - {5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52} - {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} = {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} + {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} + {5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52} + {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ingraphs", "lib\ingraphs\ingraphs.vcproj", "{D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}" @@ -173,9 +174,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdot", "lib\xdot\xdot.vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smyrna", "cmd\smyrna\smyrna.vcproj", "{13145C00-3694-4342-AFBE-4FAA7E1086BC}" ProjectSection(ProjectDependencies) = postProject - {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} - {86DDD3C7-E71D-49FC-9137-E2514607721E} = {86DDD3C7-E71D-49FC-9137-E2514607721E} {CCEF85C9-BC40-4C26-8755-581276C8B7DA} = {CCEF85C9-BC40-4C26-8755-581276C8B7DA} + {86DDD3C7-E71D-49FC-9137-E2514607721E} = {86DDD3C7-E71D-49FC-9137-E2514607721E} + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topfish", "lib\topfish\topfish.vcproj", "{3CD86498-8B4C-4018-A9BF-F9E008F376DD}" diff --git a/lib/gvc.vcproj b/lib/gvc.vcproj index d0b148905..8cfde8b9d 100644 --- a/lib/gvc.vcproj +++ b/lib/gvc.vcproj @@ -39,7 +39,7 @@