minor improvements

husonlab · Mar 20, 2024 · 76bf83c · 76bf83c
1 parent 30c9867
commit 76bf83c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/splitstree6/algorithms/utils/GreedyCircular.java b/src/main/java/splitstree6/algorithms/utils/GreedyCircular.java
@@ -31,7 +31,7 @@
 import java.util.function.Function;
 
 /**
- * greedy compute weakly compatible splits
+ * greedily compute circular splits
  * Daniel Huson, 12/31/16.
  */
 public class GreedyCircular {
@@ -42,7 +42,7 @@ public class GreedyCircular {
 	 * @return compatible splits
 	 */
 	public static Pair<ArrayList<ASplit>, ArrayList<Integer>> apply(ProgressListener progress, BitSet taxaSet, final List<ASplit> splits, Function<ASplit, Double> weight) throws CanceledException {
-		progress.setSubtask("Greedy circular");
+		progress.setSubtask("Greedy outline");
 		progress.setMaximum(splits.size());
 		progress.setProgress(0);
 

diff --git a/src/main/java/splitstree6/layout/network/NetworkLayout.java b/src/main/java/splitstree6/layout/network/NetworkLayout.java
@@ -128,7 +128,7 @@ public Group apply(ProgressListener progress, TaxaBlock taxaBlock, NetworkBlock
 				if (false && graph.getNumberOfEdges() == 0 && label != null) { // todo: allow user to use marks for nodes
 					nodeShape.setShape(RichTextLabel.getMark(label.getText()));
 				} else
-					nodeShape.setShape(new Circle(v.getDegree() == 1 ? 3 : 2));
+					nodeShape.setShape(new Circle(v.getDegree() == 1 ? 3 : 2), true);
 
 				nodesGroup.getChildren().add(nodeShape);
 

diff --git a/src/main/java/splitstree6/layout/tree/LabeledEdgeShape.java b/src/main/java/splitstree6/layout/tree/LabeledEdgeShape.java
@@ -63,9 +63,13 @@ public void setLabel(RichTextLabel label) {
 
 
 	public void setShape(Shape shape) {
+		setShape(shape, Icebergs.enabled());
+	}
+
+	public void setShape(Shape shape, boolean useIceberg) {
 		getChildren().clear();
 		if (shape != null) {
-			if (Icebergs.enabled()) {
+			if (useIceberg) {
 				getChildren().add(Icebergs.create(shape, false));
 			}
 			getChildren().add(shape);

diff --git a/src/main/java/splitstree6/layout/tree/LabeledNodeShape.java b/src/main/java/splitstree6/layout/tree/LabeledNodeShape.java
@@ -58,9 +58,13 @@ public void setLabel(RichTextLabel label) {
 	}
 
 	public void setShape(Shape shape) {
+		setShape(shape, Icebergs.enabled());
+	}
+
+	public void setShape(Shape shape, boolean useIceBerg) {
 		getChildren().clear();
 		if (shape != null) {
-			if (false && Icebergs.enabled()) { // node icebergs seem to get in the way...
+			if (useIceBerg) { // node icebergs seem to get in the way...
 				getChildren().add(Icebergs.create(shape, false));
 			}
 			getChildren().add(shape);

diff --git a/src/main/java/splitstree6/window/MainWindowPresenter.java b/src/main/java/splitstree6/window/MainWindowPresenter.java
@@ -367,7 +367,7 @@ private void setupCommonMenuItems(MainWindow mainWindow, MainWindowController co
 		controller.getImportTaxonTraitsMenuItem().disableProperty().bind(workflow.runningProperty().or(mainWindow.emptyProperty()));
 
 		controller.getImportMultipleTreeFilesMenuItem().setOnAction(e -> ImportMultipleTrees.apply(mainWindow));
-		controller.getImportMultipleTreeFilesMenuItem().disableProperty().bind(mainWindow.emptyProperty().not());
+		controller.getImportMultipleTreeFilesMenuItem().disableProperty().bind(workflow.runningProperty());
 
 		controller.getImportTreeNamesMenuItem().setOnAction(e -> ImportTreeNames.apply(mainWindow));
 		controller.getImportTreeNamesMenuItem().disableProperty().bind(workflow.runningProperty().or(

diff --git a/src/main/java/splitstree6/xtra/kernelize/BiConnectedComponents.java b/src/main/java/splitstree6/xtra/kernelize/BiConnectedComponents.java
@@ -27,7 +27,7 @@
 
 /**
  * use Tarjan's algorithm to determine all bi-connected components
- * todo: this is untested
+ * todo: this is broken?
  * Daniel Huson, 2.2024
  */
 public class BiConnectedComponents {