Skip to content
Snippets Groups Projects
Commit 80a9cd87 authored by Philipp Spohr's avatar Philipp Spohr
Browse files

minor fixes

parent b2b1c705
No related branches found
No related tags found
No related merge requests found
...@@ -38,10 +38,6 @@ import org.cytoscape.model.subnetwork.CySubNetwork; ...@@ -38,10 +38,6 @@ import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.view.layout.CyLayoutAlgorithm; import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.model.CyNetworkView; import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.presentation.RenderingEngine; import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.work.FinishStatus;
import org.cytoscape.work.ObservableTask;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskObserver;
import org.slf4j.Logger; import org.slf4j.Logger;
import de.hhu.ba.yoshikoWrapper.core.CyCore; import de.hhu.ba.yoshikoWrapper.core.CyCore;
...@@ -201,7 +197,4 @@ public class YoshikoCluster { ...@@ -201,7 +197,4 @@ public class YoshikoCluster {
} }
} }
...@@ -42,7 +42,6 @@ import de.hhu.ba.yoshikoWrapper.core.LocalizationManager; ...@@ -42,7 +42,6 @@ import de.hhu.ba.yoshikoWrapper.core.LocalizationManager;
import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoCluster; import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoCluster;
import de.hhu.ba.yoshikoWrapper.swing.GraphicsLoader; import de.hhu.ba.yoshikoWrapper.swing.GraphicsLoader;
import de.hhu.ba.yoshikoWrapper.swing.SwingUtil; import de.hhu.ba.yoshikoWrapper.swing.SwingUtil;
import de.hhu.ba.yoshikoWrapper.tasks.AlgorithmTask;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ClusterView extends JPanel { public class ClusterView extends JPanel {
......
...@@ -54,10 +54,13 @@ public class OperationModePanel extends JPanel{ ...@@ -54,10 +54,13 @@ public class OperationModePanel extends JPanel{
public OperationModePanel() { public OperationModePanel() {
heuristicGroup = new ButtonGroup(); heuristicGroup = new ButtonGroup();
useILP = new JRadioButton("Use Integer Linear Programming");
useILP.setSelected(true);
useILP = new JRadioButton("Use Integer Linear Programming");
useHeuristic = new JRadioButton("Use Heuristic"); useHeuristic = new JRadioButton("Use Heuristic");
//As a default option we use the heuristic -> faster and usually good @Bachelor's Thesis //TODO: Save this as config?
useHeuristic.setSelected(true);
heuristicGroup.add(useILP); heuristicGroup.add(useILP);
heuristicGroup.add(useHeuristic); heuristicGroup.add(useHeuristic);
...@@ -76,8 +79,8 @@ public class OperationModePanel extends JPanel{ ...@@ -76,8 +79,8 @@ public class OperationModePanel extends JPanel{
useHeuristic.addActionListener(ilpHeuristicSwitch); useHeuristic.addActionListener(ilpHeuristicSwitch);
SwingUtil.addAll(this, SwingUtil.addAll(this,
useILP,
useHeuristic, useHeuristic,
useILP,
solutionNumberChooser, solutionNumberChooser,
timeLimitSetter, timeLimitSetter,
useTriangleCutsBox, useTriangleCutsBox,
...@@ -85,14 +88,17 @@ public class OperationModePanel extends JPanel{ ...@@ -85,14 +88,17 @@ public class OperationModePanel extends JPanel{
disableMultiThreading disableMultiThreading
); );
//We set all components to enabled/disabled according to mode
ilpHeuristicSwitch();
//Layout //Layout
GroupLayout layout = new GroupLayout(this); GroupLayout layout = new GroupLayout(this);
layout.setAutoCreateContainerGaps(true); layout.setAutoCreateContainerGaps(true);
layout.setHorizontalGroup(layout.createParallelGroup(Alignment.LEADING,true) layout.setHorizontalGroup(layout.createParallelGroup(Alignment.LEADING,true)
.addComponent(useILP, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(useHeuristic, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(useHeuristic, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(useILP, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(solutionNumberChooser, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(solutionNumberChooser, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(timeLimitSetter, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(timeLimitSetter, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(useTriangleCutsBox, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(useTriangleCutsBox, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
...@@ -101,8 +107,8 @@ public class OperationModePanel extends JPanel{ ...@@ -101,8 +107,8 @@ public class OperationModePanel extends JPanel{
); );
layout.setVerticalGroup(layout.createSequentialGroup() layout.setVerticalGroup(layout.createSequentialGroup()
.addComponent(useILP)
.addComponent(useHeuristic) .addComponent(useHeuristic)
.addComponent(useILP)
.addComponent(solutionNumberChooser) .addComponent(solutionNumberChooser)
.addComponent(timeLimitSetter) .addComponent(timeLimitSetter)
.addComponent(useTriangleCutsBox) .addComponent(useTriangleCutsBox)
...@@ -114,9 +120,7 @@ public class OperationModePanel extends JPanel{ ...@@ -114,9 +120,7 @@ public class OperationModePanel extends JPanel{
} }
ActionListener ilpHeuristicSwitch = new ActionListener() { private void ilpHeuristicSwitch() {
@Override
public void actionPerformed(ActionEvent e) {
if (useILP.isSelected()) { if (useILP.isSelected()) {
timeLimitSetter.setEnabled(true); timeLimitSetter.setEnabled(true);
useTriangleCutsBox.setEnabled(true); useTriangleCutsBox.setEnabled(true);
...@@ -132,6 +136,12 @@ public class OperationModePanel extends JPanel{ ...@@ -132,6 +136,12 @@ public class OperationModePanel extends JPanel{
disableMultiThreading.setEnabled(false); disableMultiThreading.setEnabled(false);
} }
} }
ActionListener ilpHeuristicSwitch = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
ilpHeuristicSwitch();
}
}; };
//SETTER GETTER //SETTER GETTER
......
...@@ -25,7 +25,6 @@ import static javax.swing.GroupLayout.*; ...@@ -25,7 +25,6 @@ import static javax.swing.GroupLayout.*;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.ArrayList; import java.util.ArrayList;
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
package de.hhu.ba.yoshikoWrapper.swing.components; package de.hhu.ba.yoshikoWrapper.swing.components;
import static javax.swing.GroupLayout.DEFAULT_SIZE; import static javax.swing.GroupLayout.DEFAULT_SIZE;
import static javax.swing.GroupLayout.PREFERRED_SIZE; import static javax.swing.GroupLayout.PREFERRED_SIZE;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
...@@ -41,18 +41,15 @@ import javax.swing.JOptionPane; ...@@ -41,18 +41,15 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.ScrollPaneConstants; import javax.swing.ScrollPaneConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.cytoscape.work.TaskIterator; import org.cytoscape.work.TaskIterator;
import com.sun.media.jfxmedia.logging.Logger;
import de.hhu.ba.yoshikoWrapper.core.CyCore; import de.hhu.ba.yoshikoWrapper.core.CyCore;
import de.hhu.ba.yoshikoWrapper.core.LocalizationManager; import de.hhu.ba.yoshikoWrapper.core.LocalizationManager;
import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoCluster; import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoCluster;
import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoSolution; import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoSolution;
import de.hhu.ba.yoshikoWrapper.logging.YoshikoLogger;
import de.hhu.ba.yoshikoWrapper.swing.SwingUtil; import de.hhu.ba.yoshikoWrapper.swing.SwingUtil;
import de.hhu.ba.yoshikoWrapper.tasks.CreateClusterViews; import de.hhu.ba.yoshikoWrapper.tasks.CreateClusterViews;
import de.hhu.ba.yoshikoWrapper.tasks.CreateMetaGraphTask; import de.hhu.ba.yoshikoWrapper.tasks.CreateMetaGraphTask;
...@@ -116,11 +113,15 @@ public class SolutionTab extends JPanel { ...@@ -116,11 +113,15 @@ public class SolutionTab extends JPanel {
//Declaration of Swing Components //Declaration of Swing Components
clusterViewList = new ClusterViewList(); clusterViewList = new ClusterViewList();
//Build CV list
for (YoshikoCluster c: solution.clusters) { for (YoshikoCluster c: solution.clusters) {
ClusterView clusterView = new ClusterView(c); ClusterView clusterView = new ClusterView(c);
clusterViewList.add(clusterView); clusterViewList.add(clusterView);
} }
//Apply default visibility (Hide singles)
clusterViewList.toggleSingleVisibility(false);
scrollPane = new JScrollPane(clusterViewList); scrollPane = new JScrollPane(clusterViewList);
clusterCount = new JLabel(LocalizationManager.get("clusterFound")+" "+s.clusters.size()); clusterCount = new JLabel(LocalizationManager.get("clusterFound")+" "+s.clusters.size());
...@@ -200,12 +201,12 @@ public class SolutionTab extends JPanel { ...@@ -200,12 +201,12 @@ public class SolutionTab extends JPanel {
layout.setHorizontalGroup(layout.createParallelGroup(Alignment.CENTER,true) layout.setHorizontalGroup(layout.createParallelGroup(Alignment.CENTER,true)
.addGap(8) .addGap(8)
.addComponent(clusterCount,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE) .addComponent(clusterCount,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE)
.addComponent(hideSingles,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE) .addComponent(hideSingles,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE)
.addGap(8) .addGap(8)
.addComponent(scrollPane,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE) .addComponent(scrollPane,PREFERRED_SIZE,PREFERRED_SIZE,Short.MAX_VALUE)
.addComponent(createClusterView,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE) .addComponent(createClusterView,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE)
.addComponent(createMetaGraph,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE) .addComponent(createMetaGraph,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE)
); );
layout.setVerticalGroup(layout.createSequentialGroup() layout.setVerticalGroup(layout.createSequentialGroup()
.addGap(8) .addGap(8)
......
...@@ -225,6 +225,7 @@ public class AlgorithmTask extends AbstractTask { ...@@ -225,6 +225,7 @@ public class AlgorithmTask extends AbstractTask {
eastPanel.setSelectedIndex(eastPanel.indexOfComponent(resultPanel)); eastPanel.setSelectedIndex(eastPanel.indexOfComponent(resultPanel));
//Show (might be invisible) //Show (might be invisible)
eastPanel.setState(CytoPanelState.DOCK); eastPanel.setState(CytoPanelState.DOCK);
//eastPanel.getThisComponent().revalidate();
} }
......
...@@ -3,8 +3,6 @@ package de.hhu.ba.yoshikoWrapper.tasks; ...@@ -3,8 +3,6 @@ package de.hhu.ba.yoshikoWrapper.tasks;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import javax.swing.SwingUtilities;
import org.cytoscape.model.CyEdge; import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork; import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode; import org.cytoscape.model.CyNode;
...@@ -13,11 +11,7 @@ import org.cytoscape.model.subnetwork.CySubNetwork; ...@@ -13,11 +11,7 @@ import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.view.layout.CyLayoutAlgorithm; import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.model.CyNetworkView; import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.AbstractTask; import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.FinishStatus;
import org.cytoscape.work.ObservableTask;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor; import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.TaskObserver;
import de.hhu.ba.yoshikoWrapper.core.CyCore; import de.hhu.ba.yoshikoWrapper.core.CyCore;
import de.hhu.ba.yoshikoWrapper.core.LocalizationManager; import de.hhu.ba.yoshikoWrapper.core.LocalizationManager;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment