Changeset 8339 for branches

Timestamp:

25/01/12 12:10:19 (4 months ago)

Author:

westram

Message:

• display ORF terminals at cursor of MOST RECENT window
  • only a hack to make them work with contexts
  • still buggy: using 2 windows and "ORF term @ cursor" leads to AWAR deadlock

Files:

• branches/e4fix/EDIT4/ED4_ProteinViewer.cxx (modified) (2 diffs)

branches/e4fix/EDIT4/ED4_ProteinViewer.cxx

@@ -370 +370 @@
 
     int dispAtCursor = root->awar(AWAR_PV_CURSOR)->read_int();
-    if (dispAtCursor)
-        {
-            // Display Only Terminals Corresponding To The Cursor Position in the multiple alignment
-            ED4_cursor *cursor = &current_cursor();
-            if (cursor->owner_of_cursor) {
+    if (dispAtCursor) {
+        // only display terminals for species at cursor
+        if (ED4_ROOT->get_most_recently_used_window()) { 
+            ED4_MostRecentWinContext context;
+
+            ED4_cursor& cursor = current_cursor();
+            if (cursor.owner_of_cursor) {
                 // Get The Cursor Terminal And The Corresponding Aa_Sequence Terminals And Set The Display Options
-                ED4_terminal *cursorTerminal = cursor->owner_of_cursor->to_terminal();
+                ED4_terminal *cursorTerminal = cursor.owner_of_cursor->to_terminal();
                 if (!cursorTerminal->parent->parent->flag.is_consensus) {
                     for (int i=0; i<PV_AA_Terminals4Species; i++) {
@@ -391 +393 @@
             }
         }
+    }
 }