define window for showing a mussa alignment

[mussa.git] / gui / SeqWindow.cpp

diff --git a/gui/SeqWindow.cpp b/gui/SeqWindow.cpp
index 46a73b8bfafba932ae5464b34a294ca3af571058..8578f4974e1d2c0fa11e01807bc5cd77342e5a46 100644 (file)
--- a/gui/SeqWindow.cpp
+++ b/gui/SeqWindow.cpp
@@ -48,7 +48,6 @@ SeqWindow::real_show_align_cb(int which_align)
   vector<int> a_path;
   int window_length;
 
-
   cout << "fumish\n";    
   seq_box->toggle_align(which_align);
   seq_box->redraw();
@@ -135,9 +134,9 @@ SeqWindow::SeqWindow(int w, int h, const char* title, int sq_num,
     some_menu_data = new menu_align_data_bundle;
     some_menu_data->swm_ptr = this;
     some_menu_data->which_align = align_number;
-    align_id_ostr << (*align_iter)[0] << ": ";
-    for(i = 1; i <= seq_num; i++)
-      align_id_ostr << (*align_iter)[i] << ", ";
+    align_id_ostr << (*align_iter).window_size << ": ";
+    for(i = 0; i != seq_num; i++)
+      align_id_ostr << (*align_iter).track_indexes[i] << ", ";
     align_id_string = align_id_ostr.str();
     choose_align_menu->add((const char*)align_id_string.c_str(), 0, 
                            (Fl_Callback *) set_align_cb, 
@@ -151,13 +150,6 @@ SeqWindow::SeqWindow(int w, int h, const char* title, int sq_num,
     ++align_iter;
   }
 
-  /*
-  show_align_menu->add("f&ee"); 
-  show_align_menu->add("f&ie"); 
-  show_align_menu->add("f&oe"); 
-  show_align_menu->add("f&um"); 
-  */
-
   Fl_Button *test_but = new Fl_Button(375, 2, 150, 30, "Toggle Motifs");
   test_but->color(FL_WHITE,FL_BLUE);
   test_but->box(FL_BORDER_BOX);
@@ -178,29 +170,3 @@ SeqWindow::SeqWindow(int w, int h, const char* title, int sq_num,
   Fl::visual(FL_DOUBLE|FL_INDEX);
   show();
 }
-
-
-
-/*
-  some_menu_data = new menu_align_data_bundle;
-  some_menu_data->swm_ptr = this;
-  some_menu_data->which_align = 2;
-  choose_align_menu->add("f&ie", FL_ALT+'i', (Fl_Callback *) set_align_cb,
-                  (void*) some_menu_data);
-
-  some_menu_data = new menu_align_data_bundle;
-  some_menu_data->swm_ptr = this;
-  some_menu_data->which_align = 3;
-  choose_align_menu->add("f&oe", FL_ALT+'o', (Fl_Callback *) set_align_cb,
-                  (void*) some_menu_data);
-
-  some_menu_data = new menu_align_data_bundle;
-  some_menu_data->swm_ptr = this;
-  some_menu_data->which_align = 4;
-  choose_align_menu->add("f&um", FL_ALT+'u', (Fl_Callback *) set_align_cb,
-                  (void*) some_menu_data);
-*/
-
-
-
-