Merge branch 'dev' into feature/df-new
# Conflicts: # visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt # visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt # visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisionTreeFragment.kt # visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt # visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
This commit is contained in:
commit
c410baac8c
@ -16,7 +16,6 @@ import space.kscience.dataforge.meta.descriptors.validate
|
|||||||
import space.kscience.dataforge.misc.Named
|
import space.kscience.dataforge.misc.Named
|
||||||
import space.kscience.dataforge.misc.Type
|
import space.kscience.dataforge.misc.Type
|
||||||
import space.kscience.dataforge.names.Name
|
import space.kscience.dataforge.names.Name
|
||||||
import space.kscience.dataforge.provider.provideByType
|
|
||||||
import space.kscience.dataforge.values.Null
|
import space.kscience.dataforge.values.Null
|
||||||
import space.kscience.dataforge.values.Value
|
import space.kscience.dataforge.values.Value
|
||||||
import space.kscience.visionforge.widget
|
import space.kscience.visionforge.widget
|
||||||
@ -77,7 +76,7 @@ public interface ValueChooser {
|
|||||||
TextValueChooser.name -> TextValueChooser
|
TextValueChooser.name -> TextValueChooser
|
||||||
ColorValueChooser.name -> ColorValueChooser
|
ColorValueChooser.name -> ColorValueChooser
|
||||||
ComboBoxValueChooser.name -> ComboBoxValueChooser
|
ComboBoxValueChooser.name -> ComboBoxValueChooser
|
||||||
else -> context.provideByType(type)//Search for additional factories in the plugin
|
else -> null//context.provideByType(type)//Search for additional factories in the plugin
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,9 @@ public class VisionTreeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
selectionModel.selectionMode = SelectionMode.SINGLE
|
selectionModel.selectionMode = SelectionMode.SINGLE
|
||||||
val selectedValue = selectionModel.selectedItemProperty().objectBinding { it?.value?.second }
|
val selectedValue = selectionModel.selectedItemProperty().objectBinding {
|
||||||
|
it?.value?.second
|
||||||
|
}
|
||||||
selectedProperty.bind(selectedValue)
|
selectedProperty.bind(selectedValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user