rename ExtendedConservedPath for the old fltk code

[mussa.git] / gui / ConnView.cpp

diff --git a/gui/ConnView.cpp b/gui/ConnView.cpp
index b6ba9468a1d5263cb31deb4095433d460c633b53..4c089edf1314365ce5f20e7167cd71824f0e887f 100644 (file)
--- a/gui/ConnView.cpp
+++ b/gui/ConnView.cpp
@@ -125,8 +125,8 @@ ConnView::setup(string name, int sq_num, int win_len,
 void
 ConnView::scale_paths()
 {
-  ExtendedConservedPath a_path;
-  list<ExtendedConservedPath >::iterator pathz_i;
+  ConservedPath a_path;
+  list<ConservedPath >::iterator pathz_i;
   int i2;
 
 
@@ -246,7 +246,7 @@ ConnView::draw()
 void
 ConnView::draw_paths()
 {
-  list<ExtendedConservedPath >::iterator i;
+  list<ConservedPath >::iterator i;
   int i2, i3, y_loc, x_loc, x_start, x_end;
   list<bool>::iterator highlight_i;
   int window_size;
@@ -257,7 +257,7 @@ ConnView::draw_paths()
   highlight.clear();
   for(i = scaled_pathz.begin(); i != scaled_pathz.end(); ++i)
   {
-    ExtendedConservedPath& a_path = *i;
+    ConservedPath& a_path = *i;
     // determine if path falls within the selected region and mark it for
     // highlighted color
     path_start = abs(a_path[ref_seq_num]);
@@ -276,7 +276,7 @@ ConnView::draw_paths()
   highlight_i = highlight.begin();
   for(i = scaled_pathz.begin(); i != scaled_pathz.end(); ++i)
   {
-    ExtendedConservedPath& a_path = *i;
+    ConservedPath& a_path = *i;
     y_loc = y()+y_pad;
 
     window_size = a_path.window_size;
@@ -311,7 +311,7 @@ ConnView::draw_paths()
   highlight_i = highlight.begin();
   for(i = scaled_pathz.begin(); i != scaled_pathz.end(); ++i)
   {
-    ExtendedConservedPath& a_path = *i;
+    ConservedPath& a_path = *i;
     y_loc = y()+y_pad;
 
     // get window size to determine line width
@@ -606,8 +606,8 @@ ConnView::check_new_motifs()
 void
 ConnView::spawnSeq()
 {
-  list<ExtendedConservedPath > selected_paths;
-  list<ExtendedConservedPath >::iterator pathz_i;
+  list<ConservedPath > selected_paths;
+  list<ConservedPath >::iterator pathz_i;
   int i2, i3, y_loc, x_loc, x_start, x_end;
   list<bool>::iterator highlight_i;
   int y_max;