Skip to content
Snippets Groups Projects
Commit 8fda9cdf authored by Danny Auble's avatar Danny Auble
Browse files

I think something has changed in the way things are sent to sview since the...

I think something has changed in the way things are sent to sview since the bluegene grid was way off and so were the cpu counts per node.  These are fixed now, but the grid still doesn't color up like it should.
parent 73023171
No related branches found
No related tags found
No related merge requests found
...@@ -699,9 +699,9 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list) ...@@ -699,9 +699,9 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
* instead of laying these out in a nice X fashion * instead of laying these out in a nice X fashion
*/ */
for (x=0; x<DIM_SIZE[X]; x++) { for (x=0; x<DIM_SIZE[X]; x++) {
y_offset = 0; y_offset = (DIM_SIZE[Z] * DIM_SIZE[Y]);
for (y=0; y<DIM_SIZE[Y]; y++) { for (y=0; y<DIM_SIZE[Y]; y++) {
coord_y = y + y_offset; coord_y = y_offset - y;
x_offset = DIM_SIZE[Z] - 1; x_offset = DIM_SIZE[Z] - 1;
for (z=0; z<DIM_SIZE[Z]; z++){ for (z=0; z<DIM_SIZE[Z]; z++){
coord_x = x + x_offset; coord_x = x + x_offset;
...@@ -719,6 +719,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list) ...@@ -719,6 +719,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
grid_button->inx); grid_button->inx);
goto end_it; goto end_it;
} }
grid_button->node_name = xstrdup( grid_button->node_name = xstrdup(
sview_node_info_ptr->node_ptr->name); sview_node_info_ptr->node_ptr->name);
...@@ -743,7 +744,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list) ...@@ -743,7 +744,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
coord_y++; coord_y++;
x_offset--; x_offset--;
} }
y_offset += DIM_SIZE[Z]; y_offset -= DIM_SIZE[Z];
} }
gtk_table_set_row_spacing(table, coord_y-1, 5); gtk_table_set_row_spacing(table, coord_y-1, 5);
} }
......
...@@ -125,7 +125,7 @@ static void _layout_node_record(GtkTreeView *treeview, ...@@ -125,7 +125,7 @@ static void _layout_node_record(GtkTreeView *treeview,
lower); lower);
xfree(lower); xfree(lower);
convert_num_unit((float)node_ptr->cpus, tmp_cnt, UNIT_MEGA); convert_num_unit((float)node_ptr->cpus, tmp_cnt, UNIT_NONE);
add_display_treestore_line(update, treestore, &iter, add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node, find_col_name(display_data_node,
SORTID_CPUS), SORTID_CPUS),
...@@ -399,7 +399,8 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed) ...@@ -399,7 +399,8 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed)
sview_node_info_ptr = xmalloc(sizeof(sview_node_info_t)); sview_node_info_ptr = xmalloc(sizeof(sview_node_info_t));
list_append(info_list, sview_node_info_ptr); list_append(info_list, sview_node_info_ptr);
sview_node_info_ptr->node_ptr = node_ptr; sview_node_info_ptr->node_ptr = node_ptr;
} }
update_color: update_color:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment