Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1650] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-03-12 14:51:48
|
Revision: 1650
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1650&view=rev
Author: heeroyuy
Date: 2009-03-12 14:51:39 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
-set tooltip too plus
-set scrollPane to the plugin view
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
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
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-03-11 16:44:45 UTC (rev 1649)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-03-12 14:51:39 UTC (rev 1650)
@@ -108,7 +108,7 @@
model.setLearningProblem();
model.setLearningAlgorithm();
view.getRunButton().setEnabled(false);
- view.renderErrorMessage("learning started");
+ view.renderErrorMessage("learning\nstarted");
retriever = new SuggestionRetriever();
retriever.execute();
// model.setCurrentConcept(null);
@@ -144,6 +144,7 @@
if (z.getActionCommand().equals("Why")) {
view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(
evaluatedDescription);
+ view.setGraphicalPanel();
view.getMoreDetailForSuggestedConceptsPanel().repaint();
}
}
@@ -224,6 +225,7 @@
}
view.getMoreDetailForSuggestedConceptsPanel()
.renderDetailPanel(evaluatedDescription);
+ view.setGraphicalPanel();
view.getMoreDetailForSuggestedConceptsPanel().repaint();
}
}
@@ -310,9 +312,7 @@
if (la != null) {
publish(la.getCurrentlyBestEvaluatedDescriptions(view
.getPosAndNegSelectPanel().getOptionPanel()
- .getNrOfConcepts(), view
- .getPosAndNegSelectPanel().getOptionPanel()
- .getMinAccuracy(), false));
+ .getNrOfConcepts()));
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-11 16:44:45 UTC (rev 1649)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-12 14:51:39 UTC (rev 1650)
@@ -32,6 +32,7 @@
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JToggleButton;
@@ -105,6 +106,8 @@
private final MoreDetailForSuggestedConceptsPanel detail;
private ReadingOntologyThread readThread;
private final OWLEditorKit editorKit;
+ private final JPanel learnerPanel;
+ private final JScrollPane learnerScroll;
/**
* The constructor for the DL-Learner tab in the class description
@@ -118,6 +121,10 @@
model = new DLLearnerModel(editorKit, this);
model.setID(label);
sugPanel = new SuggestClassPanel();
+ learnerPanel = new JPanel();
+ learnerPanel.setLayout(new BorderLayout());
+ learnerPanel.setPreferredSize(new Dimension(600, 400));
+ 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>");
URL iconUrl = this.getClass().getResource("arrow.gif");
@@ -139,10 +146,9 @@
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(null);
- //learner.setPreferredSize(new Dimension(600, 520));
- learner.setSize(new Dimension(1024, 768));
accept.setPreferredSize(new Dimension(290, 50));
advanced.setName("Advanced");
+ learnerScroll.setPreferredSize(new Dimension(600, 400));
posPanel = new PosAndNegSelectPanel(model, action);
detail = new MoreDetailForSuggestedConceptsPanel(model);
this.addAcceptButtonListener(this.action);
@@ -170,6 +176,7 @@
* This Method renders the view of the plugin.
*/
public void makeView() {
+ learner.remove(detail);
run.setEnabled(false);
System.out.println("hier");
detail.unsetPanel();
@@ -187,19 +194,19 @@
sugPanel = sugPanel.updateSuggestClassList();
advanced.setSelected(false);
sugPanel.setBounds(10, 35, 490, 110);
- adv.setBounds(40, 505, 200, 20);
+ adv.setBounds(40, 195, 200, 20);
wikiPane.setBounds(220, 0, 350, 30);
addButtonPanel.setBounds(510, 40, 80, 110);
run.setBounds(10, 0, 200, 30);
- advanced.setBounds(10, 505, 20, 20);
+ advanced.setBounds(10, 195, 20, 20);
detail.setBounds(10, 195, 600, 300);
detail.setVisible(true);
sugPanel.setVisible(true);
posPanel.setVisible(false);
- posPanel.setBounds(10, 535, 490, 250);
+ posPanel.setBounds(10, 225, 490, 250);
accept.setBounds(510, 40, 80, 110);
hint.setBounds(10, 150, 490, 35);
- errorMessage.setBounds(10, 180, 490, 20);
+ errorMessage.setBounds(510, 100, 490, 50);
learner.add(run);
learner.add(wikiPane);
learner.add(adv);
@@ -209,7 +216,8 @@
learner.add(hint);
learner.add(errorMessage);
learner.add(posPanel);
- learner.add(detail);
+ learnerPanel.add(learner);
+ learnerScroll.setViewportView(learnerPanel);
this.renderErrorMessage("");
}
@@ -226,6 +234,27 @@
}
}
+ public void setGraphicalPanel() {
+ learner.remove(posPanel);
+ learner.remove(advanced);
+ learner.remove(adv);
+ learner.repaint();
+ posPanel.setBounds(10, 535, 490, 250);
+ adv.setBounds(40, 505, 200, 20);
+ advanced.setBounds(10, 505, 20, 20);
+ detail.setBounds(10, 195, 600, 300);
+ detail.setVisible(true);
+ learner.add(adv);
+ learner.add(advanced);
+ learner.add(posPanel);
+ learner.add(detail);
+ learnerPanel.removeAll();
+ learnerPanel.add(learner);
+ learnerScroll.setViewportView(learnerPanel);
+ learnerScroll.repaint();
+
+
+ }
/**
* This Method changes the hint message.
* @param message String hintmessage
@@ -356,12 +385,12 @@
* This method sets the run button enable after learning.
*/
public void algorithmTerminated() {
- String error = "learning successful";
+ String error = "learning\nsuccessful";
String message = "";
if(isInconsistent) {
message = "Class descriptions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
} else {
- message = "To view details about why a class description was suggested, please doubleclick on it.";
+ message = "To view details about why a class description was suggested, please click on it.";
}
run.setEnabled(true);
// start the algorithm and print the best concept found
@@ -370,7 +399,7 @@
}
public JComponent getLearnerView() {
- return learner;
+ return learnerScroll;
}
public DLLearnerModel getDLLearnerModel() {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-11 16:44:45 UTC (rev 1649)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-12 14:51:39 UTC (rev 1650)
@@ -46,7 +46,7 @@
private static final int HEIGHT = 150;
private static final int WIDTH = 150;
private static final int ELLIPSE_X_AXIS = 5;
- private static final int ELLIPSE_Y_AXIS = 25;
+ private static final int ELLIPSE_Y_AXIS = 5;
private static final int MAX_NUMBER_OF_INDIVIDUAL_POINTS = 20;
private static final int PLUS_SIZE = 5;
private static final int GAP = 20;
@@ -87,15 +87,11 @@
* DLLearnerModel
* @param concept
* String
- * @param w
- * width
- * @param h
- * height
* @param p
* MoreDetailForSuggestedConceptsPanel
*/
public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m,
- String concept, int w, int h, MoreDetailForSuggestedConceptsPanel p) {
+ String concept, MoreDetailForSuggestedConceptsPanel p) {
this.setPreferredSize(new Dimension(WIDTH, HEIGHT + 100));
this.setVisible(false);
this.setForeground(Color.GREEN);
@@ -117,7 +113,6 @@
this.computeIndividualPoints();
this.addMouseMotionListener(handler);
this.addMouseListener(handler);
- // this.addPropertyChangeListener(handler);
}
@Override
@@ -130,12 +125,10 @@
AlphaComposite.SRC_OVER, 0.5f);
g2D.setColor(Color.YELLOW);
g2D.fill(oldConcept);
- g2D.setColor(Color.BLACK);
- g2D.drawString(model.getOldConceptOWLAPI().toString(), 10, 15);
- g2D.setColor(Color.BLACK);
- g2D.drawString(conceptNew, 10 + WIDTH, 15);
- g2D.setComposite(ac);
+ g2D.drawString(model.getOldConceptOWLAPI().toString(), 310, 10);
g2D.setColor(Color.ORANGE);
+ g2D.drawString(conceptNew, 310, 30);
+ g2D.setComposite(ac);
g2D.fill(newConcept);
g2D.setColor(Color.BLACK);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-03-11 16:44:45 UTC (rev 1649)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-03-12 14:51:39 UTC (rev 1650)
@@ -71,6 +71,24 @@
@Override
public void mouseMoved(MouseEvent m) {
panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+ if (m.getX() >= panel.getX1() + panel.getShiftCovered()
+ && m.getX() <= panel.getX2() + panel.getShiftCovered()
+ && m.getY() >= panel.getY1() && m.getY() <= panel.getY2()
+ || m.getX() >= panel.getX1() + panel.getShiftNewConcept()
+ && m.getX() <= panel.getX2() + panel.getShiftNewConcept()
+ && m.getY() >= panel.getY1() && m.getY() <= panel.getY2()
+ || m.getX() >= panel.getX1() + panel.getShiftNewConceptX()
+ && m.getX() <= panel.getX2() + panel.getShiftNewConceptX()
+ && m.getY() >= panel.getY1() + panel.getShiftNewConcept()
+ && m.getY() <= panel.getY2() + panel.getShiftNewConcept()
+ || m.getX() >= panel.getX1() - panel.getShiftOldConcept()
+ && m.getX() <= panel.getX2() - panel.getShiftOldConcept()
+ && m.getY() >= panel.getY1() && m.getY() <= panel.getY2()) {
+ panel.getGraphicalCoveragePanel().setToolTipText(
+ "To view all Individuals please click on the plus");
+ } 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
@@ -80,9 +98,7 @@
panel.getGraphicalCoveragePanel().setToolTipText(
v.get(i).getIndividualName());
}
-
}
-
}
@Override
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-03-11 16:44:45 UTC (rev 1649)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-03-12 14:51:39 UTC (rev 1650)
@@ -59,7 +59,7 @@
private final JTextArea concept;
private Set<String> ontologiesStrings;
private final JTextArea conceptText;
- private static final int HEIGHT = 500;
+ private static final int HEIGHT = 350;
private static final int WIDTH = 600;
private GraphicalCoveragePanel p;
private final MoreDetailForSuggestedConceptsPanelHandler handler;
@@ -111,8 +111,8 @@
//panel for the informations of the selected concept
//this method adds the informations for the selected concept to the panel
this.setInformation();
- p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), WIDTH, HEIGHT-200, this);
- p.setBounds(5, 60, 600, 350);
+ p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), this);
+ p.setBounds(5, 0, 600, 350);
//adds all information to the example panel
unsetEverything();
conceptPanel.removeAll();
@@ -121,7 +121,7 @@
conceptPanel.add(conceptText);
conceptPanel.add(accuracyText);
conceptPanel.setVisible(true);
- this.add(conceptPanel);
+ //this.add(conceptPanel);
this.add(p);
this.addPropertyChangeListener(handler);
conceptPanel.addPropertyChangeListener(handler);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-03-11 16:44:45 UTC (rev 1649)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-03-12 14:51:39 UTC (rev 1650)
@@ -47,14 +47,13 @@
//Scroll panel if the suggestions are longer than the Panel itself
- private JScrollPane suggestScroll;
+ private final JScrollPane suggestScroll;
/**
* This is the constructor for the suggest panel.
* It creates a new Scroll panel and puts the Suggest List in it.
*/
public SuggestClassPanel() {
super();
- suggestScroll = new JScrollPane();
//renders scroll bars if necessary
suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
descriptions = new JList();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
