From dee777953b0af7aa6e6f9d06140b43fbb39505d5 Mon Sep 17 00:00:00 2001 From: tama3 Date: Wed, 27 Jun 2007 08:58:18 +0000 Subject: [PATCH] update mds graph which graph width and height are always same git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@136 acee48c3-7b26-0410-bdac-b3d0e5314bbc --- .../jp/naist/se/stigmata/ui/swing/mds/LabelMap.java | 2 +- .../naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java | 19 +++++++++++++++++-- .../se/stigmata/ui/swing/mds/MDSGraphViewer.java | 12 ++++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/LabelMap.java b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/LabelMap.java index e165185..df0c8eb 100644 --- a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/LabelMap.java +++ b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/LabelMap.java @@ -43,7 +43,7 @@ public class LabelMap{ public void setGroup(String label, String groupLabel){ groups.put(label, groupLabel); if(gids.get(groupLabel) == null){ - gids.put(groupLabel, groups.size()); + gids.put(groupLabel, gids.size()); } } diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java index f4afc35..be12834 100644 --- a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java +++ b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java @@ -6,8 +6,12 @@ package jp.naist.se.stigmata.ui.swing.mds; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; import java.net.URL; import javax.swing.Action; @@ -140,9 +144,20 @@ public class MDSGraphPanel extends JPanel{ south.add(Box.createHorizontalGlue()); south.add(check); south.add(Box.createHorizontalGlue()); - + + JPanel center = new JPanel(new FlowLayout(FlowLayout.CENTER)); + center.addComponentListener(new ComponentAdapter(){ + @Override + public void componentResized(ComponentEvent e){ + Dimension d = e.getComponent().getSize(); + viewer.setSize(d.width - 10, d.height - 10); + } + }); setLayout(new BorderLayout()); - add(viewer, BorderLayout.CENTER); + + center.add(viewer); + + add(center, BorderLayout.CENTER); add(south, BorderLayout.SOUTH); } } diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphViewer.java b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphViewer.java index 681d5fc..b4c9721 100644 --- a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphViewer.java +++ b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphViewer.java @@ -62,8 +62,10 @@ public class MDSGraphViewer extends JLayeredPane{ } @Override - public void setSize(int x, int y){ - super.setSize(x, y); + public void setSize(int width, int height){ + if(width < height) height = width; + else width = height; + super.setSize(width, height); setPreferredSize(getSize()); } @@ -132,7 +134,13 @@ public class MDSGraphViewer extends JLayeredPane{ Dimension d = getSize(); g.setColor(Color.GRAY); + + g.drawLine(0, 0, d.width - 1, 0); + g.drawLine(d.width - 1, 0, d.width - 1, d.height - 1); g.drawLine(d.width / 2, d.height, d.width / 2, 0); + + g.drawLine(0, 0, 0, d.height - 1); + g.drawLine(0, d.height - 1, d.width - 1, d.height - 1); g.drawLine(0, d.height / 2, d.width, d.height / 2); updatePointComponents(d); -- 2.11.0