From: <hee...@us...> - 2008-05-21 16:11:34
|
Revision: 913 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=913&view=rev Author: heeroyuy Date: 2008-05-21 09:11:24 -0700 (Wed, 21 May 2008) Log Message: ----------- -added switch to enable/disable ExamplePanel Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-05-21 14:59:31 UTC (rev 912) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-05-21 16:11:24 UTC (rev 913) @@ -8,6 +8,7 @@ private DLLearnerModel model; private String id; + private boolean toggled; private Thread dlLearner; private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view; public ActionHandler(ActionHandler a,DLLearnerModel m,OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view ,String i) @@ -15,6 +16,7 @@ this.view = view; this.id=i; this.model = m; + toggled = false; } @@ -22,12 +24,19 @@ if(z.getActionCommand().equals("Suggest "+id)) { + if(view.getOptionPanel().getComponentCount()<=2) + { + view.renderErrorMessage("No Examples available"); + } + else{ + view.renderErrorMessage("Learning started"); this.dlLearner = new Thread(model); view.getRunButton().setEnabled(false); view.getCancelButton().setEnabled(true); dlLearner.start(); - String error = "Learning succesful"; - view.renderErrorMessage(error); + //String error = "Learning succesful"; + //view.renderErrorMessage(error); + } } if(z.getActionCommand().equals("Cancel")) @@ -69,7 +78,23 @@ String hilfe="A Instance tht doesn't follow from the classdescription."; view.renderHelpMessage(hilfe); } + + } + if(z.getActionCommand().equals("")) + { + if(!toggled==true) + { + toggled=true; + view.setExamplePanelVisible(toggled); + System.out.println(z.getSource()); + } + else + { + toggled=false; + view.setExamplePanelVisible(toggled); + } + } } public String getID() @@ -115,6 +140,10 @@ { dlLearner =null; } + + public void resetToggled() + { + toggled = false; + } - } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-05-21 14:59:31 UTC (rev 912) +++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-05-21 16:11:24 UTC (rev 913) @@ -105,7 +105,7 @@ } editingComponent = new JPanel(new BorderLayout()); editingComponent.add(tabbedPane); - editingComponent.setPreferredSize(new Dimension(600, 490)); + editingComponent.setPreferredSize(new Dimension(600, 520)); tabbedPane.add(CLASS_EXPRESSION_EDITOR_LABEL, new JScrollPane(editor)); @@ -274,7 +274,6 @@ private JButton helpForPosExamples; private JButton helpForNegExamples; private JLabel errorMessage; - private ImageIcon toggleGif; private JToggleButton advanced; //private JScrollPane suggestScroll; private ActionHandler action; @@ -290,7 +289,6 @@ editor = editorKit; model = new DLLearnerModel(editorKit,aktuell, label,this); model.loadOntology(getUri()); - toggleGif = new ImageIcon("pfeil1.gif"); posLabelPanel = new JPanel(); negLabelPanel = new JPanel(); panel = new DLLearnerViewPanel(editor); @@ -300,24 +298,25 @@ adv = new JLabel("Advanced"); helpForNegExamples = new JButton("?"); helpForNegExamples.setSize(10, 10); - advanced = new JToggleButton(toggleGif); + advanced = new JToggleButton(); run = new JButton("Suggest "+label); cancel = new JButton("Cancel"); accept = new JButton("ADD"); - scrollPane = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + option = new JPanel(new GridLayout(0,2)); + scrollPane = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); errorMessage = new JLabel(); learner = new JPanel(); advanced.setSize(20,20); learner.setLayout(null); suggest = new JList(); - learner.setPreferredSize(new Dimension(600, 480)); + learner.setPreferredSize(new Dimension(600, 520)); pos = new JLabel("Positive Examples"); neg = new JLabel("Negative Examples"); accept.setPreferredSize(new Dimension(290,50)); - option = new JPanel(new GridLayout(0,2)); posLabelPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0)); negLabelPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0)); posLabelPanel.add(pos); + advanced.setName("Advanced"); helpForPosExamples.setName("PosHelpButton"); posLabelPanel.add(helpForPosExamples); negLabelPanel.add(neg); @@ -327,31 +326,29 @@ addRunButtonListener(this.action); addCancelButtonListener(this.action); addHelpButtonListener(this.action); + addAdvancedButtonListener(this.action); } public void makeView() { - model.clearVector(); model.initReasoner(); - model.setPosVector(); - model.setNegVector(); + model.setPosVector(); + model.setNegVector(); + setJCheckBoxen(); suggest = new JList(); cancel.setEnabled(false); accept.setEnabled(false); - setJCheckBoxen(); - if(option.getComponentCount()<=2) - { - run.setEnabled(false); - } - scrollPane.setViewportView(option); - scrollPane.setBounds(10, 200, 490, 250); + action.resetToggled(); + advanced.setSelected(false); suggest.setBounds(10,40,490,110); suggest.setVisible(true); adv.setBounds(40,200,200,20); run.setBounds(10,0,200,30); advanced.setBounds(10,200,20,20); + scrollPane.setViewportView(option); + scrollPane.setBounds(10, 230, 490, 250); cancel.setBounds(260,0,200,30); accept.setBounds(510,40,80,110); errorMessage.setBounds(10,160,590,20); @@ -362,7 +359,8 @@ learner.add(suggest); learner.add(accept); learner.add(errorMessage); - //learner.add(scrollPane); + learner.add(scrollPane); + scrollPane.setVisible(false); add(learner); addListener(); } @@ -372,10 +370,19 @@ return learner; } + public void setExamplePanelVisible(boolean visible) + { + scrollPane.setVisible(visible); + } + + public JPanel getOptionPanel() + { + return option; + } + public void renderHelpMessage(String helfen) { help = new JLabel(); - hilfe = new JDialog(); hilfe.setName("Hilfe"); hilfe.setSize(500,50); @@ -510,6 +517,11 @@ helpForNegExamples.addActionListener(a); } + public void addAdvancedButtonListener(ActionListener a) + { + advanced.addActionListener(a); + } + } private class ObjectRestrictionCreatorPanel extends JPanel { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |