From ac2ab063c10a72ae109ad048bee851b809588eec Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Tue, 13 Feb 2018 11:47:29 +0100
Subject: [PATCH] aesthetic changes
---
.../de/hhu/ba/yoshikoWrapper/help/HelpLinks.java | 3 ++-
.../swing/components/ClusterCountChooser.java | 5 +++++
.../swing/components/EditCostPanel.java | 12 +++++++++---
.../yoshikoWrapper/swing/components/MainPanel.java | 4 ++--
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java b/src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java
index 58fdf46..edefa93 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java
@@ -27,7 +27,8 @@ public final class HelpLinks {
public static final HashMap<String,Object> mainInfo = new HashMap<String,Object>();
static {
- mainInfo.put("url", "https://spqrph.github.io/cytoscape-tutorials/presentations/yoshiko.html#/title");
+ mainInfo.put("url", "file:///home/philipp/workspace/cs/cytoscape-tutorials/presentations/yoshiko.html");
+ //mainInfo.put("url", "https://spqrph.github.io/cytoscape-tutorials/presentations/yoshiko.html#/title");
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ClusterCountChooser.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ClusterCountChooser.java
index 983a68b..852cd5e 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ClusterCountChooser.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ClusterCountChooser.java
@@ -21,6 +21,7 @@
******************************************************************************/
package de.hhu.ba.yoshikoWrapper.swing.components;
+import javax.swing.BoxLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -37,7 +38,11 @@ public class ClusterCountChooser extends JPanel {
numSolutionsSetter = new IntegerInputField(1,Integer.MAX_VALUE);
numSolutionsSetter.setValue(2);
label = new JLabel(LocalizationManager.get("nrClusters"));
+
SwingUtil.addAll(this,label, numSolutionsSetter);
+
+ BoxLayout layout = new BoxLayout(this, BoxLayout.LINE_AXIS);
+ this.setLayout(layout);
}
@Override
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/EditCostPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/EditCostPanel.java
index 4beef6f..b52e776 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/EditCostPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/EditCostPanel.java
@@ -25,6 +25,7 @@ package de.hhu.ba.yoshikoWrapper.swing.components;
import javax.swing.GroupLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.JSeparator;
import javax.swing.GroupLayout.Alignment;
import de.hhu.ba.yoshikoWrapper.core.LocalizationManager;
@@ -38,6 +39,8 @@ public class EditCostPanel extends JPanel {
private final DoubleInputField icField;
private final DoubleInputField dcField;
+
+ private final JSeparator separator;
private final JLabel icLabel;
private final JLabel dcLabel;
@@ -57,15 +60,16 @@ public class EditCostPanel extends JPanel {
icField.setText("-1.0");
icField.setToolTipText(LocalizationManager.get("icTooltip"));
dcField.setText("1.0");
+
+ separator = new JSeparator(JSeparator.HORIZONTAL);
icLabel = new JLabel(LocalizationManager.get("defaultInsertion"));
dcLabel = new JLabel(LocalizationManager.get("defaultDeletion"));
//Add components
- SwingUtil.addAll(this,icLabel,icField);
- SwingUtil.addAll(this,dcLabel,dcField);
+ SwingUtil.addAll(this,columnMapper,separator,icLabel,icField,dcLabel,dcField);
//SwingUtil.addAll(helpButton);
- SwingUtil.addAll(this,columnMapper);
+
//Layout
@@ -74,6 +78,7 @@ public class EditCostPanel extends JPanel {
layout.setHorizontalGroup(layout.createParallelGroup()
//.addComponent(helpButton,Alignment.TRAILING)
.addComponent(columnMapper)
+ .addComponent(separator)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.LEADING)
.addComponent(icLabel)
@@ -90,6 +95,7 @@ public class EditCostPanel extends JPanel {
layout.setVerticalGroup(layout.createSequentialGroup()
//.addComponent(helpButton)
.addComponent(columnMapper)
+ .addComponent(separator)
.addGroup(layout.createParallelGroup(Alignment.BASELINE)
.addComponent(icLabel)
.addGap(4)
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
index 32fd5d7..5fc0e50 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
@@ -209,7 +209,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(about,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE)
)
- .addGap(4)
+ .addGap(8)
.addComponent(showAdvancedOptions,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE)
.addComponent(scrollPane,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE)
.addComponent(runButton,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE)
@@ -228,7 +228,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
.addComponent(header,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE)
.addComponent(about,Alignment.TRAILING,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE)
)
- .addGap(4)
+ .addGap(8)
.addComponent(showAdvancedOptions,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE)
.addComponent(scrollPane,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE)
.addComponent(runButton,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE)
--
GitLab