Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1655] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-03-20 11:21:36
|
Revision: 1655
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1655&view=rev
Author: heeroyuy
Date: 2009-03-20 11:21:30 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
-fixed some bugs
-adjust scrollbar on main panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.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/OptionPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.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-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -116,7 +116,6 @@
}
if (z.getActionCommand().equals("ADD")) {
- view.getMoreDetailForSuggestedConceptsPanel().repaint();
if (evaluatedDescription != null) {
model
.changeDLLearnerDescriptionsToOWLDescriptions(evaluatedDescription
@@ -127,7 +126,7 @@
.getSuggestClassPanel().getSuggestList()
.getSelectedValue());
}
- String message = "class description added";
+ String message = "class description\nadded";
view.renderErrorMessage(message);
}
if (z.getActionCommand().equals("")) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -261,7 +261,6 @@
public void setLearningProblem() {
lp = cm.learningProblem(ClassLearningProblem.class, reasoner);
cm.applyConfigEntry(lp, "classToDescribe", currentConcept.toString());
- System.out.println("lern: " + currentConcept);
if (id.equals(EQUIVALENT_CLASS_AXIOM_STRING)) {
// sets the learning problem to PosNegDefinitionLP when the
// dllearner should suggest an equivalent class
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -123,7 +123,6 @@
sugPanel = new SuggestClassPanel();
learnerPanel = new JPanel();
learnerPanel.setLayout(new BorderLayout());
- 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>");
@@ -178,10 +177,10 @@
public void makeView() {
learner.remove(detail);
run.setEnabled(false);
- System.out.println("hier");
detail.unsetPanel();
+ learnerPanel.setPreferredSize(new Dimension(575, 350));
detail.setVisible(false);
- hint.setText("To get suggestions for class descriptions, please click the button above.");
+ hint.setText("");
isInconsistent = false;
readThread = new ReadingOntologyThread(editorKit, this, model);
readThread.start();
@@ -193,10 +192,10 @@
sugPanel.setSuggestList(new DefaultListModel());
sugPanel = sugPanel.updateSuggestClassList();
advanced.setSelected(false);
- sugPanel.setBounds(10, 35, 490, 110);
+ sugPanel.setBounds(10, 35, 470, 110);
adv.setBounds(40, 195, 200, 20);
wikiPane.setBounds(220, 0, 350, 30);
- addButtonPanel.setBounds(510, 40, 80, 70);
+ addButtonPanel.setBounds(485, 40, 80, 70);
run.setBounds(10, 0, 200, 30);
advanced.setBounds(10, 195, 20, 20);
detail.setBounds(10, 195, 600, 300);
@@ -206,7 +205,7 @@
posPanel.setBounds(10, 225, 490, 250);
accept.setBounds(510, 40, 80, 80);
hint.setBounds(10, 150, 490, 35);
- errorMessage.setBounds(510, 100, 490, 50);
+ errorMessage.setBounds(485, 110, 80, 80);
learner.add(run);
learner.add(wikiPane);
learner.add(adv);
@@ -239,16 +238,16 @@
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);
+ posPanel.setBounds(10, 435, 490, 250);
+ adv.setBounds(40, 405, 200, 20);
+ advanced.setBounds(10, 405, 20, 20);
+ detail.setBounds(10, 195, 590, 200);
detail.setVisible(true);
learner.add(adv);
learner.add(advanced);
learner.add(posPanel);
learner.add(detail);
- learnerPanel.setPreferredSize(new Dimension(600, 660));
+ learnerPanel.setPreferredSize(new Dimension(575, 560));
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-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -223,7 +223,7 @@
+ shiftNewConcept, y2 + 1);
}
- if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0) {
+ if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0 && ((EvaluatedDescriptionClass) eval).getCoverage() == 1.0) {
g2D.drawLine(x1 - 1 + shiftNewConceptX, y1 - 1
+ shiftNewConcept, x2 + 1 + shiftNewConceptX, y1 - 1
+ shiftNewConcept);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -49,12 +49,16 @@
private BasicComboPopup scrollPopup;
private final Vector<String> individualComboBox;
private JComboBox indiBox;
-
+
/**
* This is the constructor for the handler.
- * @param p GraphicalCoveragePanel
- * @param eval EvaluatedDescription
- * @param m DLLearnerModel
+ *
+ * @param p
+ * GraphicalCoveragePanel
+ * @param eval
+ * EvaluatedDescription
+ * @param m
+ * DLLearnerModel
*/
public GraphicalCoveragePanelHandler(GraphicalCoveragePanel p,
EvaluatedDescription eval, DLLearnerModel m) {
@@ -62,7 +66,7 @@
description = eval;
model = m;
individualComboBox = new Vector<String>();
-
+
}
@Override
@@ -92,7 +96,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
@@ -118,19 +122,23 @@
&& arg0.getX() <= panel.getX2() + panel.getShiftCovered()
&& arg0.getY() >= panel.getY1()
&& arg0.getY() <= panel.getY2()) {
- //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+
+ // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
individualComboBox.clear();
-
+
Set<Individual> covInd = ((EvaluatedDescriptionClass) description)
.getCoveredInstances();
- for (Individual ind : covInd) {
- individualComboBox.add(ind.toString());
+ int i = covInd.size();
+ if (i > 0) {
+ for (Individual ind : covInd) {
+ individualComboBox.add(ind.toString());
+ }
+ indiBox = new JComboBox(individualComboBox);
+ scrollPopup = new BasicComboPopup(indiBox);
+ scrollPopup.setAutoscrolls(true);
+ scrollPopup.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()
@@ -146,19 +154,22 @@
+ panel.getShiftNewConcept()
&& arg0.getY() <= panel.getY2()
+ panel.getShiftNewConcept()) {
- //panel.getMoreDetailForSuggestedConceptsPanel().repaint();
+
+ // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
individualComboBox.clear();
Set<Individual> addInd = ((EvaluatedDescriptionClass) description)
.getAdditionalInstances();
-
- for (Individual ind : addInd) {
- individualComboBox.add(ind.toString());
+ int i = addInd.size();
+ if (i > 0) {
+ for (Individual ind : addInd) {
+ individualComboBox.add(ind.toString());
+ }
+ indiBox = new JComboBox(individualComboBox);
+ scrollPopup = new BasicComboPopup(indiBox);
+ scrollPopup.setAutoscrolls(true);
+ scrollPopup.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()
@@ -166,20 +177,24 @@
- panel.getShiftOldConcept()
&& arg0.getY() >= panel.getY1()
&& arg0.getY() <= panel.getY2()) {
- //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) {
- individualComboBox.add(ind.toString());
+ int i = notCovInd.size();
+ if (i > 0) {
+ for (Individual ind : notCovInd) {
+ individualComboBox.add(ind.toString());
+ }
+ indiBox = new JComboBox(individualComboBox);
+ scrollPopup = new BasicComboPopup(indiBox);
+ scrollPopup.setAutoscrolls(true);
+ scrollPopup.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();
}
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -124,7 +124,7 @@
//this.add(conceptPanel);
this.add(p);
this.addPropertyChangeListener(handler);
- conceptPanel.addPropertyChangeListener(handler);
+ //conceptPanel.addPropertyChangeListener(handler);
this.repaint();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -61,7 +61,7 @@
minAccuracy.setBounds(160, 0, 200, 40);
- maxExecutionTime = new JSlider(2, 20, 5);
+ maxExecutionTime = new JSlider(2, 20, 8);
maxExecutionTime.setPaintTicks(true);
maxExecutionTime.setMajorTickSpacing(5);
maxExecutionTime.setMinorTickSpacing(1);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -41,7 +41,6 @@
@Override
public JComponent getComponent() {
- //super.getOWLEditorKit().getOWLWorkspace().getOWLComponentFactory().getOWLClassDescriptionEditor(null).getEditorComponent().setSize(new Dimension(1024, 768));
return view.getLearnerView();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -115,7 +115,6 @@
}
}
} else {
- System.out.println("hier");
if (reasoner.getIndividuals().size() > 0) {
hasIndividuals = true;
@@ -172,11 +171,15 @@
this.setPositiveConcept();
if (this.hasIndividuals()) {
view.getRunButton().setEnabled(true);
+ view.getHintPanel().setForeground(Color.BLACK);
+ view.setHintMessage("To get suggestions for class descriptions, please click the button above.");
+
} else {
view.getRunButton().setEnabled(false);
- view.getHintPanel().setVisible(false);
- String message ="There are no Instances for available. Please insert some Instances.";
- view.renderErrorMessage(message);
+ view.getHintPanel().setVisible(true);
+ String message ="There are no Instances for " + current + " available. Please insert some Instances.";
+ view.getHintPanel().setForeground(Color.RED);
+ view.setHintMessage(message);
}
} else {
view.getHintPanel().setForeground(Color.RED);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-03-19 17:31:22 UTC (rev 1654)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-03-20 11:21:30 UTC (rev 1655)
@@ -61,7 +61,7 @@
suggestPanel = new JPanel();
descriptions.setVisible(true);
suggestPanel.add(descriptions);
- suggestScroll.setPreferredSize(new Dimension(490, 108));
+ suggestScroll.setPreferredSize(new Dimension(460, 108));
suggestScroll.setViewportView(descriptions);
descriptions.setCellRenderer(new SuggestListCellRenderer());
add(suggestScroll);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
