Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1714] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-04-19 09:27:14
|
Revision: 1714
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1714&view=rev
Author: heeroyuy
Date: 2009-04-19 09:27:10 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
-some resize problems fixed
-some changes on graphical panel
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/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.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-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -398,6 +398,7 @@
}
}
view.getSuggestClassPanel().setSuggestList(dm);
+ view.getLearnerView().repaint();
}
};
SwingUtilities.invokeLater(doUpdateList);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -159,7 +159,7 @@
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
- accept.setPreferredSize(new Dimension(90, 50));
+ accept.setPreferredSize(new Dimension(70, 40));
run.setPreferredSize(new Dimension(220, 50));
advanced.setName("Advanced");
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
@@ -192,6 +192,7 @@
*/
public void makeView(String label) {
run.setText("suggest " + label + " expression");
+ run.setPreferredSize(new Dimension(200, 40));
GridBagConstraints c = new GridBagConstraints();
learner.remove(detail);
model.setID(label);
@@ -208,7 +209,7 @@
learner.add(runPanel, c);
sugPanel.setSuggestList(new DefaultListModel());
- c.fill = GridBagConstraints.NONE;
+ c.fill = GridBagConstraints.BOTH;
c.gridx = 0;
c.gridy = 1;
c.weightx = 1.0;
@@ -230,8 +231,6 @@
c.fill = GridBagConstraints.HORIZONTAL;
c.gridwidth = GridBagConstraints.REMAINDER;
c.gridx = 0;
- c.weightx = 0.0;
- c.weighty = 0.0;
c.gridy = 2;
learner.add(hint, c);
@@ -248,7 +247,7 @@
learner.add(advancedPanel, c);
posPanel.setVisible(false);
- c.fill = GridBagConstraints.NONE;
+ c.fill = GridBagConstraints.BOTH;
c.gridwidth = GridBagConstraints.RELATIVE;
c.gridheight = GridBagConstraints.RELATIVE;
c.gridx = 0;
@@ -301,7 +300,8 @@
detail.setVisible(true);
c.fill = GridBagConstraints.NONE;
- c.gridwidth = GridBagConstraints.RELATIVE;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.anchor = GridBagConstraints.LINE_START;
c.gridx = 0;
c.gridy = 3;
c.weightx = 0.0;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -21,6 +21,7 @@
import java.awt.AlphaComposite;
import java.awt.Color;
+import java.awt.Composite;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
@@ -101,13 +102,13 @@
*/
public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m,
String concept, MoreDetailForSuggestedConceptsPanel p) {
- this.setPreferredSize(new Dimension(600, 220));
this.setVisible(false);
this.setForeground(Color.GREEN);
- this.repaint();
+ this.setPreferredSize(new Dimension(500, 230));
eval = desc;
model = m;
panel = p;
+ this.repaint();
id = model.getID();
darkGreen = new Color(0, 100, 0);
darkRed = new Color(205, 0, 0);
@@ -147,7 +148,7 @@
if (eval != null) {
Graphics2D g2D;
g2D = (Graphics2D) g;
-
+ Composite original = g2D.getComposite();
AlphaComposite ac = AlphaComposite.getInstance(
AlphaComposite.SRC_OVER, 0.5f);
g2D.setColor(Color.BLACK);
@@ -162,32 +163,47 @@
}
g2D.setColor(darkGreen);
Ellipse2D circlePoint = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint);
+ g2D.fill(circlePoint);
g2D.setColor(Color.BLACK);
- g2D.drawString("individuals covered by the", 320, p);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(445, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
+ g2D.drawString("and", 460, p);
+ g2D.setColor(Color.YELLOW);
+ g2D.fillOval(490, p - 9, 9, 9);
p = p + 20;
- g2D.drawString("new class expression", 320, p);
- p = p + 20;
if(id.equals(EQUI_STRING)) {
g2D.setColor(darkRed);
Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint2);
+ g2D.fill(circlePoint2);
g2D.setColor(Color.BLACK);
- g2D.drawString("additional or not covered", 320, p);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(445, p - 9, 9, 9);
p = p + 20;
- g2D.drawString("individuals", 320, p);
+ g2D.setColor(darkRed);
+ Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ g2D.fill(circlePoint3);
+ g2D.setColor(Color.BLACK);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.YELLOW);
+ g2D.fillOval(445, p - 9, 9, 9);
} else {
- g2D.setColor(darkRed);
+ g2D.setColor(Color.BLACK);
Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint2);
- g2D.setColor(Color.BLACK);
- g2D.drawString("not covered individuals", 320, p);
+ g2D.fill(circlePoint2);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(445, p - 9, 9, 9);
p = p + 20;
- g2D.setColor(Color.BLACK);
+ g2D.setColor(darkRed);
Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint3);
+ g2D.fill(circlePoint3);
g2D.setColor(Color.BLACK);
- g2D.drawString("additional individuals", 320, p);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.YELLOW);
+ g2D.fillOval(445, p - 9, 9, 9);
}
g2D.setColor(Color.YELLOW);
@@ -311,18 +327,23 @@
for (int i = 0; i < posCovIndVector.size(); i++) {
g2D.setColor(darkGreen);
- g2D.draw(posCovIndVector.get(i).getIndividualPoint());
+ g2D.fill(posCovIndVector.get(i).getIndividualPoint());
}
for (int i = 0; i < posNotCovIndVector.size(); i++) {
g2D.setColor(darkRed);
- g2D.draw(posNotCovIndVector.get(i).getIndividualPoint());
+ g2D.fill(posNotCovIndVector.get(i).getIndividualPoint());
}
for (int i = 0; i < additionalIndividuals.size(); i++) {
g2D.setColor(Color.BLACK);
- g2D.draw(additionalIndividuals.get(i).getIndividualPoint());
+ g2D.fill(additionalIndividuals.get(i).getIndividualPoint());
}
+ if(!((EvaluatedDescriptionClass) eval).isConsistent()) {
+ g2D.setComposite(original);
+ g2D.setColor(darkRed);
+ g2D.drawString("Adding this class expression may lead to an inconsistent ontology.", 0, 220);
+ }
this.setVisible(true);
panel.repaint();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -59,8 +59,8 @@
private final JTextArea concept;
private Set<String> ontologiesStrings;
private final JTextArea conceptText;
- private static final int HEIGHT = 220;
- private static final int WIDTH = 485;
+ private static final int HEIGHT = 230;
+ private static final int WIDTH = 510;
private GraphicalCoveragePanel p;
private final MoreDetailForSuggestedConceptsPanelHandler handler;
@@ -112,7 +112,7 @@
//this method adds the informations for the selected concept to the panel
this.setInformation();
p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), this);
- p.setBounds(5, 0, 600, 350);
+ p.setBounds(5, 0, 600, 700);
//adds all information to the example panel
unsetEverything();
conceptPanel.removeAll();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -19,7 +19,8 @@
*/
package org.dllearner.tools.protege;
-import java.awt.Dimension;
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -39,26 +40,27 @@
private final JSlider minAccuracy;
private final JSlider maxExecutionTime;
private final JSlider nrOfConcepts;
+ private JPanel labelPanel;
+ private JPanel sliderPanel;
private double accuracy;
/**
* Constructor for the Option Panel.
*/
public OptionPanel() {
- setPreferredSize(new Dimension(490, 150));
- setLayout(null);
- minAccuracyLabel = new JLabel("noise in %");
- minAccuracyLabel.setBounds(5, 0, 150, 40);
- maxExecutionTimeLabel = new JLabel("maximum execution time");
- maxExecutionTimeLabel.setBounds(5, 60, 150, 40);
- nrOfConceptsLabel = new JLabel("max. number of results");
- nrOfConceptsLabel.setBounds(5, 120, 150, 40);
+ setLayout(new BorderLayout());
+ labelPanel = new JPanel();
+ labelPanel.setLayout(new GridLayout(0,1));
+ sliderPanel = new JPanel();
+ sliderPanel.setLayout(new GridLayout(0,1));
+ minAccuracyLabel = new JLabel("noise in %: ");
+ maxExecutionTimeLabel = new JLabel("maximum execution time: ");
+ nrOfConceptsLabel = new JLabel("max. number of results: ");
minAccuracy = new JSlider(0, 50, 5);
minAccuracy.setPaintTicks(true);
minAccuracy.setMajorTickSpacing(10);
minAccuracy.setMinorTickSpacing(1);
minAccuracy.setPaintLabels(true);
- minAccuracy.setBounds(200, 0, 200, 40);
maxExecutionTime = new JSlider(0, 40, 8);
@@ -66,7 +68,6 @@
maxExecutionTime.setMajorTickSpacing(10);
maxExecutionTime.setMinorTickSpacing(1);
maxExecutionTime.setPaintLabels(true);
- maxExecutionTime.setBounds(200, 60, 200, 40);
nrOfConcepts = new JSlider(2, 20, 10);
@@ -74,14 +75,16 @@
nrOfConcepts.setMajorTickSpacing(2);
nrOfConcepts.setMinorTickSpacing(1);
nrOfConcepts.setPaintLabels(true);
- nrOfConcepts.setBounds(200, 120, 200, 40);
- add(minAccuracyLabel);
- add(minAccuracy);
- add(maxExecutionTimeLabel);
- add(maxExecutionTime);
- add(nrOfConceptsLabel);
- add(nrOfConcepts);
+ labelPanel.add(minAccuracyLabel);
+ labelPanel.add(maxExecutionTimeLabel);
+ labelPanel.add(nrOfConceptsLabel);
+
+ sliderPanel.add(minAccuracy);
+ sliderPanel.add(maxExecutionTime);
+ sliderPanel.add(nrOfConcepts);
+ add(BorderLayout.WEST, labelPanel);
+ add(BorderLayout.CENTER, sliderPanel);
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -19,7 +19,7 @@
*/
package org.dllearner.tools.protege;
-import java.awt.Dimension;
+import java.awt.BorderLayout;
import javax.swing.DefaultListModel;
import javax.swing.JList;
@@ -48,26 +48,25 @@
//Scroll panel if the suggestions are longer than the Panel itself
private final JScrollPane suggestScroll;
- private static final int WIDTH = 460;
- private static final int HEIGHT = 108;
/**
* This is the constructor for the suggest panel.
* It creates a new Scroll panel and puts the Suggest List in it.
*/
public SuggestClassPanel() {
super();
- this.setPreferredSize(new Dimension(470, 120));
+ this.setLayout(new BorderLayout());
//renders scroll bars if necessary
suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
descriptions = new JList();
descriptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
suggestPanel = new JPanel();
descriptions.setVisible(true);
+ descriptions.setVisibleRowCount(6);
+ descriptions.getPreferredScrollableViewportSize();
suggestPanel.add(descriptions);
- suggestScroll.setPreferredSize(new Dimension(WIDTH, HEIGHT));
suggestScroll.setViewportView(descriptions);
descriptions.setCellRenderer(new SuggestListCellRenderer());
- add(suggestScroll);
+ add(BorderLayout.CENTER, suggestScroll);
}
/**
@@ -86,6 +85,7 @@
*/
public void setSuggestList(DefaultListModel desc) {
descriptions.setModel(desc);
+ descriptions.repaint();
repaint();
}
/**
@@ -104,12 +104,5 @@
descriptions.addMouseListener(action);
}
-
- public void resizePanel(int w, int h) {
- suggestScroll.setPreferredSize(new Dimension(WIDTH + w, HEIGHT + h));
- suggestScroll.setViewportView(descriptions);
- add(suggestScroll);
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
