Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1955] trunk
|
From: <lor...@us...> - 2009-12-27 17:42:55
|
Revision: 1955
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1955&view=rev
Author: lorenz_b
Date: 2009-12-27 17:42:46 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Some small changes in UI.
Added new Look and Feel lib - seems to be much faster than GTK.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java
trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java
trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTable.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTableModel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/MetricsPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/RepairPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/SavePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/RepairPanel.java
Added Paths:
-----------
trunk/lib/ore-tool/looks-2.3.0.jar
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ReasonerProgressUI.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/RolloverButton.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar2.java
Added: trunk/lib/ore-tool/looks-2.3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/ore-tool/looks-2.3.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -1,24 +1,47 @@
package org.dllearner.tools.ore;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import org.dllearner.algorithms.celoe.CELOE;
+import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.ComponentManager;
+import org.dllearner.core.LearningProblemUnsupportedException;
+import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.owl.NamedClass;
+import org.dllearner.learningproblems.ClassLearningProblem;
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
public class LearningManager {
private static LearningManager instance;
+ public enum LearningMode {AUTO, MANUAL};
+ public enum LearningType { EQUIVALENT, SUPER };
+
private List<LearningManagerListener> listeners;
public static final int AUTO_LEARN_MODE = 0;
public static final int MANUAL_LEARN_MODE = 1;
- private int learnMode = 0;
+ private ComponentManager cm;
+ private LearningMode learningMode = LearningMode.AUTO;
+ private LearningType learningType = LearningType.EQUIVALENT;
+
+ private ClassLearningProblem lp;
+ private CELOE la;
+
private NamedClass currentClass2Describe;
+ private int maxExecutionTimeInSeconds;
+ private double noisePercentage;
+ private int maxNrOfResults;
+
+ private ReasonerComponent reasoner;
+
private List<EvaluatedDescriptionClass> newDescriptions;
private List<EvaluatedDescriptionClass> equivalentDescriptions;
@@ -34,18 +57,67 @@
}
public LearningManager(){
+ cm = ComponentManager.getInstance();
+ reasoner = OREManager.getInstance().getReasoner();
listeners = new ArrayList<LearningManagerListener>();
newDescriptions = new ArrayList<EvaluatedDescriptionClass>();
}
- public void setLearningMode(int learningMode){
- this.learnMode = learningMode;
+ public void setLearningMode(LearningMode learningMode){
+ this.learningMode = learningMode;
}
- public int getLearningMode(){
- return learnMode;
+ public void setLearningType(LearningType learningType){
+ this.learningType = learningType;
}
+
+ public void initLearningProblem(){
+ lp = cm.learningProblem(ClassLearningProblem.class, reasoner);
+ try {
+ if(learningType.equals(LearningType.EQUIVALENT)){
+ cm.applyConfigEntry(lp, "type", "equivalent");
+ } else {
+ cm.applyConfigEntry(lp, "type", "superClass");
+ }
+ lp.getConfigurator().setClassToDescribe(new URL(currentClass2Describe.toString()));
+ lp.init();
+ } catch (ComponentInitException e) {
+ e.printStackTrace();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void initLearningAlgorithm(){
+ try {
+ la = cm.learningAlgorithm(CELOE.class, lp, reasoner);
+ la.getConfigurator().setMaxExecutionTimeInSeconds(maxExecutionTimeInSeconds);
+ la.getConfigurator().setUseNegation(false);
+ la.getConfigurator().setNoisePercentage(noisePercentage);
+ la.getConfigurator().setMaxNrOfResults(maxNrOfResults);
+
+ } catch (LearningProblemUnsupportedException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ try {
+ la.init();
+ } catch (ComponentInitException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public boolean isManualLearningMode(){
+ return learningMode.equals(LearningMode.MANUAL);
+ }
+
+ public LearningMode getLearningMode(){
+ return learningMode;
+ }
+
public List<EvaluatedDescriptionClass> getNewDescriptions() {
return newDescriptions;
}
@@ -58,6 +130,18 @@
return currentClass2Describe;
}
+ public void setMaxExecutionTimeInSeconds(int maxExecutionTimeInSeconds) {
+ this.maxExecutionTimeInSeconds = maxExecutionTimeInSeconds;
+ }
+
+ public void setNoisePercentage(double noisePercentage) {
+ this.noisePercentage = noisePercentage;
+ }
+
+ public void setMaxNrOfResults(int maxNrOfResults) {
+ this.maxNrOfResults = maxNrOfResults;
+ }
+
public void setNewDescriptions(List<List<EvaluatedDescriptionClass>> descriptions) {
newDescriptions.clear();
newDescriptions.addAll(descriptions.get(0));
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -44,7 +44,9 @@
import org.dllearner.tools.ore.ui.wizard.descriptors.RepairPanelDescriptor;
import org.dllearner.tools.ore.ui.wizard.descriptors.SavePanelDescriptor;
+import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+
/**
* Main class starting the wizard and registering wizard panels.
* @author Lorenz Buehmann
@@ -62,8 +64,7 @@
try {
-// UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ UIManager.setLookAndFeel(new PlasticLookAndFeel());
UIDefaults def = UIManager.getLookAndFeelDefaults();
Vector<?> vec = new Vector<Object>(def.keySet());
Collections.sort(vec, new Comparator<Object>() {
@@ -83,15 +84,6 @@
}
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (UnsupportedLookAndFeelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -4,13 +4,13 @@
import javax.swing.JFrame;
-import org.dllearner.tools.ore.ui.StatusBar;
+import org.dllearner.tools.ore.ui.StatusBar2;
public class TaskManager {
private static TaskManager instance;
- private StatusBar statusBar;
+ private StatusBar2 statusBar;
private JFrame dialog;
public static synchronized TaskManager getInstance(){
@@ -20,11 +20,11 @@
return instance;
}
- public void setStatusBar(StatusBar statusBar){
+ public void setStatusBar(StatusBar2 statusBar){
this.statusBar = statusBar;
}
- public StatusBar getStatusBar(){
+ public StatusBar2 getStatusBar(){
return statusBar;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -68,6 +68,7 @@
column6.setResizable(false);
// setRowHeight(getRowHeight() + 4);
setRowHeightEnabled(true);
+ setRowHeight(20);
getColumn(0).setCellRenderer(new TextAreaRenderer());
getColumn(1).setMaxWidth(60);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -41,6 +41,7 @@
import javax.swing.JTextField;
import javax.swing.JToggleButton;
import javax.swing.ProgressMonitor;
+import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.Timer;
import javax.swing.border.TitledBorder;
@@ -113,14 +114,15 @@
public ExtractFromSparqlDialog(JFrame owner) {
super(owner, "Extract fragment from SPARQL endpoint", true);
- getLocale().setDefault(Locale.ENGLISH);
+ getLocale();
+ Locale.setDefault(Locale.ENGLISH);
// Create the controls
createControls();
//create main panel
createSparqlPanel();
//add predefined endpoints
- addPredefinedEndpoints();
+// addPredefinedEndpoints();
positionErrorDialog(owner);
}
@@ -180,8 +182,9 @@
endPointHelpPanel.setBorder(new TitledBorder("SPARQL endpoint"));
panel.add(endPointHelpPanel, c);
- JPanel classHolderPanel = new JPanel();
- classHolderPanel.setLayout(new GridLayout(0, 1));
+ JPanel classHolderPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+// classHolderPanel.setLayout(new GridLayout(2, 1));
// classHolderPanel.setBorder(new TitledBorder("Class to investigate"));
asLabelButton = new JRadioButton("label");
asURLButton = new JRadioButton("URI");
@@ -194,10 +197,15 @@
buttonPanel.add(asURLButton);
buttonPanel.add(asLabelButton);
- classHolderPanel.add(buttonPanel);
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+
+ classHolderPanel.add(buttonPanel,gbc);
classField = new JTextField();
classField.getDocument().addDocumentListener(this);
- classHolderPanel.add(classField);
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ classHolderPanel.add(classField,gbc);
HelpablePanel classHelpPanel = new HelpablePanel(classHolderPanel);
classHelpPanel.setHelpText(classHelpText);
classHelpPanel.setBorder(new TitledBorder("Class to investigate"));
@@ -328,8 +336,19 @@
public int showDialog(){
setSize(500, 400);
- setVisible(true);
- setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ setLocation(screenSize.width / 2 - getWidth() / 2,
+ screenSize.height / 2 - getHeight() / 2);
+ setVisible(true);
+
+ }
+ });
+
return returnCode;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -1,59 +1,51 @@
package org.dllearner.tools.ore.ui;
import java.awt.Component;
-import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
import javax.swing.ButtonGroup;
+import javax.swing.Icon;
import javax.swing.ImageIcon;
-import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.TitledBorder;
+import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+
public class HelpablePanel extends JPanel {
/**
*
*/
private static final long serialVersionUID = 2511480671795808029L;
- private JButton helpButton;
+ private RolloverButton helpButton;
+ private static Icon helpIcon = new ImageIcon(HelpablePanel.class.getResource("Help-16x16.png"));
+
private String helpText = "TODO";
private GridBagConstraints c;
public HelpablePanel(){
setLayout(new GridBagLayout());
c = new GridBagConstraints();
-// setLayout(new BorderLayout());
- helpButton = new JButton(new ImageIcon(this.getClass().getResource("Help-16x16.png")));
- helpButton.setBorderPainted(false);
- helpButton.setContentAreaFilled(false);
-// helpButton.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
- helpButton.setPreferredSize(new Dimension(16, 16));
- helpButton.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseEntered(MouseEvent e) {
- helpButton.setBorderPainted(true);
- helpButton.setContentAreaFilled(true);
- }
-
- @Override
- public void mouseExited(MouseEvent e) {
- helpButton.setBorderPainted(false);
- helpButton.setContentAreaFilled(false);
- }
-
- });
+
+ c.anchor = GridBagConstraints.FIRST_LINE_END;
+ c.weightx = 0.0;
+ c.weighty = 0.0;
+ c.gridx = 1;
+ c.gridy = 0;
+// add(helpButton, c);
+ helpButton = new RolloverButton();
+ helpButton.setIcon(helpIcon);
helpButton.addActionListener(new ActionListener() {
@Override
@@ -67,15 +59,6 @@
}
});
-// JPanel holderPanel = new JPanel();
-// holderPanel.setLayout(new BorderLayout());
-// holderPanel.add(helpButton, BorderLayout.EAST);
-// add(holderPanel, BorderLayout.NORTH);
- c.anchor = GridBagConstraints.FIRST_LINE_END;
- c.weightx = 0.0;
- c.weighty = 0.0;
- c.gridx = 1;
- c.gridy = 0;
add(helpButton, c);
}
@@ -93,7 +76,8 @@
this.helpText = helpText;
}
- public static void main(String[] args){
+ public static void main(String[] args) throws ClassNotFoundException, InstantiationException, IllegalAccessException, UnsupportedLookAndFeelException{
+ UIManager.setLookAndFeel(new PlasticLookAndFeel());
JFrame frame = new JFrame();
JPanel learnTypePanel = new JPanel();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -54,9 +54,9 @@
JPanel holderPanel = new JPanel();
holderPanel.setLayout(new BorderLayout());
labelPanel = new JPanel();
- labelPanel.setLayout(new GridLayout(0, 1));
+ labelPanel.setLayout(new GridLayout(0, 1, 5, 5));
sliderPanel = new JPanel();
- sliderPanel.setLayout(new GridLayout(0, 1));
+ sliderPanel.setLayout(new GridLayout(0, 1, 5, 5));
minAccuracyLabel = new JLabel("Noise in %: ");
maxExecutionTimeLabel = new JLabel("Max. execution time in s: ");
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTable.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTable.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -1,14 +1,17 @@
package org.dllearner.tools.ore.ui;
import java.awt.Component;
+import java.awt.SystemColor;
import java.awt.event.MouseEvent;
+import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.table.TableCellRenderer;
-import org.dllearner.learningproblems.EvaluatedDescriptionClass;
+import org.dllearner.tools.ore.OREManager;
+import org.dllearner.tools.ore.ui.rendering.ProgressBarTableCellRenderer;
import org.jdesktop.swingx.JXTable;
public class MarkableClassExpressionsTable extends JXTable{
@@ -16,12 +19,13 @@
*
*/
private static final long serialVersionUID = 4193878042914394758L;
- private ImageIcon icon = new ImageIcon("src/dl-learner/org/dllearner/tools/ore/untoggled.gif");
+ private Icon icon = new ImageIcon(OREManager.class.getResource("untoggled.gif"));
public MarkableClassExpressionsTable(){
super(new MarkableClassExpressionsTableModel());
// getColumn(1).setCellRenderer(new ManchesterSyntaxTableCellRenderer());
getColumn(0).setMaxWidth(30);
+ getColumn(0).setCellRenderer(new ProgressBarTableCellRenderer());
setTableHeader(null);
setBorder(null);
setShowVerticalLines(false);
@@ -29,6 +33,7 @@
setRowSelectionAllowed(false);
setColumnSelectionAllowed(false);
setCellSelectionEnabled(false);
+ setBackground(SystemColor.control);
getColumn(0).setCellRenderer(new TableCellRenderer() {
@Override
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTableModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTableModel.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/MarkableClassExpressionsTableModel.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -47,7 +47,6 @@
return "";
}
} else {
-
OWLDataFactory factory = OREManager.getInstance().getReasoner().getOWLOntologyManager().getOWLDataFactory();
OWLClass cl = factory.getOWLClass(
OREManager.getInstance().getCurrentClass2Learn().getURI());
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/MetricsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/MetricsPanel.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/MetricsPanel.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -3,6 +3,7 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Font;
+import java.awt.SystemColor;
import java.util.ArrayList;
import java.util.List;
@@ -65,7 +66,7 @@
table.setGridColor(Color.LIGHT_GRAY);
table.setRowHeight(table.getRowHeight() + 4);
table.setShowGrid(true);
-
+ table.setBackground(SystemColor.control);
table.getColumnModel().getColumn(1).setMaxWidth(150);
table.getColumnModel().setColumnMargin(2);
table.setFont(getFont().deriveFont(Font.BOLD, 12.0f));
Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ReasonerProgressUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ReasonerProgressUI.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ReasonerProgressUI.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -0,0 +1,265 @@
+package org.dllearner.tools.ore.ui;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+import org.mindswap.pellet.utils.progress.ProgressMonitor;
+
+
+
+
+/**
+ * Author: Matthew Horridge<br>
+ * The University Of Manchester<br>
+ * Medical Informatics Group<br>
+ * Date: 10-Oct-2006<br><br>
+ * <p/>
+ * mat...@cs...<br>
+ * www.cs.man.ac.uk/~horridgm<br><br>
+ */
+public class ReasonerProgressUI implements ProgressMonitor {
+
+
+ private JLabel label;
+
+ private JProgressBar progressBar;
+
+ private JDialog window;
+
+ private boolean cancelled;
+
+ private Action cancelledAction;
+
+ private String currentClass;
+
+ private static final int CANCEL_TIMEOUT_MS = 5000;
+
+ private Timer cancelTimeout;
+
+ private int progress;
+ private int progressLength;
+
+ public ReasonerProgressUI(JFrame frame) {
+ JPanel panel = new JPanel(new BorderLayout(7, 7));
+ progressBar = new JProgressBar();
+ panel.add(progressBar, BorderLayout.SOUTH);
+ panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ label = new JLabel("Classifying...");
+ panel.add(label, BorderLayout.NORTH);
+
+ window = new JDialog(frame,"Reasoner progress",true);
+ cancelledAction = new AbstractAction("Cancel") {
+ public void actionPerformed(ActionEvent e) {
+ setCancelled(true);
+ }
+ };
+ JButton cancelledButton = new JButton(cancelledAction);
+
+ window.setLocation(400, 400);
+ JPanel holderPanel = new JPanel(new BorderLayout(7, 7));
+ holderPanel.add(panel, BorderLayout.NORTH);
+ holderPanel.add(cancelledButton, BorderLayout.EAST);
+ holderPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 10));
+ window.getContentPane().setLayout(new BorderLayout());
+ window.getContentPane().add(holderPanel, BorderLayout.NORTH);
+ window.pack();
+ Dimension windowSize = window.getSize();
+ window.setSize(400, windowSize.height);
+ window.setResizable(false);
+
+ cancelTimeout = new Timer(CANCEL_TIMEOUT_MS, new ActionListener() {
+ public void actionPerformed(ActionEvent event) {
+ }
+ });
+ cancelTimeout.setRepeats(false);
+ }
+
+
+
+
+ public void setIndeterminate(boolean b) {
+ progressBar.setIndeterminate(b);
+ }
+
+
+ private void setCancelled(boolean b) {
+ cancelled = b;
+ if (currentClass != null) {
+ JOptionPane.showMessageDialog(window,
+ "Cancelled while classifying " + currentClass,
+ "Cancelled classification",
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ if (b){
+ label.setText("Cancelling...");
+ cancelTimeout.start();
+ }
+ else{
+ cancelTimeout.stop();
+ }
+ }
+
+ public void setProgressIndeterminate(boolean b) {
+ progressBar.setIndeterminate(b);
+ }
+
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+
+ private void showWindow() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ window.setLocation(screenSize.width / 2 - window.getWidth() / 2,
+ screenSize.height / 2 - window.getHeight() / 2);
+ window.setVisible(true);
+ }
+ });
+ }
+
+
+ private void hideWindow() {
+
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ if (cancelled && currentClass != null) {
+ JOptionPane.showMessageDialog(window,
+ "Cancelled while classifying " + currentClass,
+ "Cancelled classification",
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ window.setVisible(false);
+ }
+ });
+ }
+
+
+ @Override
+ public int getProgress() {
+ return progress;
+ }
+
+
+ @Override
+ public int getProgressPercent() {
+ return (int)(progress * 100.0) / progressBar.getMaximum();
+ }
+
+
+ @Override
+ public void incrementProgress() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue(progress++);
+// double percentDone = (progress * 100.0) / progressBar.getMaximum();
+// if(percentDone / 100.0 == 0) {
+// label.setText("Classifying ontology " + getProgressPercent() + " %");
+// }
+ }
+ });
+ }
+
+
+ @Override
+ public boolean isCanceled() {
+ return cancelled;
+ }
+
+
+ @Override
+ public void setProgress(int progr) {
+ this.progress = progr;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue((int) progress);
+ double percentDone = (progress * 100.0) / progressBar.getMaximum();
+// if(percentDone / 100.0 == 0) {
+// label.setText("Classifying ontology " + ((int) percentDone) + " %");
+// }
+ }
+ });
+
+ }
+
+
+ @Override
+ public void setProgressLength(int length) {
+ this.progressLength = length;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue(0);
+ progressBar.setMaximum((int) progressLength);
+ }
+ });
+
+ }
+
+
+ @Override
+ public void setProgressMessage(final String message) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ label.setText(message);
+ }
+ });
+
+ }
+
+
+ @Override
+ public void setProgressTitle(final String title) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ window.setTitle(title);
+ }
+ });
+
+
+ }
+
+
+ @Override
+ public void taskFinished() {
+ cancelTimeout.stop();
+ hideWindow();
+ currentClass = null;
+ progress = 0;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue(progress);
+ }
+ });
+
+
+
+ }
+
+
+ @Override
+ public void taskStarted() {
+// label.setText("Classifying ontology ");
+ currentClass = null;
+ setCancelled(false);
+ showWindow();
+
+ }
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -7,6 +7,7 @@
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
import org.dllearner.tools.ore.ui.rendering.ManchesterSyntaxTableCellRenderer;
+import org.dllearner.tools.ore.ui.rendering.ProgressBarTableCellRenderer;
import org.jdesktop.swingx.JXTable;
import org.jdesktop.swingx.decorator.HighlighterFactory;
@@ -25,9 +26,9 @@
// setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
setModel(new ResultTableModel());
setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-// ProgressBarTableCellRenderer renderer = new ProgressBarTableCellRenderer();
-// renderer.setBackground(getBackground());
-// getColumn(0).setCellRenderer(renderer);
+ ProgressBarTableCellRenderer renderer = new ProgressBarTableCellRenderer();
+ renderer.setBackground(getBackground());
+ getColumn(0).setCellRenderer(renderer);
getColumn(1).setCellRenderer(new ManchesterSyntaxTableCellRenderer());
setColumnSizes();
getColumn(0).setResizable(false);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -42,7 +42,7 @@
@Override
public Object getValueAt(int rowIndex, int columnIndex) {
if(columnIndex == 0){
- return df.format(resultList.get(rowIndex).getAccuracy());
+ return (int)(resultList.get(rowIndex).getAccuracy() *100);//df.format(resultList.get(rowIndex).getAccuracy());
} else {
return resultList.get(rowIndex).getDescription();
}
Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/RolloverButton.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/RolloverButton.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/RolloverButton.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -0,0 +1,29 @@
+package org.dllearner.tools.ore.ui;
+
+import java.awt.Graphics;
+
+import javax.swing.JButton;
+
+public class RolloverButton extends JButton
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1491518775798752382L;
+
+
+public RolloverButton()
+ {
+ setRequestFocusEnabled( false );
+ setRolloverEnabled( true );
+ }
+
+
+ protected void paintBorder( Graphics g )
+ {
+ if( model.isRollover() )
+ {
+ super.paintBorder( g );
+ }
+ }
+}
Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar2.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar2.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar2.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -0,0 +1,254 @@
+package org.dllearner.tools.ore.ui;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.SystemColor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JSeparator;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+import org.dllearner.tools.ore.OREManager;
+import org.mindswap.pellet.utils.progress.ProgressMonitor;
+import org.semanticweb.owl.model.OWLAxiom;
+
+import com.clarkparsia.explanation.util.ExplanationProgressMonitor;
+
+public class StatusBar2 extends JPanel implements ProgressMonitor, ExplanationProgressMonitor, PropertyChangeListener {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private JLabel infoLabel;
+ private JProgressBar progressBar;
+
+ private boolean cancelled;
+
+ private boolean indeterminate;
+
+ private Action cancelledAction;
+
+ private static final int CANCEL_TIMEOUT_MS = 5000;
+
+ private Timer cancelTimeout;
+
+ private int progress;
+ private int progressLength;
+ private String progressTitle;
+
+ private static Icon cancelIcon = new ImageIcon(OREManager.class.getResource("close.png"));
+
+ public StatusBar2() {
+ setLayout(new BorderLayout());
+
+ infoLabel = new JLabel("");
+ progressBar = new JProgressBar();
+
+ JPanel rightPanel = new JPanel(new BorderLayout());
+ rightPanel.add(new JLabel(new AngledLinesWindowsCornerIcon()), BorderLayout.SOUTH);
+ rightPanel.setOpaque(false);
+ JPanel leftPanel = new JPanel(new FlowLayout());
+ RolloverButton cancelButton = new RolloverButton();
+ cancelledAction = new AbstractAction() {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3239121794063572683L;
+
+ public void actionPerformed(ActionEvent e) {
+ setCancelled(true);
+ }
+ };
+ cancelButton.setAction(cancelledAction);
+ cancelButton.setIcon(cancelIcon);
+ leftPanel.add(cancelButton);
+ leftPanel.add(progressBar);
+ leftPanel.add(new JSeparator(JSeparator.VERTICAL));
+ leftPanel.add(infoLabel);
+ leftPanel.add(new JSeparator(JSeparator.VERTICAL));
+ leftPanel.setOpaque(false);
+ add(leftPanel, BorderLayout.WEST);
+// add(rightPanel, BorderLayout.EAST);
+// setBackground(SystemColor.control);
+
+ cancelTimeout = new Timer(CANCEL_TIMEOUT_MS, new ActionListener() {
+ public void actionPerformed(ActionEvent event) {
+ setCancelled(true);
+ }
+ });
+ cancelTimeout.setRepeats(false);
+ }
+
+ public void setMessage(String message) {
+ infoLabel.setText(message);
+ }
+
+ public void showProgress(boolean b) {
+ cancelled = false;
+ indeterminate = b;
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ progressBar.setIndeterminate(indeterminate);
+
+ }
+ });
+ }
+
+ public void setMaximumValue(int max) {
+ progressBar.setMaximum(max);
+ }
+
+ private void setCancelled(boolean b) {
+ cancelled = b;
+
+ if (b) {
+ infoLabel.setText("Cancelling...");
+ cancelTimeout.start();
+ } else {
+ cancelTimeout.stop();
+ }
+ }
+
+ @Override
+ public void foundAllExplanations() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void foundExplanation(Set<OWLAxiom> explanation) {
+
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if ("progress" == evt.getPropertyName()) {
+ int progress = (Integer) evt.getNewValue();
+ setProgress(progress);
+ }
+
+ }
+
+ @Override
+ public int getProgress() {
+ return progress;
+ }
+
+ @Override
+ public int getProgressPercent() {
+ return (int) (progress * 100.0) / progressBar.getMaximum();
+ }
+
+ @Override
+ public void incrementProgress() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue(progress++);
+ // double percentDone = (progress * 100.0) /
+ // progressBar.getMaximum();
+ // if(percentDone / 100.0 == 0) {
+ // label.setText("Classifying ontology " + getProgressPercent()
+ // + " %");
+ // }
+ }
+ });
+
+ }
+
+ @Override
+ public boolean isCanceled() {
+ return cancelled;
+ }
+
+ @Override
+ public void setProgress(int progr) {
+ this.progress = progr;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue((int) progress);
+ double percentDone = (progress * 100.0) / progressBar.getMaximum();
+ // if(percentDone / 100.0 == 0) {
+ // label.setText("Classifying ontology " + ((int) percentDone) +
+ // " %");
+ // }
+ }
+ });
+
+ }
+
+ @Override
+ public void setProgressLength(int length) {
+ this.progressLength = length;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue(0);
+ progressBar.setMaximum((int) progressLength);
+ }
+ });
+
+ }
+
+ @Override
+ public void setProgressMessage(String message) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ // label.setText(message);
+ }
+ });
+
+ }
+
+ @Override
+ public void setProgressTitle(String title) {
+ this.progressTitle = title;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ infoLabel.setText(progressTitle + "...");
+ }
+ });
+
+ }
+
+ @Override
+ public void taskFinished() {
+ cancelTimeout.stop();
+ progress = 0;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setValue(progress);
+ }
+ });
+
+ }
+
+ @Override
+ public void taskStarted() {
+
+ setCancelled(false);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ progressBar.setIndeterminate(false);
+ }
+ });
+ }
+
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -46,6 +46,7 @@
import org.dllearner.tools.ore.RecentManager;
import org.dllearner.tools.ore.TaskManager;
import org.dllearner.tools.ore.ui.StatusBar;
+import org.dllearner.tools.ore.ui.StatusBar2;
import org.dllearner.tools.ore.ui.wizard.panels.LeftPanel;
/**
@@ -106,7 +107,7 @@
private JButton nextButton;
private JButton cancelButton;
private JTextPane informationsField;
- private StatusBar statusBar;
+ private StatusBar2 statusBar;
private int returnCode;
@@ -391,7 +392,7 @@
JPanel buttonPanel = new JPanel();
JSeparator separator = new JSeparator();
Box buttonBox = new Box(BoxLayout.X_AXIS);
- statusBar = new StatusBar();
+ statusBar = new StatusBar2();
cardPanel = new JPanel();
cardPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
@@ -427,7 +428,7 @@
buttonBox.add(cancelButton);
buttonPanel.add(buttonBox, java.awt.BorderLayout.EAST);
- buttonPanel.add(statusBar, BorderLayout.SOUTH);
+ buttonPanel.add(statusBar, BorderLayout.WEST);
Color color = UIManager.getColor("Panel.background");
informationsField = new JTextPane();
@@ -490,7 +491,7 @@
}
- public StatusBar getStatusBar() {
+ public StatusBar2 getStatusBar() {
return statusBar;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -185,14 +185,13 @@
}
else if(nextPanelDescriptor.equals(RepairPanelDescriptor.IDENTIFIER)){
-
RepairPanelDescriptor repair = ((RepairPanelDescriptor) model
.getPanelHashMap().get(nextPanelDescriptor));
- if(LearningManager.getInstance().getLearningMode() == LearningManager.AUTO_LEARN_MODE){
- repair.setManualPanel(false);
+ if(LearningManager.getInstance().isManualLearningMode()){
+ repair.setManualPanel(true);
repair.fillExamplesLists();
} else {
- repair.setManualPanel(true);
+ repair.setManualPanel(false);
repair.fillExamplesLists();
}
@@ -211,20 +210,15 @@
}
if(nextPanelDescriptor.equals(RepairPanelDescriptor.IDENTIFIER)){
-
RepairPanelDescriptor repair = ((RepairPanelDescriptor) model
.getPanelHashMap().get(nextPanelDescriptor));
- if(LearningManager.getInstance().getLearningMode() == LearningManager.AUTO_LEARN_MODE){
- repair.setManualPanel(false);
+ if(LearningManager.getInstance().isManualLearningMode()){
+ repair.setManualPanel(true);
repair.fillExamplesLists();
} else {
- repair.setManualPanel(true);
+ repair.setManualPanel(false);
repair.fillExamplesLists();
}
-
-
-
-
}
if (nextPanelDescriptor instanceof WizardPanelDescriptor.FinishIdentifier) {
wizard.close(Wizard.FINISH_RETURN_CODE);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -43,6 +43,7 @@
import org.dllearner.tools.ore.OREManager;
import org.dllearner.tools.ore.OREManagerListener;
import org.dllearner.tools.ore.TaskManager;
+import org.dllearner.tools.ore.LearningManager.LearningMode;
import org.dllearner.tools.ore.ui.wizard.WizardPanelDescriptor;
import org.dllearner.tools.ore.ui.wizard.panels.ClassChoosePanel;
@@ -219,11 +220,11 @@
if(e.getActionCommand().equals("auto")){
classChoosePanel.setAutoLearningPanel(true);
getWizard().getInformationField().setText(AUTO_LEARN_INFORMATION);
- LearningManager.getInstance().setLearningMode(LearningManager.AUTO_LEARN_MODE);
+ LearningManager.getInstance().setLearningMode(LearningMode.AUTO);
} else {
classChoosePanel.setAutoLearningPanel(false);
getWizard().getInformationField().setText(MANUAL_LEARN_INFORMATION);
- LearningManager.getInstance().setLearningMode(LearningManager.MANUAL_LEARN_MODE);
+ LearningManager.getInstance().setLearningMode(LearningMode.MANUAL);
retrieveClasses();
}
setNextButtonAccordingToConceptSelected();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -36,15 +36,12 @@
import org.dllearner.tools.ore.TaskManager;
import org.dllearner.tools.ore.ui.ExtractFromSparqlDialog;
import org.dllearner.tools.ore.ui.LinkLabel;
-import org.dllearner.tools.ore.ui.StatusBar;
import org.dllearner.tools.ore.ui.wizard.WizardPanelDescriptor;
import org.dllearner.tools.ore.ui.wizard.panels.KnowledgeSourcePanel;
import org.protege.editor.core.ui.OpenFromURIPanel;
import org.protege.editor.core.ui.error.ErrorLogPanel;
-import org.protege.editor.owl.model.OntologyFileFilter;
import org.semanticweb.owl.io.UnparsableOntologyException;
import org.semanticweb.owl.model.OWLOntologyCreationException;
-import org.semanticweb.owl.model.OWLOntologyFormat;
/**
* Wizard panel descriptor where knowledge source is selected.
@@ -109,7 +106,7 @@
OREManager.getInstance().setCurrentKnowledgeSource(uri);
currentURI = uri;
TaskManager.getInstance().setTaskStarted("Loading ontology...");
- new OntologyLoadingTask(getWizard().getStatusBar()).execute();
+ new OntologyLoadingTask().execute();
}
@@ -168,7 +165,7 @@
int ret = dialog.showDialog();
if(ret == ExtractFromSparqlDialog.OK_RETURN_CODE){
OREManager.getInstance().setCurrentKnowledgeSource(dialog.getKnowledgeSource());
- new OntologyLoadingTask(getWizard().getStatusBar()).execute();
+ new OntologyLoadingTask().execute();
}
}
@@ -191,11 +188,9 @@
class OntologyLoadingTask extends SwingWorker<Void, Void>{
- private StatusBar statusBar;
private OREManager oreMan;
- public OntologyLoadingTask(StatusBar statusBar) {
- this.statusBar = statusBar;
+ public OntologyLoadingTask() {
this.oreMan = OREManager.getInstance();
}
@@ -205,20 +200,18 @@
try{
oreMan.initPelletReasoner();
+// ReasonerProgressUI ui = new ReasonerProgressUI(getWizard().getDialog());
+// oreMan.getReasoner().getReasoner().getKB().getTaxonomyBuilder().setProgressMonitor(ui);
RecentManager.getInstance().addURI(currentURI);
RecentManager.getInstance().serialize();
if(oreMan.consistentOntology()){
- statusBar.setMessage("Classifying ontology...");
oreMan.getReasoner().classify();
- statusBar.setMessage("Realising ontology...");
oreMan.getReasoner().realise();
}
} catch(URISyntaxException e){
cancel(true);
- statusBar.showProgress(false);
- statusBar.setProgressTitle("");
getWizard().getDialog().setCursor(null);
JOptionPane.showMessageDialog(getWizard().getDialog(),
"Error loading ontology. Please check URI and try again.",
@@ -233,8 +226,6 @@
} catch(OWLOntologyCreationException e){
cancel(true);
- statusBar.showProgress(false);
- statusBar.setProgressTitle("");
getWizard().getDialog().setCursor(null);
if(e.getClass().equals(UnparsableOntologyException.class)){
JOptionPane.showMessageDialog(getWizard().getDialog(),
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/RepairPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/RepairPanelDescriptor.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/RepairPanelDescriptor.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -85,7 +85,7 @@
@Override
public Object getBackPanelDescriptor() {
- if(LearningManager.getInstance().getLearningMode() == LearningManager.MANUAL_LEARN_MODE){
+ if(LearningManager.getInstance().isManualLearningMode()){
return ManualLearnPanelDescriptor.IDENTIFIER;
} else {
return AutoLearnPanelDescriptor.IDENTIFIER;
@@ -108,19 +108,18 @@
public void setManualPanel(boolean value){
repairPanel.setManualStyle(value);
- repairPanel.addActionListeners(this);
}
/**
* Method to control actions by button pressed.
*/
public void actionPerformed(ActionEvent event) {
- if(event.getActionCommand().equals("next")){
+ if(event.getActionCommand().equals("next")){
LearningManager.getInstance().setNextDescription();
} else {
modi = OREManager.getInstance().getModifier();
String actionType = ((JButton) event.getSource()).getParent().getName();
- if(actionType.equals("negative")){
+ if(actionType.equals("negative") && repairPanel.getNegFailureTable().getSelectedRow() >=0){
Individual ind = repairPanel.getNegFailureTable().getSelectedIndividual();
if(event.getActionCommand().equals("negRepair")){
RepairDialog negDialog = new RepairDialog(ind, getWizard().getDialog(), "neg");
@@ -140,7 +139,7 @@
repairPanel.getNegFailureTable().removeIndividual(ind);
}
- } else if(actionType.equals("positive")){
+ } else if(actionType.equals("positive") && repairPanel.getPosFailureTable().getSelectedRow() >=0){
Individual ind = repairPanel.getPosFailureTable().getSelectedIndividual();
if(event.getActionCommand().equals("posRepair")){
RepairDialog posDialog = new RepairDialog(ind, getWizard().getDialog(), "pos");
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/SavePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/SavePanelDescriptor.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/SavePanelDescriptor.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -87,7 +87,7 @@
@Override
public Object getBackPanelDescriptor() {
- if(LearningManager.getInstance().getLearningMode() == LearningManager.MANUAL_LEARN_MODE){
+ if(LearningManager.getInstance().isManualLearningMode()){
if(OREManager.getInstance().getNewClassDescription().getAccuracy() == 1.0){
return ManualLearnPanelDescriptor.IDENTIFIER;
} else {
@@ -103,7 +103,7 @@
if(e.getActionCommand().equals("Save and go to class choose panel")){
if(saveOntology()){
- if(LearningManager.getInstance().getLearningMode() == LearningManager.MANUAL_LEARN_MODE){
+ if(LearningManager.getInstance().isManualLearningMode()){
getWizard().setCurrentPanel(ClassChoosePanelDescriptor.IDENTIFIER);
} else {
getWizard().setCurrentPanel(AutoLearnPanelDescriptor.IDENTIFIER);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/RepairPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/RepairPanel.java 2009-12-27 16:31:29 UTC (rev 1954)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/RepairPanel.java 2009-12-27 17:42:46 UTC (rev 1955)
@@ -60,13 +60,43 @@
private JButton nextButton;
+
private MarkableClassExpressionsTable descriptionsTable;
public RepairPanel() {
setLayout(new GridBagLayout());
- createAutoUI();
+// createAutoUI();
+ createUI();
}
+ private void createUI(){
+ GridBagConstraints c = new GridBagConstraints();
+ c.fill = GridBagConstraints.BOTH;
+ c.weighty = 0.3;
+ c.weightx = 1.0;
+ c.gridx = 0;
+ c.gridy = 0;
+// c.gridwidth = GridBagConstraints.REMAINDER;
+ add(createDescriptionsPanel(), c);
+
+ c.fill = GridBagConstraints.NONE;
+ c.gridx = 1;
+ c.gridy = 0;
+ nextButton = new JButton("Next suggestion");
+ nextButton.setActionCommand("next");
+ add(nextButton, c);
+
+ c.fill = GridBagConstraints.BOTH;
+ c.gridwidth = 1;
+ c.gridy = 1;
+ c.gridx = 0;
+ c.weightx = 0.5;
+ c.weighty = 0.5;
+ add(createPosPanel(), c);
+ c.gridx = 1;
+ add(createNegPanel(), c);
+ }
+
private void createAutoUI(){
GridBagConstraints c = new GridBagConstraints();
c.fill = GridBagConstraints.BOTH;
@@ -217,11 +247,13 @@
}
public void setManualStyle(boolean value){
- removeAll();
+// removeAll();
if(value){
- createManualUI();
+// createManualUI();
+ nextButton.setVisible(false);
} else {
- createAutoUI();
+// createAutoUI();
+ nextButton.setVisible(true);
}
repaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
