gvpr check button fuxed

various fixes to node list

diff --git a/cmd/smyrna/gvprpipe.c b/cmd/smyrna/gvprpipe.c
index 41be919b71e305a8da1c4f5d6c77a9af9d2394dc..a084440196dff38d6e3fdf1f195b6f6e537bb423 100644 (file)
--- a/cmd/smyrna/gvprpipe.c
+++ b/cmd/smyrna/gvprpipe.c
@@ -344,7 +344,7 @@ apply_gvpr(Agraph_t* g,char* prog)
     Agraph_t* tempg = exec_gvpr (g, prog);
 #endif
 
-    if ((tempg) &&(gtk_toggle_button_get_active((GtkToggleButton *) glade_xml_get_widget(xml, "GtkCheckButton"))))
+    if ((tempg) &&(gtk_toggle_button_get_active((GtkToggleButton *) glade_xml_get_widget(xml, "gvprapplycb"))))
        {
                add_graph_to_viewport(tempg);
                return 1;

diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 2a6c78ee1bcb704eefc01a4b59ee0f8318e05517..58e571f388ac9daf89f18366faf09f9b9539d012 100755 (executable)
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -203,7 +203,8 @@ void settvcolorinfo(Agraph_t* g,topview* t)
        for (ind=0;ind < t->Nodecount ; ind ++)
        {
                setRGBcolor(&color,agget(t->Nodes[ind].Node, "color"));
-               t->Nodes[ind].Color.R = color.R;t->Nodes[ind].Color.G = color.G;t->Nodes[ind].Color.B = color.B;t->Nodes[ind].Color.A = color.A;t->Edges[ind].Color.tag=color.tag;
+               t->Nodes[ind].Color.R = color.R;t->Nodes[ind].Color.G = color.G;t->Nodes[ind].Color.B = color.B;t->Nodes[ind].Color.A = color.A;t->Nodes[ind].Color.tag=color.tag;
+//             t->Nodes[ind].Color.R = color.R;t->Nodes[ind].Color.G = color.G;t->Nodes[ind].Color.B = 1;t->Nodes[ind].Color.A = color.A;t->Nodes[ind].Color.tag=color.tag;
                /*while in the loop why dont we set some smyrna settings from graph? selected , highlighted , visible */
                t->Nodes[ind].data.Selected=boolAttr("selected",t->Nodes[ind].Node,0);
                t->Nodes[ind].data.Highlighted=boolAttr("highlighted",t->Nodes[ind].Node,0);

diff --git a/cmd/smyrna/tvnodes.c b/cmd/smyrna/tvnodes.c
index 38447bf3c4809bb4c8b728d66e7b58e9a3178878..a28dec688a6f09a81cbc8501e8ff88c72ebe4fca 100755 (executable)
--- a/cmd/smyrna/tvnodes.c
+++ b/cmd/smyrna/tvnodes.c
@@ -341,41 +341,40 @@ int tv_nodes_goto_page(int page)
     tv_node *tvn;
     GtkLabel *lblTVPage;
 
-    if ((page >= 0) && page <= TV_Nodes.pagecount) {
-       if (TV_Nodes.general_purpose_flag == 1) {
-           update_TV_data_from_gui();
-           TV_Nodes.general_purpose_flag = 0;
-       }
-       TV_Nodes.activepage = page;
-       TV_Nodes.page_data_node_index =
-           TV_Nodes.page_history[TV_Nodes.activepage];
-       TV_Nodes.page_data_index = 0;
-       TV_Nodes.firstnodeid = TV_Nodes.page_data_node_index;
-       TV_Nodes.Y = TV_Nodes.initial_Y;
-       hide_data_widgets();
-    } else
-       return 0;
-    while ((TV_Nodes.page_data_index < TV_Nodes.recordperpage)
-          && (TV_Nodes.page_data_node_index < view->Topview->Nodecount)) {
-       tvn = &TV_Nodes.TV_Node[TV_Nodes.page_data_index];
-       tvn->index = TV_Nodes.page_data_node_index;
-       if (view->Topview->Nodes[TV_Nodes.page_data_node_index].valid == 1) {
-           TV_Nodes.page_data_index++;
-           update_node_gui_objects(tvn);
-           TV_Nodes.Y = TV_Nodes.Y + TV_Nodes.Y_Gap;
+    if ((page >= 0) && page <= TV_Nodes.pagecount) 
+       {
+               if (TV_Nodes.general_purpose_flag == 1) 
+               {
+                       update_TV_data_from_gui();
+                       TV_Nodes.general_purpose_flag = 0;
+               }
+               TV_Nodes.activepage = page;
+               TV_Nodes.page_data_node_index =TV_Nodes.page_history[TV_Nodes.activepage];
+               TV_Nodes.page_data_index = 0;
+               TV_Nodes.firstnodeid = TV_Nodes.page_data_node_index;
+               TV_Nodes.Y = TV_Nodes.initial_Y;
+               hide_data_widgets();
+       } 
+       else
+               return 0;
+    while ((TV_Nodes.page_data_index < TV_Nodes.recordperpage)&& (TV_Nodes.page_data_node_index < view->Topview->Nodecount)) 
+       {
+               tvn = &TV_Nodes.TV_Node[TV_Nodes.page_data_index];
+               tvn->index = TV_Nodes.page_data_node_index;
+               if (view->Topview->Nodes[TV_Nodes.page_data_node_index].valid == 1) 
+               {
+                       TV_Nodes.page_data_index++;
+                       update_node_gui_objects(tvn);
+                       TV_Nodes.Y = TV_Nodes.Y + TV_Nodes.Y_Gap;
+               }
+               TV_Nodes.page_data_node_index++;
        }
-       TV_Nodes.page_data_node_index++;
-    }
     lblTVPage = (GtkLabel *) glade_xml_get_widget(xml, "lblTVPage");
     sprintf(buf, "(%i / %i)", TV_Nodes.activepage + 1,
            TV_Nodes.pagecount + 1);
     gtk_label_set_text(lblTVPage, buf);
     spn = (GtkSpinButton *) glade_xml_get_widget(xml, "spnTVGotopage");
     gtk_spin_button_set_value(spn, page + 1);
-
-
-
-
     return 1;
 }
 
@@ -407,7 +406,7 @@ void execute_tv_nodes(void)
     }
     //test filter
     prepare_page_history();
-    TV_Nodes.general_purpose_flag = 1;
+//    TV_Nodes.general_purpose_flag = 1;
     tv_nodes_next_page();
 }
 
@@ -573,44 +572,48 @@ int update_TV_data_from_gui(void)
     data_attr1 = agget(view->g[view->activeGraph], "DataAttribute1");
     data_attr2 = agget(view->g[view->activeGraph], "DataAttribute2");
 
-    for (i = 0; i < TV_Nodes.recordperpage; i++) {
-       index = TV_Nodes.TV_Node[i].index;
-       if (index < view->Topview->Nodecount) {
-           // apply if selected
-           if (gtk_toggle_button_get_active
-               ((GtkToggleButton *) TV_Nodes.TV_Node[i].chkSelected)) {
-                       if (!view->Topview->Nodes[index].data.Selected)
-                   select_node(&view->Topview->Nodes[index]);
-           } else {
-               if (view->Topview->Nodes[index].data.Selected)
-                   deselect_node(&view->Topview->Nodes[index]);
-           }
-           // apply if Visible
-           if (gtk_toggle_button_get_active
-               ((GtkToggleButton *) TV_Nodes.TV_Node[i].chkVisible)) {
-                       if (!view->Topview->Nodes[index].data.Visible)
-                               view->Topview->Nodes[index].data.Visible = 1;
-           } else {
-                       if (view->Topview->Nodes[index].data.Visible)
-                    view->Topview->Nodes[index].data.Visible = 0;
-           }
-           // apply if Highlighted
-           if (gtk_toggle_button_get_active
-               ((GtkToggleButton *) TV_Nodes.TV_Node[i].chkHighlighted)) {
-                       if (!view->Topview->Nodes[index].data.Highlighted)
-                    view->Topview->Nodes[index].data.Highlighted = 1;
-           } else {
-               if (view->Topview->Nodes[index].data.Highlighted)
-                    view->Topview->Nodes[index].data.Highlighted = 0;
-           }
-           //Data1 
-           agset((void *) view->Topview->Nodes[index].Node, data_attr1,
-                 (char *) gtk_entry_get_text(TV_Nodes.TV_Node[i].Data1));
-           //Data2 
-           agset(view->Topview->Nodes[index].Node, data_attr2,
-                 (char *) gtk_entry_get_text(TV_Nodes.TV_Node[i].Data2));
+    for (i = 0; i < TV_Nodes.recordperpage; i++) 
+       {
+               index = TV_Nodes.TV_Node[i].index;
+               if (index < view->Topview->Nodecount) 
+               {
+                       // apply if selected
+                       if (gtk_toggle_button_get_active((GtkToggleButton *) TV_Nodes.TV_Node[i].chkSelected)) 
+                       {
+                               if (!view->Topview->Nodes[index].data.Selected)
+                                       select_node(&view->Topview->Nodes[index]);
+                   }
+                       else 
+                       {
+                               if (view->Topview->Nodes[index].data.Selected)
+                                       deselect_node(&view->Topview->Nodes[index]);
+                   }
+                   // apply if Visible
+                       if (gtk_toggle_button_get_active((GtkToggleButton *) TV_Nodes.TV_Node[i].chkVisible)) 
+                       {
+                               if (!view->Topview->Nodes[index].data.Visible)
+                                       view->Topview->Nodes[index].data.Visible = 1;
+                       }
+                       else 
+                       {
+                               if (view->Topview->Nodes[index].data.Visible)
+                                    view->Topview->Nodes[index].data.Visible = 0;
+                       }
+                       // apply if Highlighted
+                       if (gtk_toggle_button_get_active((GtkToggleButton *) TV_Nodes.TV_Node[i].chkHighlighted)) 
+                       {
+                               if (!view->Topview->Nodes[index].data.Highlighted)
+                                       view->Topview->Nodes[index].data.Highlighted = 1;
+                       } 
+                       else 
+                       {
+                               if (view->Topview->Nodes[index].data.Highlighted)
+                                       view->Topview->Nodes[index].data.Highlighted = 0;
+                       }
+                       agset((void *) view->Topview->Nodes[index].Node, data_attr1,(char *) gtk_entry_get_text(TV_Nodes.TV_Node[i].Data1));
+                       agset(view->Topview->Nodes[index].Node, data_attr2,(char *) gtk_entry_get_text(TV_Nodes.TV_Node[i].Data2));
 
-       }
+               }
     }
     return 1;