X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=1b9ee91b32cc2e83fe402eec5cc102a7b458918b;hb=e7ed63f1ea56432246a6ed1553f0fe56d26f56ea;hp=c1a710508c5e432e088c227d37101a6206167db7;hpb=ac07859006686a2c62bcf57b24742eb610bc46f0;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index c1a7105..1b9ee91 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -247,8 +247,7 @@ public class AlignFrame extends GAlignFrame viewport.setAlignment( new Alignment(seq) ); updateEditMenuBar(); viewport.updateConsensus(); - alignPanel.RefreshPanels(); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void moveSelectedSequences(boolean up) @@ -290,7 +289,7 @@ public class AlignFrame extends GAlignFrame } } - alignPanel.RefreshPanels(); + alignPanel.repaint(); } @@ -365,7 +364,7 @@ public class AlignFrame extends GAlignFrame viewport.alignment.getWidth(); viewport.updateConservation(); viewport.updateConsensus(); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } }catch(Exception ex){}// could be anything being pasted in here @@ -408,7 +407,7 @@ public class AlignFrame extends GAlignFrame }catch(Exception ex){} viewport.updateConservation(); viewport.updateConsensus(); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } @@ -421,8 +420,8 @@ public class AlignFrame extends GAlignFrame viewport.setAlignment( new Alignment(seq) ); updateEditMenuBar(); viewport.updateConsensus(); - alignPanel.RefreshPanels(); - alignPanel.RefreshPanels(); + alignPanel.repaint(); + alignPanel.repaint(); } @@ -431,7 +430,7 @@ public class AlignFrame extends GAlignFrame viewport.alignment.deleteAllGroups(); viewport.setSelectionGroup(null); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } @@ -489,7 +488,7 @@ public class AlignFrame extends GAlignFrame viewport.alignment.deleteGroup(sg); } - alignPanel.RefreshPanels(); + alignPanel.repaint(); } } @@ -514,7 +513,7 @@ public class AlignFrame extends GAlignFrame - alignPanel.RefreshPanels(); + alignPanel.repaint(); } } @@ -525,7 +524,7 @@ public class AlignFrame extends GAlignFrame viewport.getAlignment().removeGaps(); viewport.updateConservation(); viewport.updateConsensus(); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void removeAllGapsMenuItem_actionPerformed(ActionEvent e) @@ -547,7 +546,7 @@ public class AlignFrame extends GAlignFrame } viewport.updateConservation(); viewport.updateConsensus(); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void setGapCharMenuItem_actionPerformed(ActionEvent e) @@ -561,7 +560,7 @@ public class AlignFrame extends GAlignFrame } setGapCharMenuItem.setText("Set gap character to \""+nextChar+"\""); viewport.setGapCharacter(thisChar); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void findMenuItem_actionPerformed(ActionEvent e) @@ -580,7 +579,10 @@ public class AlignFrame extends GAlignFrame JInternalFrame frame = new JInternalFrame(); FontChooser fc = new FontChooser( alignPanel, frame ); frame.setContentPane(fc); - Desktop.addInternalFrame(frame, "Change Font", 480,100); + Desktop.addInternalFrame(frame, "Change Font", 480,100, false); + frame.setLayer(JLayeredPane.PALETTE_LAYER); + if(alignPanel.getOverviewPanel()!=null) + alignPanel.getOverviewPanel().updateOverviewImage(); } protected void fullSeqId_actionPerformed(ActionEvent e) @@ -588,13 +590,13 @@ public class AlignFrame extends GAlignFrame viewport.setShowFullId( fullSeqId.isSelected() ); alignPanel.idPanel.idCanvas.setPreferredSize( alignPanel.calculateIdWidth() ); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } protected void colourTextMenuItem_actionPerformed(ActionEvent e) { viewport.setColourText( colourTextMenuItem.isSelected() ); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } protected void wrapMenuItem_actionPerformed(ActionEvent e) @@ -604,7 +606,7 @@ public class AlignFrame extends GAlignFrame scaleAbove.setVisible( wrapMenuItem.isSelected() ); scaleLeft.setVisible( wrapMenuItem.isSelected() ); scaleRight.setVisible( wrapMenuItem.isSelected() ); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } protected void scaleAbove_actionPerformed(ActionEvent e) @@ -630,20 +632,20 @@ public class AlignFrame extends GAlignFrame public void viewBoxesMenuItem_actionPerformed(ActionEvent e) { viewport.setShowBoxes( viewBoxesMenuItem.isSelected() ); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void viewTextMenuItem_actionPerformed(ActionEvent e) { viewport.setShowText( viewTextMenuItem.isSelected() ); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } protected void renderGapsMenuItem_actionPerformed(ActionEvent e) { viewport.setRenderGaps(renderGapsMenuItem.isSelected()); - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void sequenceFeatures_actionPerformed(ActionEvent evt) @@ -654,7 +656,7 @@ public class AlignFrame extends GAlignFrame AlignmentUtil.fetchSequenceFeatures( viewport.alignment , alignPanel); ((Alignment)viewport.alignment).featuresAdded = true; } - alignPanel.RefreshPanels(); + alignPanel.repaint(); } public void annotationPanelMenuItem_actionPerformed(ActionEvent e) @@ -674,27 +676,20 @@ public class AlignFrame extends GAlignFrame return; JInternalFrame frame = new JInternalFrame(); - OverviewPanel overview = alignPanel.getOverviewPanel(); - try{ - overview = new OverviewPanel(alignPanel, viewport); + OverviewPanel overview = new OverviewPanel(alignPanel); frame.setContentPane(overview); Desktop.addInternalFrame(frame, "Overview " + this.getTitle(), frame.getWidth(), frame.getHeight()); frame.pack(); + frame.setLayer(JLayeredPane.PALETTE_LAYER); frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() { public void internalFrameClosed(javax.swing.event.InternalFrameEvent evt) { alignPanel.setOverviewPanel(null); }; }); - alignPanel.setOverviewPanel( overview ); - }catch(java.lang.OutOfMemoryError ex) - { - JOptionPane.showInternalMessageDialog(this, "Sequence alignment too large to\nproduce overview image!!" - +"\nTry reducing the font size.", - "Out of memory", JOptionPane.WARNING_MESSAGE); - } + alignPanel.setOverviewPanel( overview ); } @@ -765,109 +760,143 @@ public class AlignFrame extends GAlignFrame void changeColour(ColourSchemeI cs) { + int threshold = 0; - if(viewport.getColourAppliesToAllGroups()) + if ( viewport.getAbovePIDThreshold() ) { - Vector groups = viewport.alignment.getGroups(); - for(int i=0; i0) { // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! SequenceGroup seqs = viewport.getSelectionGroup(); if (seqs.getSize() == 1 || !viewport.alignment.isAligned()) { - JPredClient ct = new JPredClient( (SequenceI) - seqs.getSequenceAt(0)); + JPredClient ct = new JPredClient( (SequenceI)seqs.getSequenceAt(0)); } else { @@ -1230,6 +1188,39 @@ if ( viewport.getConservationSelected() ) } } + protected void msaAlignMenuItem_actionPerformed(ActionEvent e) + { + // TODO:resolve which menu item was actually selected + // Now, check we have enough sequences + if (viewport.getSelectionGroup() != null && viewport.getSelectionGroup().getSize()>1) + { + // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! + SequenceGroup seqs = viewport.getSelectionGroup(); + int sz; + SequenceI[] msa = new SequenceI[sz=seqs.getSize()]; + for (int i = 0; i < sz; i++) + { + msa[i] = (SequenceI) seqs.getSequenceAt(i); + } + + MsaWSClient ct = new jalview.ws.MsaWSClient(msa); + } + else + { + Vector seqs = viewport.getAlignment().getSequences(); + + if (seqs.size() > 1) { + SequenceI[] msa = new SequenceI[seqs.size()]; + for (int i = 0; i < seqs.size(); i++) + { + msa[i] = (SequenceI) seqs.elementAt(i); + } + + MsaWSClient ct = new MsaWSClient(msa); + } + + } + } protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) { // Pick the tree file