Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1653] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-03-17 14:56:34
|
Revision: 1653
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1653&view=rev
Author: heeroyuy
Date: 2009-03-17 14:56:12 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
-added scrollbar to the popup menu that shows aqll individuals
-split the new concept string on the graphical panel when it is to long
-added scrollbar to main window
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-17 00:07:12 UTC (rev 1652)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-17 14:56:12 UTC (rev 1653)
@@ -123,7 +123,7 @@
sugPanel = new SuggestClassPanel();
learnerPanel = new JPanel();
learnerPanel.setLayout(new BorderLayout());
- learnerPanel.setPreferredSize(new Dimension(600, 400));
+ learnerPanel.setPreferredSize(new Dimension(585, 350));
learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
action = new ActionHandler(model, this, label);
wikiPane = new JLabel("<html>See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for an introduction.</html>");
@@ -146,7 +146,7 @@
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(null);
- accept.setPreferredSize(new Dimension(290, 50));
+ accept.setPreferredSize(new Dimension(260, 50));
advanced.setName("Advanced");
learnerScroll.setPreferredSize(new Dimension(600, 400));
posPanel = new PosAndNegSelectPanel(model, action);
@@ -196,7 +196,7 @@
sugPanel.setBounds(10, 35, 490, 110);
adv.setBounds(40, 195, 200, 20);
wikiPane.setBounds(220, 0, 350, 30);
- addButtonPanel.setBounds(510, 40, 80, 110);
+ addButtonPanel.setBounds(510, 40, 80, 70);
run.setBounds(10, 0, 200, 30);
advanced.setBounds(10, 195, 20, 20);
detail.setBounds(10, 195, 600, 300);
@@ -204,7 +204,7 @@
sugPanel.setVisible(true);
posPanel.setVisible(false);
posPanel.setBounds(10, 225, 490, 250);
- accept.setBounds(510, 40, 80, 110);
+ accept.setBounds(510, 40, 80, 80);
hint.setBounds(10, 150, 490, 35);
errorMessage.setBounds(510, 100, 490, 50);
learner.add(run);
@@ -248,6 +248,7 @@
learner.add(advanced);
learner.add(posPanel);
learner.add(detail);
+ learnerPanel.setPreferredSize(new Dimension(600, 660));
learnerPanel.removeAll();
learnerPanel.add(learner);
learnerScroll.setViewportView(learnerPanel);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-17 00:07:12 UTC (rev 1652)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-17 14:56:12 UTC (rev 1653)
@@ -59,11 +59,12 @@
private EvaluatedDescription eval;
private final DLLearnerModel model;
- private final String conceptNew;
+ private String conceptNew;
private final Vector<IndividualPoint> posCovIndVector;
private final Vector<IndividualPoint> posNotCovIndVector;
private final Vector<IndividualPoint> additionalIndividuals;
private final Vector<IndividualPoint> points;
+ private final Vector<String> conceptVector;
private final GraphicalCoveragePanelHandler handler;
private int adjustment;
private int shiftOldConcept;
@@ -102,10 +103,11 @@
this.repaint();
eval = desc;
model = m;
- panel = p;
+ panel = p;;
id = model.getID();
random = new Random();
conceptNew = concept;
+ conceptVector = new Vector<String>();
posCovIndVector = new Vector<IndividualPoint>();
posNotCovIndVector = new Vector<IndividualPoint>();
additionalIndividuals = new Vector<IndividualPoint>();
@@ -134,7 +136,11 @@
g2D.fill(oldConcept);
g2D.drawString(model.getOldConceptOWLAPI().toString(), 310, 10);
g2D.setColor(Color.ORANGE);
- g2D.drawString(conceptNew, 310, 30);
+ int p = 30;
+ for (int i = 0; i < conceptVector.size(); i++) {
+ g2D.drawString(conceptVector.get(i), 310, p);
+ p = p + 20;
+ }
g2D.setComposite(ac);
g2D.fill(newConcept);
g2D.setColor(Color.BLACK);
@@ -329,6 +335,19 @@
shiftNewConcept = 2 * shiftNewConceptX;
}
}
+
+ int i = conceptNew.length();
+ int z = 0;
+ while(i > 0) {
+ if(i >= 39 ) {
+ z = 39;
+ } else {
+ z = conceptNew.length();
+ }
+ conceptVector.add(conceptNew.substring(0, z));
+ conceptNew = conceptNew.replace(conceptNew.substring(0, z), "");
+ i = conceptNew.length();
+ }
}
private void computeIndividualPoints() {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-03-17 00:07:12 UTC (rev 1652)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-03-17 14:56:12 UTC (rev 1653)
@@ -27,8 +27,8 @@
import java.util.Set;
import java.util.Vector;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
+import javax.swing.JComboBox;
+import javax.swing.plaf.basic.BasicComboPopup;
import org.dllearner.algorithms.EvaluatedDescriptionClass;
import org.dllearner.core.EvaluatedDescription;
@@ -46,7 +46,9 @@
private final GraphicalCoveragePanel panel;
private final EvaluatedDescription description;
private final DLLearnerModel model;
- private final JPopupMenu popup;
+ private BasicComboPopup scrollPopup;
+ private final Vector<String> individualComboBox;
+ private JComboBox indiBox;
/**
* This is the constructor for the handler.
@@ -59,7 +61,8 @@
this.panel = p;
description = eval;
model = m;
- popup = new JPopupMenu();
+ individualComboBox = new Vector<String>();
+
}
@Override
@@ -89,6 +92,7 @@
} else {
panel.getGraphicalCoveragePanel().setToolTipText(null);
}
+
Vector<IndividualPoint> v = panel.getIndividualVector();
for (int i = 0; i < v.size(); i++) {
if (v.get(i).getXAxis() >= m.getX() - 5
@@ -114,15 +118,19 @@
&& arg0.getX() <= panel.getX2() + panel.getShiftCovered()
&& arg0.getY() >= panel.getY1()
&& arg0.getY() <= panel.getY2()) {
- popup.removeAll();
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ individualComboBox.clear();
+
Set<Individual> covInd = ((EvaluatedDescriptionClass) description)
.getCoveredInstances();
for (Individual ind : covInd) {
- popup.add(new JMenuItem(ind.toString()));
+ individualComboBox.add(ind.toString());
}
- popup.show(panel, arg0.getX(), arg0.getY());
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ indiBox = new JComboBox(individualComboBox);
+ scrollPopup = new BasicComboPopup(indiBox);
+ scrollPopup.setAutoscrolls(true);
+ scrollPopup.show(panel, arg0.getX(), arg0.getY());
+ //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
if (arg0.getX() >= panel.getX1() + panel.getShiftNewConcept()
@@ -138,15 +146,19 @@
+ panel.getShiftNewConcept()
&& arg0.getY() <= panel.getY2()
+ panel.getShiftNewConcept()) {
- popup.removeAll();
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ individualComboBox.clear();
Set<Individual> addInd = ((EvaluatedDescriptionClass) description)
.getAdditionalInstances();
+
for (Individual ind : addInd) {
- popup.add(new JMenuItem(ind.toString()));
+ individualComboBox.add(ind.toString());
}
- popup.show(panel, arg0.getX(), arg0.getY());
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ indiBox = new JComboBox(individualComboBox);
+ scrollPopup = new BasicComboPopup(indiBox);
+ scrollPopup.setAutoscrolls(true);
+ scrollPopup.show(panel, arg0.getX(), arg0.getY());
+ //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
if (arg0.getX() >= panel.getX1() - panel.getShiftOldConcept()
@@ -154,17 +166,20 @@
- panel.getShiftOldConcept()
&& arg0.getY() >= panel.getY1()
&& arg0.getY() <= panel.getY2()) {
- popup.removeAll();
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ individualComboBox.clear();
Set<Individual> notCovInd = model.getReasoner().getIndividuals(
model.getCurrentConcept());
notCovInd.removeAll(((EvaluatedDescriptionClass) description)
.getCoveredInstances());
for (Individual ind : notCovInd) {
- popup.add(new JMenuItem(ind.toString()));
+ individualComboBox.add(ind.toString());
}
- popup.show(panel, arg0.getX(), arg0.getY());
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ indiBox = new JComboBox(individualComboBox);
+ scrollPopup = new BasicComboPopup(indiBox);
+ scrollPopup.setAutoscrolls(true);
+ scrollPopup.show(panel, arg0.getX(), arg0.getY());
+ //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
