Merge pull request #433 from scenerygraphics/feature/ui-cleanup

scenerygraphics · Jul 15, 2023 · 32407ec · 32407ec
2 parents d50e2a8 + 5d3bd08
commit 32407ec
Show file tree

Hide file tree

Showing 21 changed files with 433 additions and 453 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -60,6 +60,8 @@ dependencies {
 
     implementation("com.formdev:flatlaf")
 
+    implementation("org.slf4j:slf4j-simple")
+
     // SciJava dependencies
 
     implementation("org.yaml:snakeyaml") {

diff --git a/src/main/java/sc/iview/commands/edit/add/AddLabelImage.java b/src/main/java/sc/iview/commands/edit/add/AddLabelImage.java
diff --git a/src/main/java/sc/iview/commands/edit/add/AddOrientationCompass.java b/src/main/java/sc/iview/commands/edit/add/AddOrientationCompass.java
diff --git a/src/main/kotlin/sc/iview/SciView.kt b/src/main/kotlin/sc/iview/SciView.kt
@@ -1455,19 +1455,16 @@ fun deleteNode(node: Node?, activePublish: Boolean = true) {
     </T> */
     @JvmOverloads
     @Suppress("UNCHECKED_CAST")
-    fun <T : NumericType<T>> addVolume(sources: List<SourceAndConverter<T>>,
-                                       converterSetups: ArrayList<ConverterSetup>,
-                                       numTimepoints: Int,
-                                       name: String = "Volume",
-                                       vararg voxelDimensions: Float,
-                                       block: Volume.() -> Unit = {},
-                                       colormapName: String = "Fire.lut"): Volume {
+    fun <T : RealType<T>> addVolume(sources: List<SourceAndConverter<T>>,
+                                    converterSetups: ArrayList<ConverterSetup>,
+                                    numTimepoints: Int,
+                                    name: String = "Volume",
+                                    voxelDimensions: FloatArray,
+                                    block: Volume.() -> Unit = {},
+                                    colormapName: String = "Fire.lut"): Volume {
         var timepoints = numTimepoints
         var cacheControl: CacheControl? = null
 
-//        RandomAccessibleInterval<T> image =
-//                ((RandomAccessibleIntervalSource4D) sources.get(0).getSpimSource()).
-//                .getSource(0, 0);
         val image = sources[0].spimSource.getSource(0, 0)
         if (image is VolatileView<*, *>) {
             val viewData = (image as VolatileView<T, Volatile<T>>).volatileViewData
@@ -1488,7 +1485,18 @@ fun deleteNode(node: Node?, activePublish: Boolean = true) {
         if (image.numDimensions() > 3) {
             timepoints = image.dimension(3).toInt()
         }
-        val ds = RAISource<T>(voxelType, sources, converterSetups, timepoints, cacheControl)
+
+        val ds = if(converterSetups != null) {
+            RAISource<T>(voxelType, sources, converterSetups, timepoints, cacheControl)
+        } else {
+            val cs = ArrayList<ConverterSetup>()
+            for ((setupId, source) in sources.withIndex()) {
+                cs.add(BigDataViewer.createConverterSetup(source, setupId))
+            }
+
+            RAISource<T>(voxelType, sources, cs, timepoints, cacheControl)
+        }
+
         val options = VolumeViewerOptions()
         val v: Volume = RAIVolume(ds, options, hub)
         // Note we override scenery's default scale of mm
@@ -1535,7 +1543,7 @@ fun deleteNode(node: Node?, activePublish: Boolean = true) {
         for (source in sources) {
             converterSetups.add(BigDataViewer.createConverterSetup(source, setupId++))
         }
-        val v = addVolume(sources, converterSetups, numTimepoints, name, *voxelDimensions, block = block)
+        val v = addVolume(sources, converterSetups, numTimepoints, name, voxelDimensions, block = block)
         imageToVolumeMap[sources] = v
         return v
     }

diff --git a/src/main/kotlin/sc/iview/commands/MenuWeights.kt b/src/main/kotlin/sc/iview/commands/MenuWeights.kt
@@ -36,35 +36,38 @@ package sc.iview.commands
  */
 object MenuWeights {
     const val FILE = 0.0
-    const val EDIT = 1.0
-    const val PROCESS = 2.0
-    const val VIEW = 3.0
-    const val DEMO = 4.0
-    const val HELP = 4.0
+    const val ADD = 1.0
+    const val EDIT = 3.0
+    const val PROCESS = 4.0
+    const val VIEW = 5.0
+    const val DEMO = 6.0
+    const val HELP = 7.0
     const val FILE_OPEN = 0.0
     const val FILE_EXPORT = 1.0
     // File/Export
     const val FILE_EXPORT_N5 = 0.0
     const val FILE_EXPORT_STL = 1.0
     const val FILE_EXPORT_XYZ = 2.0
     // Edit
-    const val EDIT_ADD = 0.0
     const val EDIT_SETTINGS = 2.0
     const val EDIT_TOGGLE_FLOOR = 50.0
     const val EDIT_DELETE_OBJECT = 100.0
     const val EDIT_RESET_SCENE = 200.0
     // Edit/Add
     const val EDIT_ADD_BOX = 0.0
-    const val EDIT_ADD_SPHERE = 1.0
-    const val EDIT_ADD_CYLINDER = 1.3
-    const val EDIT_ADD_CONE = 1.6
-    const val EDIT_ADD_LINE = 2.0
-    const val EDIT_ADD_POINTLIGHT = 3.0
-    const val EDIT_ADD_LABELIMAGE = 4.0
-    const val EDIT_ADD_VOLUME = 5.0
-    const val EDIT_ADD_CAMERA = 6.0
-    const val EDIT_ADD_COMPASS = 7.0
-    const val EDIT_ADD_SLICING_PLANE = 8.0
+    const val EDIT_ADD_CAMERA = 1.0
+    const val EDIT_ADD_COMPASS = 2.0
+    const val EDIT_ADD_CYLINDER = 3.0
+    const val EDIT_ADD_CONE = 4.0
+    const val EDIT_ADD_LABELIMAGE = 5.0
+    const val EDIT_ADD_LINE = 6.0
+    const val EDIT_ADD_POINTLIGHT = 7.0
+    const val EDIT_ADD_PROTEIN = 8.0
+    const val EDIT_ADD_PROTEIN_FILE = 9.0
+    const val EDIT_ADD_SLICING_PLANE = 10.0
+    const val EDIT_ADD_SPHERE = 11.0
+    const val EDIT_ADD_VOLUME = 12.0
+
     // Edit/Settings
     const val EDIT_SETTINGS_BINDINGS = 0.0
     const val EDIT_SETTINGS_CONTROLS = 1.0