Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [378] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-01-16 01:53:36
|
Revision: 378
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=378&view=rev
Author: tonytacker
Date: 2008-01-15 17:53:33 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
This Version runs with file and URL. At moment you have to click from left to right all tabs and in every tab the init-button. It will be improved later. Normally you can use both SparceEndpoints. If it is there something wrong with GUI let me know. I need some links for testing. Greetings -Tilo-
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/Config.java
trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java
trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-01-15 16:00:04 UTC (rev 377)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-01-16 01:53:33 UTC (rev 378)
@@ -43,7 +43,7 @@
public class Config {
private ComponentManager cm = ComponentManager.getInstance();
private KnowledgeSource source;
- private File selectedFile;
+ private String uri;
private ReasonerComponent reasoner;
private ReasoningService rs;
private String[] kbBoxItems = {"Pleae select a type", "KBFile", "OWLFile", "SparqleEndpoint"};
@@ -55,7 +55,7 @@
* status should show witch variables are set
* status[0] ... cm
* status[1] ... KnowledgeSource
- * status[2] ... File or URL
+ * status[2] ... URI
* status[3] ... Resoner
* status[4] ... ReasoningService
* status[5] ... ExampleSet
@@ -78,13 +78,13 @@
cm = input;
}
- protected File getFile () {
- return selectedFile;
+ protected String getURI () {
+ return uri;
}
- protected void setFile (File input) {
+ protected void setURI (String input) {
status[2] = true;
- selectedFile = input;
+ uri = input;
}
protected ReasonerComponent getReasoner () {
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-15 16:00:04 UTC (rev 377)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-16 01:53:33 UTC (rev 378)
@@ -21,7 +21,7 @@
*/
import java.io.File;
-//import java.util.List;
+import java.util.List;
import javax.swing.*;
@@ -29,12 +29,10 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import org.dllearner.kb.OWLFile;
-// import org.dllearner.kb.KBFile;
+//import org.dllearner.kb.*;
+import org.dllearner.core.KnowledgeSource;
-//import org.dllearner.core.KnowledgeSource;
-
/**
* KnowledgeSourcePanel
*
@@ -47,35 +45,49 @@
private static final long serialVersionUID = -7678275020058043937L;
private JFileChooser fc;
- private JButton openButton;
+ private JButton openButton, initButton;
private JTextField fileDisplay;
- private String[] kbBoxItems = {"Pleae select a type", "KBFile", "OWLFile", "SparqleEndpoint"};
+ private String[] kbBoxItems = {"Pleae select a type"};
private JComboBox cb = new JComboBox(kbBoxItems);
- private JPanel openPanel = new JPanel();
+ private JPanel openPanel;
private Config config;
+ private int choosenClassIndex;
+ private List<Class<? extends KnowledgeSource>> sources;
KnowledgeSourcePanel(Config config) {
super(new BorderLayout());
this.config = config;
+ sources = config.getComponentManager().getKnowledgeSources();
fc = new JFileChooser(new File("examples/"));
- openButton = new JButton("Open File");
+ openButton = new JButton("Open local file otherwise type URL");
openButton.addActionListener(this);
+
+ initButton = new JButton("Init KnowledgeSource");
+ initButton.addActionListener(this);
+
fileDisplay = new JTextField(35);
- fileDisplay.setEditable(false);
+ fileDisplay.setEditable(true);
- // test output - if you activat next 2 lines, it will show alle available kb.classes
- // activate import too!
- //List<Class<? extends KnowledgeSource>> sources = StartGUI.myconfig.getComponentManager().getKnowledgeSources();
- //for (int i=0; i<sources.size(); i++) cb.addItem(sources.get(i));
+ for (int i=0; i<sources.size(); i++) {
+ String ksClass = sources.get(i).toString().substring(23).concat(".class");
+ cb.addItem(ksClass);
+ }
+
cb.addActionListener(this);
+ openPanel = new JPanel();
+
JPanel choosePanel = new JPanel();
choosePanel.add(cb);
+ JPanel initPanel = new JPanel();
+ initPanel.add(initButton);
+
add(choosePanel, BorderLayout.PAGE_START);
add(openPanel, BorderLayout.CENTER);
+ add(initPanel, BorderLayout.PAGE_END);
}
public void actionPerformed(ActionEvent e) {
@@ -83,39 +95,35 @@
if (e.getSource() == openButton) {
int returnVal = fc.showOpenDialog(KnowledgeSourcePanel.this);
if (returnVal == JFileChooser.APPROVE_OPTION) {
- config.setFile(fc.getSelectedFile()); //save variable
- fileDisplay.setText(config.getFile().toString());
- //System.out.println("Init KnowledgeSource after loading file ... show over output");
- //System.out.println("test: " + StartGUI.myconfig.getFile().toURI().toString());
- config.getComponentManager().applyConfigEntry(config.getKnowledgeSource(), "url", config.getFile().toURI().toString());
- config.getKnowledgeSource().init();
+ String URI = "file://";
+ URI = URI.concat(fc.getSelectedFile().toString()); // make "file://" before local URI's
+ config.setURI(URI); //save variable
+ fileDisplay.setText(URI);
}
return;
}
+
- // choose none
- if (cb.getSelectedItem().toString() == kbBoxItems[0]) {
- //System.out.println("Item: " + cb.getSelectedItem());
+ // something changes in cb
+ if (cb.isEnabled()) {
+ System.out.println("Item: " + cb.getSelectedItem());
+ System.out.println("Item: " + cb.getSelectedIndex());
+
+ choosenClassIndex = cb.getSelectedIndex() -1;
+
makeCenterClean();
- }
- // choose KB class
- if (cb.getSelectedItem().toString() == kbBoxItems[1]) {
- //System.out.println("Item: " + cb.getSelectedItem());
- makeCenterClean();
- }
- // choose OWL class
- if (cb.getSelectedItem().toString() == kbBoxItems[2]) {
- //System.out.println("Item: " + cb.getSelectedItem());
- makeCenterClean();
openPanel.add(fileDisplay);
openPanel.add(openButton);
- openPanel.repaint();
- config.setKnowledgeSource(config.getComponentManager().knowledgeSource(OWLFile.class));
+
}
- // choose SPARCLE class
- if (cb.getSelectedItem().toString() == kbBoxItems[3]) {
- //System.out.println("Item: " + cb.getSelectedItem());
- makeCenterClean();
+
+ // init
+ if (e.getSource() == initButton) {
+ String testURI = config.getURI();
+ config.setKnowledgeSource(config.getComponentManager().knowledgeSource(sources.get(choosenClassIndex)));
+ config.getComponentManager().applyConfigEntry(config.getKnowledgeSource(), "url", testURI);
+ config.getKnowledgeSource().init();
+ System.out.println("init KnowledgeSource");
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java 2008-01-15 16:00:04 UTC (rev 377)
+++ trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java 2008-01-16 01:53:33 UTC (rev 378)
@@ -71,10 +71,12 @@
public void actionPerformed(ActionEvent e) {
if (e.getSource() == showButton) {
infoArea.setText("");
- if (config.getStatus(2)) { // file is selected and exist?
+ if (config.getStatus(1)) { // kb is set
infoArea.append("SourceClass: " + config.getKnowledgeSource().toString() + "\n");
- infoArea.append("FILE: " + config.getFile() + "\n");
}
+ if (config.getStatus(2)) { // file is set
+ infoArea.append("URI: " + config.getURI() + "\n");
+ }
if (config.getStatus(3)) { // Reasoner is set
infoArea.append("Reasoner: " + config.getReasoner() + "\n");
}
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-15 16:00:04 UTC (rev 377)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-16 01:53:33 UTC (rev 378)
@@ -97,22 +97,7 @@
});
}
-
- public void valueChanged(ListSelectionEvent evt) {
- System.out.println("s");
- if (evt.getValueIsAdjusting())
- return;
- System.out.println("Selected from " + evt.getFirstIndex() + " to " + evt.getLastIndex());
- // detect which examples have been selected
- Set<String> exampleSet = new HashSet<String>();
- int[] selectedIndices = digList.getSelectedIndices();
- for(int i : selectedIndices)
- exampleSet.add(individuals.get(i).toString());
- //StartGUI.myconfig.setExampleSet(exampleSet);
- //System.out.println("digList: " + config.getExampleSet() );
- }
-
-
+
public void actionPerformed(ActionEvent e) {
if (e.getSource() == digButton) {
// set reasoner
@@ -140,8 +125,6 @@
// graphic
digList.setModel(listModel);
StartGUI.myrun.renew();
-
- //return;
}
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-01-15 16:00:04 UTC (rev 377)
+++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-01-16 01:53:33 UTC (rev 378)
@@ -35,8 +35,6 @@
protected static StartGUI myrun;
- //protected static Config myconfig = new Config();
-
public JTabbedPane tabPane = new JTabbedPane();
private JPanel tab1 = new JPanel();
@@ -50,7 +48,7 @@
this.setTitle("DL-Learner GUI");
this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
this.setLocationByPlatform(true);
- this.setSize(640, 480);
+ this.setSize(800, 600);
tab1.add(new KnowledgeSourcePanel(config));
tab2.add(new ReasonerPanel(config));
tab3.add(new LearningProblemPanel(config));
@@ -70,11 +68,11 @@
}
protected void renew() {
- myrun.tabPane.repaint();
+ tabPane.repaint();
}
-
+
protected StartGUI getStartGUI() {
return myrun;
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
