av.showHiddenMarkers check

[jalview.git] / src / jalview / gui / SeqCanvas.java

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index c4de7cd..8623872 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -477,6 +477,35 @@ public class SeqCanvas extends JComponent
                 drawNorthScale(g, startRes, endx, ypos);\r
             }\r
 \r
+            if (av.hasHiddenColumns && av.showHiddenMarkers)\r
+            {\r
+              g.setColor(Color.blue);\r
+              int res;\r
+              for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();\r
+                   i++)\r
+              {\r
+                res = av.getColumnSelection().findHiddenRegionPosition(i) -\r
+                    startRes;\r
+\r
+                if (res < 0 || res > endx - startRes)\r
+                  continue;\r
+\r
+                gg.fillPolygon(new int[]\r
+                               {res * av.charWidth - av.charHeight / 4,\r
+                               res * av.charWidth + av.charHeight / 4,\r
+                               res * av.charWidth},\r
+                               new int[]\r
+                               {\r
+                               ypos - (av.charHeight / 2),\r
+                               ypos - (av.charHeight / 2),\r
+                               ypos - (av.charHeight / 2) + 8\r
+                }, 3);\r
+\r
+              }\r
+            }\r
+\r
+\r
+\r
             // When printing we have an extra clipped region,\r
             // the Printable page which we need to account for here\r
             Shape clip = g.getClip();\r
@@ -568,15 +597,14 @@ public class SeqCanvas extends JComponent
 \r
           draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
 \r
-          g1.setColor(Color.blue);\r
-          g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                      startSeq + offset,\r
-                      (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                      startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
-          g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth,\r
-                      startSeq + offset,\r
-                      (blockEnd - blockStart + 1) * av.charWidth,\r
-                      startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
+          if(av.getShowHiddenMarkers())\r
+          {\r
+            g1.setColor(Color.blue);\r
+            g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
+                        startSeq + offset,\r
+                        (blockEnd - blockStart + 1) * av.charWidth - 1,\r
+                        startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
+          }\r
 \r
           g1.translate( -screenY * av.charWidth, 0);\r
           screenY += blockEnd - blockStart + 1;\r
@@ -588,6 +616,7 @@ public class SeqCanvas extends JComponent
           blockEnd = blockStart + (endRes - startRes) - screenY;\r
           g1.translate(screenY * av.charWidth, 0);\r
           draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
+\r
           g1.translate( -screenY * av.charWidth, 0);\r
         }\r
       }\r