Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1705] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-04-16 09:41:54
|
Revision: 1705
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1705&view=rev
Author: heeroyuy
Date: 2009-04-16 09:41:39 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
-update manifest file
-some changes on main panel
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/META-INF/MANIFEST.MF
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -155,6 +155,7 @@
hint = new JTextArea();
hint.setEditable(false);
hint.setText("To get suggestions for class expression, please click the button above.");
+ hint.setPreferredSize(new Dimension(485, 30));
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
@@ -197,25 +198,23 @@
runPanel.add(BorderLayout.WEST, run);
runPanel.add(BorderLayout.EAST, wikiPane);
run.setEnabled(false);
+
c.anchor = GridBagConstraints.FIRST_LINE_START;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridy = 0;
c.gridwidth = 3;
- c.ipady = 0;
learner.add(runPanel, c);
sugPanel.setSuggestList(new DefaultListModel());
- sugPanel = sugPanel.updateSuggestClassList();
- c.gridwidth = GridBagConstraints.RELATIVE;
- c.fill = GridBagConstraints.BOTH;
+ c.fill = GridBagConstraints.NONE;
c.gridx = 0;
c.gridy = 1;
c.weightx = 1.0;
c.weighty = 1.0;
c.gridwidth = 2;
- c.ipady = 0;
+ sugPanel.setSuggestList(model.getSuggestModel());
learner.add(sugPanel, c);
accept.setEnabled(false);
@@ -224,44 +223,39 @@
c.weightx = 0.0;
c.weighty = 0.0;
c.gridwidth = 1;
- c.ipady = 0;
addButtonPanel.add("North", accept);
- c.gridwidth = GridBagConstraints.REMAINDER;
+ //c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(addButtonPanel, c);
c.fill = GridBagConstraints.HORIZONTAL;
c.gridwidth = GridBagConstraints.REMAINDER;
- c.ipady = 20;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridy = 2;
- c.gridwidth = 3;
learner.add(hint, c);
advancedPanel.add(advanced);
advancedPanel.add(adv);
advanced.setIcon(icon);
advanced.setSelected(false);
- c.ipady = 5;
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridy = 3;
- c.gridwidth = 3;
learner.add(advancedPanel, c);
posPanel.setVisible(false);
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
+ c.gridheight = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.gridy = 4;
- c.weightx = 1.0;
- c.weighty = 1.0;
+ c.weightx = 0.0;
+ c.weighty = 0.0;
c.gridwidth = 3;
- c.ipady = 65;
learner.add(posPanel, c);
@@ -274,8 +268,6 @@
readThread.start();
hint.setVisible(true);
action.resetToggled();
- addButtonPanel.setBounds(485, 40, 80, 70);
- detail.setBounds(10, 195, 600, 300);
detail.setVisible(true);
sugPanel.setVisible(true);
learnerScroll.setViewportView(learner);
@@ -305,35 +297,32 @@
GridBagConstraints c = new GridBagConstraints();
learner.remove(posPanel);
learner.remove(advancedPanel);
- learner.repaint();
+ //learner.removeAll();
detail.setVisible(true);
- c.fill = GridBagConstraints.BOTH;
- c.gridx = 0;
- c.gridy = 3;
- c.weightx = 1.0;
- c.weighty = 1.0;
- c.gridwidth = 3;
- c.ipady = 60;
- learner.add(detail, c);
- c.ipady = 5;
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
c.gridx = 0;
+ c.gridy = 3;
c.weightx = 0.0;
c.weighty = 0.0;
+ learner.add(detail, c);
+
+
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.LINE_START;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.gridx = 0;
c.gridy = 4;
- c.gridwidth = 3;
learner.add(advancedPanel, c);
c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.LINE_START;
c.gridx = 0;
c.gridy = 5;
- c.gridwidth = 3;
- c.ipady = 70;
- c.weightx = 1.0;
- c.weighty = 1.0;
+ c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(posPanel, c);
+
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
learnerScroll.setViewportView(learner);
learnerScroll.repaint();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -101,7 +101,7 @@
*/
public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m,
String concept, MoreDetailForSuggestedConceptsPanel p) {
- this.setPreferredSize(new Dimension(WIDTH, HEIGHT + 100));
+ this.setPreferredSize(new Dimension(600, 220));
this.setVisible(false);
this.setForeground(Color.GREEN);
this.repaint();
@@ -120,11 +120,23 @@
points = new Vector<IndividualPoint>();
this.computeGraphics(0, 0);
handler = new GraphicalCoveragePanelHandler(this, desc, model);
- oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment),
- ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
+ if(shiftXAxis == 0) {
+ oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment)+3,
+ ELLIPSE_Y_AXIS+3, WIDTH, HEIGHT);
+ } else {
+ oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment),
+ ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
+ }
+
+ if(shiftXAxis == 0){
newConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis
- + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld, HEIGHT
- + distortionOld);
+ + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld+6, HEIGHT
+ + distortionOld+6);
+ } else {
+ newConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis
+ + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld, HEIGHT
+ + distortionOld);
+ }
this.computeIndividualPoints(300);
this.addMouseMotionListener(handler);
this.addMouseListener(handler);
@@ -152,16 +164,18 @@
Ellipse2D circlePoint = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
g2D.draw(circlePoint);
g2D.setColor(Color.BLACK);
- g2D.drawString("individuals covered by the new", 320, p);
+ g2D.drawString("individuals covered by the", 320, p);
p = p + 20;
- g2D.drawString("class expression", 320, p);
+ 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.setColor(Color.BLACK);
- g2D.drawString("additional or not covered individuals", 320, p);
+ g2D.drawString("additional or not covered", 320, p);
+ p = p + 20;
+ g2D.drawString("individuals", 320, p);
} else {
g2D.setColor(darkRed);
Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2009-04-16 09:41:39 UTC (rev 1705)
@@ -6,7 +6,7 @@
Bundle-Description: blablabla
Bundle-Vendor: blablabla
Bundle-DocURL: blablabla
-Bundle-ClassPath: .,lib/junit-4.4.jar,lib/jamon-2.7.jar,lib/pellet/pellet.jar,lib/pellet/aterm-java-1.6.jar,lib/jena/json.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.1.jar,lib/ore-tool/swingx-0.9.2.jar
+Bundle-ClassPath: .,lib/junit-4.4.jar,lib/jamon-2.7.jar,lib/pellet/pellet-core.jar,lib/pellet/pellet-datatypes.jar,lib/pellet/pellet-el.jar,lib/pellet/pellet-explanation.jar,lib/pellet/pellet-owlapi.jar,lib/pellet/pellet-rules.jar,lib/pellet/aterm-java-1.6.jar,lib/jena/json.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.1.jar,lib/ore-tool/swingx-0.9.2.jar
Import-Package: org.osgi.framework,org.apache.log4j
Export-Package: lib
Bundle-Version: 1.0.0
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -59,8 +59,8 @@
private final JTextArea concept;
private Set<String> ontologiesStrings;
private final JTextArea conceptText;
- private static final int HEIGHT = 350;
- private static final int WIDTH = 600;
+ private static final int HEIGHT = 220;
+ private static final int WIDTH = 485;
private GraphicalCoveragePanel p;
private final MoreDetailForSuggestedConceptsPanelHandler handler;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -49,7 +49,7 @@
//set layout for parent Panel
super();
setLayout(new GridLayout(0, 1));
- setPreferredSize(new Dimension(490, 100));
+ setPreferredSize(new Dimension(485, 170));
optionPanel = new OptionPanel();
add(optionPanel);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -56,6 +56,7 @@
*/
public SuggestClassPanel() {
super();
+ this.setPreferredSize(new Dimension(470, 120));
//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.
|
