selection removed, now SelectionGroup does same job as id select and residue select

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 464ec59..efa283c 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -12,6 +12,7 @@ package jalview.gui;
 import jalview.gui.*;\r
 import jalview.io.*;\r
 import jalview.datamodel.*;\r
+import jalview.schemes.*;\r
 import javax.swing.*;\r
 import java.awt.*;\r
 import java.awt.event.*;\r
@@ -27,7 +28,7 @@ public class Desktop extends jalview.jbgui.GDesktop
   {\r
     Image image =null;\r
     try{\r
-      java.net.URL url = getClass().getResource("/BartonGroupBanner.gif");\r
+      java.net.URL url = getClass().getResource("/images/BartonGroupBanner.gif");\r
       if(url!=null)\r
       {\r
         image = java.awt.Toolkit.getDefaultToolkit().createImage(url);\r
@@ -47,7 +48,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
 \r
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();\r
-    int width = 1200, height = 800;\r
+    int width = 900, height = 650;\r
     if(screenSize.getWidth()<width)\r
       width = screenSize.width;\r
     if(screenSize.getHeight()<height)\r
@@ -124,14 +125,15 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
  public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)\r
  {\r
-   JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);\r
+   JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
+   chooser.setFileView(new JalviewFileView());\r
    chooser.setDialogTitle("Open local file");\r
    chooser.setToolTipText("Open");\r
    int value = chooser.showOpenDialog(this);\r
    if(value == JFileChooser.APPROVE_OPTION)\r
    {\r
      String choice =  chooser.getSelectedFile().getPath();\r
-     jalview.bin.Cache.LAST_DIRECTORY = choice;\r
+     jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);\r
      String format = IdentifyFile.Identify(choice, "File");\r
      LoadFile(choice, "File", format);\r
    }\r
@@ -261,4 +263,86 @@ public class Desktop extends jalview.jbgui.GDesktop
    }\r
  }\r
 \r
+ static JInternalFrame conservationSlider;\r
+ static JInternalFrame PIDSlider;\r
+ public static int setConservationSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)\r
+ {\r
+   SliderPanel sp = null;\r
+\r
+   if(conservationSlider == null)\r
+   {\r
+     sp = new SliderPanel(ap, 30, true, cs);\r
+     conservationSlider = new JInternalFrame();\r
+     conservationSlider.setContentPane(sp);\r
+     conservationSlider.setResizable(false);\r
+     addInternalFrame(conservationSlider, "Conservation Colour Increment  ("+source+")", 420, 90);\r
+     conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()\r
+                  {\r
+                    public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)\r
+                    {\r
+                      conservationSlider = null;\r
+                    }\r
+                  });\r
+   }\r
+   else\r
+   {\r
+       conservationSlider.setTitle("Conservation Colour Increment  ("+source+")");\r
+       sp = (SliderPanel)conservationSlider.getContentPane();\r
+       sp.cs = cs;\r
+   }\r
+\r
+   if(ap.av.alignment.getGroups()!=null)\r
+     sp.setAllGroupsCheckEnabled( true );\r
+   else\r
+     sp.setAllGroupsCheckEnabled( false);\r
+\r
+   return sp.getValue();\r
+\r
+ }\r
+\r
+ public static void hideConservationSlider()\r
+ {\r
+  try{\r
+    conservationSlider.setClosed(true);\r
+    conservationSlider = null;\r
+  }catch(Exception ex){}\r
+}\r
+\r
+\r
+ public static void hidePIDSlider()\r
+ {\r
+   try{\r
+     PIDSlider.setClosed(true);\r
+     PIDSlider = null;\r
+   }catch(Exception ex){}\r
+ }\r
+\r
+ public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)\r
+ {\r
+   SliderPanel pid = null;\r
+   if(PIDSlider == null)\r
+   {\r
+     pid = new SliderPanel(ap, 50, false, cs);\r
+     PIDSlider = new JInternalFrame();\r
+     PIDSlider.setContentPane(pid);\r
+     PIDSlider.setResizable(false);\r
+     addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90);\r
+   }\r
+   else\r
+   {\r
+       PIDSlider.setTitle("Percentage Identity Threshold ("+source+")");\r
+       pid = (SliderPanel)PIDSlider.getContentPane();\r
+       pid.cs = cs;\r
+   }\r
+\r
+   if (ap.av.alignment.getGroups() != null)\r
+     pid.setAllGroupsCheckEnabled(true);\r
+   else\r
+     pid.setAllGroupsCheckEnabled(false);\r
+\r
+\r
+   return pid.getValue();\r
+\r
+ }\r
+\r
 }\r