Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1616] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-02-19 13:23:19
|
Revision: 1616
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1616&view=rev
Author: heeroyuy
Date: 2009-02-19 12:32:54 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
-shows individual name when hovering over the point in the GraphicalCoveragePanel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-02-19 12:08:55 UTC (rev 1615)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-02-19 12:32:54 UTC (rev 1616)
@@ -3,6 +3,7 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
+import java.awt.Graphics2D;
import java.awt.geom.Ellipse2D;
import java.util.Set;
import java.util.Vector;
@@ -32,28 +33,32 @@
private Vector<IndividualPoint> posCovIndVector;
private Vector<IndividualPoint> posNotCovIndVector;
private Vector<IndividualPoint> negCovIndVector;
+ private Vector<IndividualPoint> points;
private JButton allPositiveIndividuals;
private JButton allNegativeIndividuals;
private GraphicalCoveragePanelHandler handler;
+ private MoreDetailForSuggestedConceptsPanel panel;
/**
* This is the constructor for the GraphicalCoveragePanel.
*/
- public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m, String concept, int w, int h) {
+ public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m, String concept, int w, int h, MoreDetailForSuggestedConceptsPanel p) {
setPreferredSize(new Dimension(width, height));
setVisible(true);
setForeground(Color.GREEN);
repaint();
eval = desc;
model = m;
+ panel = p;
conceptNew = concept;
posCovIndVector = new Vector<IndividualPoint>();
posNotCovIndVector = new Vector<IndividualPoint>();
negCovIndVector = new Vector<IndividualPoint>();
+ points = new Vector<IndividualPoint>();
this.computeGraphics();
- handler = new GraphicalCoveragePanelHandler();
+ handler = new GraphicalCoveragePanelHandler(this);
oldConcept = new Ellipse2D.Float(5, 25, 250, 250);
- newConcept = new Ellipse2D .Float(5+shiftXAxis, 25, width+distortion, height+distortion);
+ newConcept = new Ellipse2D.Float(5+shiftXAxis, 25, width+distortion, height+distortion);
allPositiveIndividuals = new JButton();
//immer in der mitte und unten rauszubekommen mittels getMittelpunkt fuer x
//und getMaxY fuer y.
@@ -61,7 +66,9 @@
allNegativeIndividuals = new JButton();
//allNegativeIndividuals.setBounds(arg0, arg1, arg2, arg3);
this.computeIndividualPoints();
- this.addMouseListener(handler);
+ //this.addMouseListener(handler);
+ this.addMouseMotionListener(handler);
+ this.addPropertyChangeListener(handler);
}
public void drawCoverageForLearnedClassDescription(
@@ -73,26 +80,30 @@
@Override
protected void paintComponent(Graphics g) {
- g.setColor(Color.RED);
- g.drawOval((5+shiftXAxis), 25, width+distortion, height+distortion);
- g.drawString(conceptNew, 10 + width, 15);
- g.setColor(Color.GREEN);
- g.drawOval(5, 25, 250, 250);
- g.drawString(model.getOldConceptOWLAPI().toString(), 10, 15);
+ Graphics2D g2D;
+ g2D = (Graphics2D) g;
+
+ g2D.setColor(Color.RED);
+ g2D.draw (newConcept);
+ //g.drawOval((5+shiftXAxis), 25, width+distortion, height+distortion);
+ g2D.drawString(conceptNew, 10 + width, 15);
+ g2D.setColor(Color.GREEN);
+ g2D.draw (oldConcept);
+ g2D.drawString(model.getOldConceptOWLAPI().toString(), 10, 15);
for(int i = 0; i < posCovIndVector.size(); i++) {
- g.setColor(Color.BLACK);
- g.drawString(posCovIndVector.get(i).getPoint(), posCovIndVector.get(i).getXAxis(), posCovIndVector.get(i).getYAxis());
+ g2D.setColor(Color.BLACK);
+ g2D.drawString(posCovIndVector.get(i).getPoint(), posCovIndVector.get(i).getXAxis(), posCovIndVector.get(i).getYAxis());
}
for(int i = 0; i < posNotCovIndVector.size(); i++) {
- g.setColor(Color.BLACK);
- g.drawString(posNotCovIndVector.get(i).getPoint(), posNotCovIndVector.get(i).getXAxis(), posNotCovIndVector.get(i).getYAxis());
+ g2D.setColor(Color.BLACK);
+ g2D.drawString(posNotCovIndVector.get(i).getPoint(), posNotCovIndVector.get(i).getXAxis(), posNotCovIndVector.get(i).getYAxis());
}
for(int i = 0; i < negCovIndVector.size(); i++) {
- g.setColor(Color.BLACK);
- g.drawString(negCovIndVector.get(i).getPoint(), negCovIndVector.get(i).getXAxis(), negCovIndVector.get(i).getYAxis());
+ g2D.setColor(Color.BLACK);
+ g2D.drawString(negCovIndVector.get(i).getPoint(), negCovIndVector.get(i).getXAxis(), negCovIndVector.get(i).getYAxis());
}
}
@@ -106,9 +117,9 @@
float shift = (float) (width*(notCov/posGes));
shiftXAxis = Math.round(shift);
distortion = 0;
- if(shiftXAxis == 0) {
- distortion = Math.round((width*(covNeg/negGes))/4);
- }
+ //if(shiftXAxis == 0) {
+ // distortion = Math.round((width*(covNeg/negGes))/4);
+ //}
}
@@ -203,7 +214,23 @@
}
}
}
+ points.addAll(posCovIndVector);
+ points.addAll(posNotCovIndVector);
+ points.addAll(negCovIndVector);
}
+ public Vector<IndividualPoint> getIndividualVector() {
+ return points;
+ }
+ public GraphicalCoveragePanel getGraphicalCoveragePanel() {
+ return this;
+ }
+
+ public MoreDetailForSuggestedConceptsPanel getMoreDetailForSuggestedConceptsPanel() {
+ return panel;
+ }
+
+
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-02-19 12:08:55 UTC (rev 1615)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-02-19 12:32:54 UTC (rev 1616)
@@ -1,44 +1,49 @@
package org.dllearner.tools.protege;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Vector;
-//hier irgendwie umsetzen das wenn ueber individual fahre das name angezeigt wird.
-public class GraphicalCoveragePanelHandler implements MouseListener{
-
- public GraphicalCoveragePanelHandler() {
-
+
+public class GraphicalCoveragePanelHandler implements MouseMotionListener, PropertyChangeListener {
+
+ private GraphicalCoveragePanel panel;
+
+ public GraphicalCoveragePanelHandler(GraphicalCoveragePanel p) {
+ this.panel = p;
}
-
+
@Override
- public void mouseClicked(MouseEvent arg0) {
+ public void mouseDragged(MouseEvent arg0) {
// TODO Auto-generated method stub
-
- }
- @Override
- public void mouseEntered(MouseEvent arg0) {
- System.out.println("test: " + arg0.getSource());
-
}
@Override
- public void mouseExited(MouseEvent arg0) {
- // TODO Auto-generated method stub
-
- }
+ public void mouseMoved(MouseEvent m) {
+ Vector<IndividualPoint> v = panel.getIndividualVector();
+ //System.out.println("hier: " + m.getX() + " " + m.getY());
+ //System.out.println("bla: " + v.get(0).getXAxis() + " "
+ // + v.get(0).getYAxis());
+ for (int i = 0; i < v.size(); i++) {
+ if (v.get(i).getXAxis() >= m.getX() - 5
+ && v.get(i).getXAxis() <= m.getX() + 5
+ && v.get(i).getYAxis() >= m.getY() - 5
+ && v.get(i).getYAxis() <= m.getY() + 5) {
+ panel.getGraphicalCoveragePanel().setToolTipText(v.get(i).getIndividualName());
+ }
- @Override
- public void mousePressed(MouseEvent arg0) {
- // TODO Auto-generated method stub
-
+ }
+
}
@Override
- public void mouseReleased(MouseEvent arg0) {
- // TODO Auto-generated method stub
-
+ public void propertyChange(PropertyChangeEvent arg0) {
+ panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-02-19 12:08:55 UTC (rev 1615)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-02-19 12:32:54 UTC (rev 1616)
@@ -55,5 +55,9 @@
public int getYAxis() {
return yAxis;
}
+
+ public String getIndividualName() {
+ return individual;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-02-19 12:08:55 UTC (rev 1615)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-02-19 12:32:54 UTC (rev 1616)
@@ -205,7 +205,7 @@
//panel for the informations of the selected concept
//this method adds the informations for the selected concept to the panel
setInformation();
- p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), width, height);
+ p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), width, height, this);
p.setBounds(5, 110, 600, 650);
detailPopup = new JDialog();
detailPopup.setSize(width, height);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
