Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1864] trunk/src/dl-learner/org/dllearner/tools/ore/ ui
|
From: <lor...@us...> - 2009-09-25 11:01:31
|
Revision: 1864
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1864&view=rev
Author: lorenz_b
Date: 2009-09-25 11:01:24 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
fixed refreshing panels
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassesTable.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.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/LearningPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/LearningPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassesTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassesTable.java 2009-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassesTable.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -50,4 +50,8 @@
public NamedClass getSelectedValue(){
return ((ClassesTableModel)getModel()).getSelectedValue(getSelectedRow());
}
+
+ public void clear(){
+ ((ClassesTableModel)getModel()).clear();
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java 2009-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -471,6 +471,15 @@
}
+ public void clear(){
+ newConcept = new Ellipse2D.Double(0, 0, 0, 0);
+ posCovIndVector.clear();
+ posNotCovIndVector.clear();
+ additionalIndividuals.clear();
+ points.clear();
+ getParent().repaint();
+ }
+
public void computeIndividualPoints() {
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-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -119,6 +119,7 @@
unsatDescriptor.fillUnsatisfiableClassesList();
} else {
nextPanelDescriptor = ClassChoosePanelDescriptor.IDENTIFIER;
+ ((ClassChoosePanelDescriptor) nextDescriptor).resetPanel();
((ClassChoosePanelDescriptor) nextDescriptor).refill();
}
}
@@ -133,6 +134,7 @@
nextPanelDescriptor = UnsatisfiableExplanationPanelDescriptor.IDENTIFIER;
} else {
nextPanelDescriptor = ClassChoosePanelDescriptor.IDENTIFIER;
+ ((ClassChoosePanelDescriptor) nextDescriptor).resetPanel();
((ClassChoosePanelDescriptor) nextDescriptor).refill();
}
} else if (currentPanelDescriptor.getPanelDescriptorIdentifier().equals(UnsatisfiableExplanationPanelDescriptor.IDENTIFIER)) {
@@ -143,9 +145,13 @@
// ore.setLearningProblem();
LearningPanelDescriptor learnDescriptor = ((LearningPanelDescriptor) model
.getPanelHashMap().get(nextPanelDescriptor));
- learnDescriptor.setPanelDefaults();
+ learnDescriptor.resetPanel();
- }
+ } else if(nextPanelDescriptor.equals(ClassChoosePanelDescriptor.IDENTIFIER)){
+ ClassChoosePanelDescriptor classChoose = ((ClassChoosePanelDescriptor) model
+ .getPanelHashMap().get(nextPanelDescriptor));
+ classChoose.resetPanel();
+ }
// else if(currentPanelDescriptor.getPanelDescriptorIdentifier().equals(LearningPanelDescriptor.IDENTIFIER)){
// if(OREManager.getInstance().getNewClassDescription().getAccuracy() == 1.0){
// nextPanelDescriptor = SavePanelDescriptor.IDENTIFIER;
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-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -20,7 +20,9 @@
package org.dllearner.tools.ore.ui.wizard.descriptors;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ExecutionException;
@@ -59,18 +61,21 @@
+ "Select one of them for which you want to learn equivalent class expressions," +
" then press <Next>";
- private ClassChoosePanel owlClassPanel;
+ private ClassChoosePanel classChoosePanel;
+ private Map<Integer, Set<NamedClass>> instanceCountToClasses;
/**
* Constructor creates new panel and adds listener to list.
*/
public ClassChoosePanelDescriptor() {
- owlClassPanel = new ClassChoosePanel();
- owlClassPanel.addSelectionListener(this);
- owlClassPanel.addChangeListener(this);
+ classChoosePanel = new ClassChoosePanel();
+ classChoosePanel.addSelectionListener(this);
+ classChoosePanel.addChangeListener(this);
setPanelDescriptorIdentifier(IDENTIFIER);
- setPanelComponent(owlClassPanel);
+ setPanelComponent(classChoosePanel);
+
+ instanceCountToClasses = new HashMap<Integer, Set<NamedClass>>();
}
@@ -96,8 +101,8 @@
*/
public void valueChanged(ListSelectionEvent e) {
setNextButtonAccordingToConceptSelected();
- if (!e.getValueIsAdjusting() && owlClassPanel.getClassesTable().getSelectedRow() >= 0) {
- OREManager.getInstance().setCurrentClass2Learn((NamedClass) owlClassPanel.getClassesTable().getSelectedValue());
+ if (!e.getValueIsAdjusting() && classChoosePanel.getClassesTable().getSelectedRow() >= 0) {
+ OREManager.getInstance().setCurrentClass2Learn((NamedClass) classChoosePanel.getClassesTable().getSelectedValue());
}
}
@@ -109,7 +114,7 @@
private void setNextButtonAccordingToConceptSelected() {
- if (owlClassPanel.getClassesTable().getSelectedRow() >= 0){
+ if (classChoosePanel.getClassesTable().getSelectedRow() >= 0){
getWizard().setNextFinishButtonEnabled(true);
}else{
getWizard().setNextFinishButtonEnabled(false);
@@ -122,15 +127,20 @@
* @return extended JPanel
*/
public ClassChoosePanel getOwlClassPanel() {
- return owlClassPanel;
+ return classChoosePanel;
}
+ public void resetPanel(){
+ classChoosePanel.reset();
+ }
+
public void refill(){
TaskManager.getInstance().setTaskStarted("Retrieving atomic classes...");
new ClassRetrievingTask(1).execute();
}
public void fillClassesList(int minInstanceCount){
+ classChoosePanel.getClassesTable().clear();
TaskManager.getInstance().setTaskStarted("Retrieving atomic classes...");
new ClassRetrievingTask(minInstanceCount).execute();
}
@@ -177,7 +187,7 @@
e.printStackTrace();
}
- owlClassPanel.getClassesTable().addClasses(classes);
+ classChoosePanel.getClassesTable().addClasses(classes);
TaskManager.getInstance().setTaskFinished();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java 2009-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -143,7 +143,7 @@
OREManager.getInstance().setMaxExecutionTimeInSeconds(learnPanel.getOptionsPanel().getMaxExecutionTime());
OREManager.getInstance().setMaxNrOfResults(learnPanel.getOptionsPanel().getNrOfConcepts());
OREManager.getInstance().setThreshold(learnPanel.getOptionsPanel().getThreshold());
- learnPanel.getResultTable().clear();
+ learnPanel.reset();
learningTask = new LearningTask();
@@ -196,10 +196,10 @@
}
/**
- * Clear list and loading message.
+ * Clear list and coverage panel.
*/
- public void setPanelDefaults(){
- learnPanel.getResultTable().clear();
+ public void resetPanel(){
+ learnPanel.reset();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java 2009-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -96,5 +96,10 @@
public ClassesTable getClassesTable(){
return classesTable;
}
+
+ public void reset(){
+ classesTable.clear();
+ minInstanceCountSpinner.setValue(new Integer(1));
+ }
}
\ No newline at end of file
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/LearningPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/LearningPanel.java 2009-09-25 09:43:56 UTC (rev 1863)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/LearningPanel.java 2009-09-25 11:01:24 UTC (rev 1864)
@@ -182,6 +182,11 @@
return optionsPanel;
}
+ public void reset(){
+ graphicPanel.clear();
+ resultTable.clear();
+ }
+
public static void main(String[] args){
OREManager.getInstance().setCurrentClass2Learn(new NamedClass("dummy"));
JFrame frame = new JFrame();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
