feat: update name while typing; respect manual user changes

saalfeldlab · Dec 15, 2023 · be3f486 · be3f486
1 parent e4255b1
commit be3f486
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/kotlin/org/janelia/saalfeldlab/paintera/ui/dialogs/create/CreateDataset.kt b/src/main/kotlin/org/janelia/saalfeldlab/paintera/ui/dialogs/create/CreateDataset.kt
@@ -31,7 +31,6 @@ import org.controlsfx.validation.ValidationSupport
 import org.controlsfx.validation.Validator
 import org.controlsfx.validation.decoration.GraphicValidationDecoration
 import org.janelia.saalfeldlab.fx.SaalFxStyle
-import org.janelia.saalfeldlab.fx.extensions.invoke
 import org.janelia.saalfeldlab.fx.ui.DirectoryField
 import org.janelia.saalfeldlab.fx.ui.Exceptions.Companion.exceptionAlert
 import org.janelia.saalfeldlab.fx.ui.NamedNode.Companion.bufferNode
@@ -93,7 +92,7 @@ class CreateDataset(private val currentSource: Source<*>?, vararg allSources: So
 	private val setFromButton = MenuButton("_Populate", null, populateFromSource, populateFromCurrentSource)
 	private val setFromCurrentBox = HBox(bufferNode(), setFromButton).apply { HBox.setHgrow(children[0], Priority.ALWAYS) }
 
-	private val name = object: TextField() {
+	private val nameField = object: TextField() {
 		var manuallyNamed = false
 		override fun paste() {
 			super.paste()
@@ -116,8 +115,8 @@ class CreateDataset(private val currentSource: Source<*>?, vararg allSources: So
 	private val n5Container: DirectoryField = DirectoryField(System.getProperty("user.home"), FIELD_WIDTH)
 	private val dataset = stringField("", *SubmitOn.values()).apply {
 		textField.textProperty().addListener { _, _, newv: String? ->
-			if (!name.manuallyNamed && newv != null) {
-				name.text = newv.split("/").toTypedArray().last()
+			if (!nameField.manuallyNamed && newv != null) {
+				nameField.text = newv.split("/").toTypedArray().last()
 			}
 		}
 	}
@@ -129,7 +128,7 @@ class CreateDataset(private val currentSource: Source<*>?, vararg allSources: So
 	private val offset = SpatialField.doubleField(0.0, { true }, FIELD_WIDTH, *SubmitOn.values())
 	private val scaleLevels = TitledPane("Scale Levels", mipmapLevelsNode)
 	private val pane = VBox(
-		nameIt("Name", NAME_WIDTH, true, name),
+		nameIt("Name", NAME_WIDTH, true, nameField),
 		nameIt("N5", NAME_WIDTH, true, n5Container.asNode()),
 		nameIt("Dataset", NAME_WIDTH, true, dataset.textField),
 		nameIt("Dimensions", NAME_WIDTH, false, bufferNode(), dimensions.node),
@@ -248,7 +247,7 @@ class CreateDataset(private val currentSource: Source<*>?, vararg allSources: So
 			dialogPane.lookupButton(ButtonType.OK).addEventFilter(ActionEvent.ACTION) { e: ActionEvent ->
 				val container = n5Container.directoryProperty().value!!.absolutePath
 				val dataset = dataset.value
-				val name = name.text
+				val name = nameField.text
 				try {
 					LOG.debug("Trying to create empty label dataset `{}' in container `{}'", dataset, container)
 					if (dataset.isNullOrEmpty()) throw IOException("Dataset not specified!")
@@ -289,7 +288,7 @@ class CreateDataset(private val currentSource: Source<*>?, vararg allSources: So
 				}
 			}
 		}.showAndWait()
-		val name = name.text
+		val name = nameField.text
 		return Optional.ofNullable(metadataStateProp.get()).map { metadataState: MetadataState -> Pair(metadataState, name) }
 	}