viewport = new AlignViewport(al,true,true,true,false);\r
alignPanel = new AlignmentPanel(this, viewport);\r
getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
- fontNameMenuItem.setText(viewport.getFont().getName());\r
- fontSizeMenuItem.setText(viewport.getFont().getSize()+"");\r
\r
addInternalFrameListener(new InternalFrameAdapter()\r
{\r
}\r
});\r
\r
- AlignmentUtil.fetchSequenceFeatures(al, alignPanel);\r
}\r
\r
protected void saveAs_actionPerformed(ActionEvent e)\r
htmlOutput = null;\r
}\r
\r
+ protected void createJPG_actionPerformed(ActionEvent e)\r
+ {\r
+\r
+ int height = (viewport.alignment.getWidth() / viewport.getChunkWidth() +1) * viewport.chunkHeight;\r
+ int width = alignPanel.seqPanel.getWidth() + alignPanel.idPanel.getWidth();\r
+\r
+\r
+ if(!viewport.getWrapAlignment())\r
+ {\r
+ height = viewport.alignment.getHeight() * viewport.charHeight;\r
+ width = alignPanel.idPanel.getWidth() + viewport.alignment.getWidth() * viewport.charWidth;\r
+ }\r
+\r
+ alignPanel.makeJPG( width, height);\r
+ }\r
+\r
+\r
public void printMenuItem_actionPerformed(ActionEvent e)\r
{\r
//Putting in a thread avoids Swing painting problems\r
}catch(Exception ex){}\r
}\r
\r
- ArrayList historyList = new ArrayList();\r
- ArrayList redoList = new ArrayList();\r
+ Stack historyList = new Stack();\r
+ Stack redoList = new Stack();\r
\r
void updateEditMenuBar()\r
{\r
\r
protected void pasteThis_actionPerformed(ActionEvent e)\r
{\r
+ addHistoryItem("Paste");\r
paste(false);\r
}\r
\r
\r
protected void delete_actionPerformed(ActionEvent e)\r
{\r
+ addHistoryItem("Delete");\r
if (viewport.getRubberbandGroup() == null)\r
return;\r
\r
SequenceGroup sg = viewport.getRubberbandGroup();\r
for (int i=0;i < sg.sequences.size(); i++)\r
- viewport.getAlignment().deleteSequence(sg.getSequenceAt(i));\r
+ {\r
+ SequenceI seq = sg.getSequenceAt(i);\r
+ int index = viewport.getAlignment().findIndex(seq);\r
+ seq.deleteChars(sg.getStartRes(), sg.getEndRes()+1);\r
\r
+ if(seq.getSequence().length()<1)\r
+ viewport.getAlignment().deleteSequence(seq);\r
+ else\r
+ viewport.getAlignment().getSequences().setElementAt(seq, index);\r
+ }\r
+\r
+ viewport.setRubberbandGroup(null);\r
viewport.alignment.deleteGroup(sg);\r
viewport.resetSeqLimits( alignPanel.seqPanel.seqCanvas.getHeight());\r
if(viewport.getAlignment().getHeight()<1)\r
}\r
\r
\r
-\r
- public void fontNameMenuItem_actionPerformed(ActionEvent e)\r
- {\r
- String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();\r
-\r
-\r
- String selection = JOptionPane.showInternalInputDialog(this,\r
- "Select font",\r
- "Font selection",\r
- JOptionPane.QUESTION_MESSAGE,\r
- null,fonts\r
- ,fontNameMenuItem.getText()).toString();\r
- if(selection!=null)\r
- {\r
- fontNameMenuItem.setText(selection);\r
- SetFont();\r
- }\r
-\r
- }\r
-\r
- public void fontSizeMenuItem_actionPerformed(ActionEvent e)\r
- {\r
- String selection = JOptionPane.showInternalInputDialog(this,\r
- "Select font size",\r
- "Font size",\r
- JOptionPane.QUESTION_MESSAGE,\r
- null, new String[]{"1","2","4","6","8","10","12","14","16","18","20"}\r
- ,fontSizeMenuItem.getText()).toString();\r
- if(selection!=null)\r
- {\r
- fontSizeMenuItem.setText(selection);\r
- SetFont();\r
- }\r
- }\r
-\r
- public void fontStyleMenuItem_actionPerformed(ActionEvent e)\r
+ public void font_actionPerformed(ActionEvent e)\r
{\r
- String selection = JOptionPane.showInternalInputDialog(this,\r
- "Select font style",\r
- "Font style",\r
- JOptionPane.QUESTION_MESSAGE,\r
- null, new String[]{"plain", "bold", "italic"}\r
- ,fontStyleMenuItem.getText()).toString();\r
- if(selection!=null)\r
- {\r
- fontStyleMenuItem.setText(selection);\r
- SetFont();\r
- }\r
-\r
+ JOptionPane op = new JOptionPane();\r
+ JInternalFrame frame = op.createInternalFrame(this, "Change Font");\r
+ FontChooser fc = new FontChooser( alignPanel );\r
+ frame.setClosable(true);\r
+ frame.setContentPane(fc);\r
+ frame.setSize(480, 100);\r
+ frame.setVisible(true);\r
}\r
\r
protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
alignPanel.RefreshPanels();\r
}\r
\r
- void SetFont()\r
- {\r
- int style = java.awt.Font.PLAIN;\r
- if(fontStyleMenuItem.getText().equals("bold"))\r
- style = java.awt.Font.BOLD;\r
- else if(fontStyleMenuItem.getText().equals("italic"))\r
- style = java.awt.Font.ITALIC;\r
-\r
- viewport.setFont(new java.awt.Font(fontNameMenuItem.getText(),\r
- style,\r
- Integer.parseInt(fontSizeMenuItem.getText())));\r
- alignPanel.RefreshPanels();\r
-\r
- }\r
-\r
protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
{\r
viewport.setWrapAlignment( wrapMenuItem.isSelected() );\r
public void sequenceFeatures_actionPerformed(ActionEvent evt)\r
{\r
viewport.showSequenceFeatures(sequenceFeatures.isSelected());\r
+ if(viewport.showSequenceFeatures && !((Alignment)viewport.alignment).featuresAdded)\r
+ {\r
+ AlignmentUtil.fetchSequenceFeatures( viewport.alignment , alignPanel);\r
+ ((Alignment)viewport.alignment).featuresAdded = true;\r
+ }\r
alignPanel.RefreshPanels();\r
}\r
\r
return;\r
}\r
\r
- JInternalFrame frame = new javax.swing.JInternalFrame();\r
TreePanel tp=null;\r
if (viewport.getSelection() != null && viewport.getSelection().size() > 3)\r
{\r
tp = new TreePanel(viewport, viewport.getSelection().asVector(),type, pwType,\r
- viewport.getStartRes(), viewport.getEndRes());\r
+ 0, viewport.alignment.getWidth());\r
}\r
else\r
{\r
tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
- type, pwType, viewport.getStartRes(),\r
- viewport.getEndRes());\r
+ type, pwType, 0, viewport.alignment.getWidth());\r
}\r
\r
- frame.setContentPane(tp);\r
- Desktop.addInternalFrame(frame, title, 600, 500);\r
+ Desktop.addInternalFrame(tp, title, 600, 500);\r
}\r
\r
\r
image = new Image[9];\r
for(int i=0; i<9; i++)\r
{\r
- java.net.URL url = getClass().getResource("/dna" + (i+1) + ".gif");\r
+ java.net.URL url = getClass().getResource("/images/dna" + (i+1) + ".gif");\r
if (url != null)\r
{\r
image[i] = java.awt.Toolkit.getDefaultToolkit().createImage(url);\r
git://source.jalview.org / jalview.git / blobdiff