Updates to FX GUI and new X3 repo

pom.xml

@@ -784,7 +784,7 @@
  	<dependency>
 	    <groupId>pamguard.org</groupId>
 	    <artifactId>x3</artifactId>
-	    <version>2.1.0</version>
+	    <version>2.2.0</version>
 	</dependency> 
 	
 		<!-- https://mvnrepository.com/artifact/it.sauronsoftware/jave -->

repo/pamguard/org/x3/2.2.0/_remote.repositories

@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Mon Nov 14 09:57:39 GMT 2022
+x3-2.2.0.jar>=
+x3-2.2.0.pom>=

repo/pamguard/org/x3/2.2.0/m2e-lastUpdated.properties

@@ -0,0 +1,7 @@
+#Fri Nov 11 13:38:50 GMT 2022
+central|https\://repo1.maven.org/maven2|sources=1668173930657
+repo|file\:///Users/au671271/git/PAMGuard/repo|sources=1668173930657
+talan|https\://nexus.talanlabs.com/content/repositories/releases/|sources=1668173930657
+bintray-macster110-jtorch4pam|macster110|https\://dl.bintray.com/macster110/jtorch4pam|sources=1668173930657
+bedatadriven|https\://nexus.bedatadriven.com/content/groups/public/|sources=1668173930657
+unidata-all|https\://artifacts.unidata.ucar.edu/repository/unidata-all/|sources=1668173930657

repo/pamguard/org/x3/2.2.0/x3-2.2.0-sources.jar.lastUpdated

@@ -0,0 +1,14 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Fri Nov 11 13:38:50 GMT 2022
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1668173930381
+https\://dl.bintray.com/macster110/jtorch4pam/.error=Could not transfer artifact pamguard.org\:x3\:jar\:sources\:2.2.0 from/to bintray-macster110-jtorch4pam (https\://dl.bintray.com/macster110/jtorch4pam)\: Remote host terminated the handshake
+https\://repo1.maven.org/maven2/.error=
+file\:///Users/au671271/git/PAMGuard/repo/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1668173930064
+https\://repo1.maven.org/maven2/.lastUpdated=1668173930657
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:sources\:2.2.0 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: Access denied to https\://nexus.talanlabs.com/content/repositories/releases/pamguard/org/x3/2.2.0/x3-2.2.0-sources.jar. Error code 401, Unauthorized
+file\:///Users/au671271/git/PAMGuard/repo/.lastUpdated=1668173929099
+4d1f727a0c17e3b21ef2f6654eed0b3113a4db97@default-bintray-macster110-jtorch4pam-https\://dl.bintray.com/macster110/jtorch4pam/.lastUpdated=1668173929096
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1668173930217

repo/pamguard/org/x3/2.2.0/x3-2.2.0.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>pamguard.org</groupId>
+  <artifactId>x3</artifactId>
+  <version>2.2.0</version>
+  <description>POM was created from install:install-file</description>
+</project>

src/Resources/css/primer-dark.css

@@ -1422,6 +1422,7 @@ Text {
   -color-cell-bg-odd: -color-bg-subtle;
   -color-cell-border: -color-border-default;
   -fx-border-color: -color-cell-border;
+  -fx-control-inner-background: -color-bg-default;
   -fx-border-width: 1px;
   -fx-border-radius: 0;
   -color-header-bg: -color-bg-subtle;
@@ -3703,4 +3704,20 @@ Text {
 
 #label-title2 {
     -fx-font: bold 13pt  -fx-font-family;
+  }
+
+/*******************************************************************************
+ *                                                                             *
+ * Label                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+
+
+.validatorfx-error {
+  -fx-text-fill: rgb(164, 0, 0);  
+}
+
+.validatorfx-warning {
+  -fx-text-fill: rgb(196, 160, 0);  
+}
 }

src/clickDetector/ClickClassifiers/basicSweep/SweepClassifier.java

@@ -412,7 +412,7 @@ public class SweepClassifier implements ClickIdentifier , PamSettings {
 	}
 
 	@Override
-	public ClassifyPaneFX getClassifierPane() {
+	public SweepClassifierPaneFX getClassifierPane() {
 		if (fxPane==null) fxPane = new SweepClassifierPaneFX(this, clickControl);
 		return fxPane;
 	}

src/clickDetector/layoutFX/ClickSettingsPane.java

@@ -40,6 +40,7 @@ import pamViewFX.fxNodes.PamVBox;
 import pamViewFX.fxNodes.pamDialogFX.PamDialogFX;
 import pamViewFX.fxNodes.utilityPanes.FilterPaneFX;
 import pamViewFX.fxNodes.utilityPanes.GroupedSourcePaneFX;
+import pamViewFX.validator.PamValidator;
 
 /**
  * A pane to change click detector settings. 
@@ -190,7 +191,7 @@ public class ClickSettingsPane extends SettingsPane<ClickParameters>{
 		this.clickControl=clickControl; 
 		mainPane= new PamBorderPane(); 
 		
-		clickValidator = new Validator(); 
+		clickValidator = new PamValidator(); 
 
 		pamTabbedPane=new PamTabPane();
 		pamTabbedPane.setAddTabButton(false);

src/clickDetector/layoutFX/clickClassifiers/SweepClassifierPaneFX.java

@@ -39,11 +39,11 @@ public class SweepClassifierPaneFX extends BasicIdentifierPaneFX {
 	public void setClassifierPane(ClickTypeProperty clickTypeProperty){
 		SweepClassifierSetPaneFX sweepPane=new SweepClassifierSetPaneFX(sweepClickClassifier);
 	
-		
 		//make it so the title of the pane is the same as the name as the classifier
 		getFlipPane().getAdvLabel().textProperty().unbind();
 		getFlipPane().getAdvLabel().textProperty().bind(	sweepPane.getNameTextProperty());
 		
+		//System.out.println("sweepPane.classifierItemRow: " + sweepPane.classifierItemRow);
 		sweepPane.classifierItemRow = sweepClickClassifier.getSweepClassifierParams().getSetRow((SweepClassifierSet) clickTypeProperty.getClickType());
 		
 		sweepPane.setParams(clickTypeProperty);
@@ -62,7 +62,6 @@ public class SweepClassifierPaneFX extends BasicIdentifierPaneFX {
 	public void setParams() {
 		
 		sweepIdParameters = sweepClickClassifier.getSweepClassifierParams().clone();
-		
 
 		//change the table
 		tableDataChanged();
@@ -80,7 +79,6 @@ public class SweepClassifierPaneFX extends BasicIdentifierPaneFX {
 		for (int i=0; i<getClickClassifiers().size() ;i++){
 			sweepClickClassifier.getSweepClassifierParams().addSet((SweepClassifierSet) getClickClassifiers().get(i).getClickType());
 		}
-		
 
 		return true;
 	}

src/dataModelFX/connectionNodes/ModuleConnectionNode.java

@@ -619,9 +619,11 @@ public class ModuleConnectionNode extends StandardConnectionNode implements PAMC
 		
 		//add tool tip
 		if (pamControlledUnit!=null){
-			Tooltip tp = new Tooltip(pamControlledUnit.getUnitType());
-			tp.getStyleClass().removeAll(tp.getStyleClass());
-			Tooltip.install(this, tp);
+			
+			//sometimes seems to cause an issue woith dialogs disappearing. 
+//			Tooltip tp = new Tooltip(pamControlledUnit.getUnitType());
+//			tp.getStyleClass().removeAll(tp.getStyleClass());
+//			Tooltip.install(this, tp);
 			
 			//if no way for input then remove socket.
 			if (!hasInput(pamControlledUnit)){

src/pamViewFX/fxNodes/utilityPanes/FreqBandPane.java

@@ -23,7 +23,7 @@ public class FreqBandPane extends PamGridPane {
 	/**
 	 * Low pass frequency spinner.
 	 */
-	private Spinner<Double> lowPassFreq;
+	private PamSpinner<Double> lowPassFreq;
 
 	/**
 	 * Layout of the pane- either horizontal or vertical

src/pamViewFX/fxNodes/utilityPanes/GroupedSourcePaneFX.java

@@ -17,6 +17,7 @@ import pamViewFX.PamGuiManagerFX;
 import pamViewFX.fxNodes.PamGridPane;
 import pamViewFX.fxNodes.PamHBox;
 import pamViewFX.fxNodes.PamVBox;
+import pamViewFX.validator.PamValidator;
 import PamUtils.PamUtils;
 import PamView.GroupedSourceParameters;
 import PamguardMVC.PamConstants;
@@ -76,7 +77,7 @@ public class GroupedSourcePaneFX extends SourcePaneFX {
 	@Override
 	protected void createPanel() {
 		
-		channelValidator = new Validator();
+		channelValidator = new PamValidator();
 		
 		sourcePane=new PamGridPane();
 		sourcePane.setVgap(5);

src/pamViewFX/validator/PamValidator.java

@@ -0,0 +1,17 @@
+package pamViewFX.validator;
+
+import net.synedra.validatorfx.Validator;
+
+/**
+ * Extension of the validator class to add PAMGuard specific functions. 
+ * @author Jamie Macaulay
+ *
+ */
+public class PamValidator extends Validator {
+
+	public PamValidator() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+}