Skip to content

Commit a669682

Browse files
smlptskalarproduktraum
authored andcommitted
PR cleanup
1 parent 25546af commit a669682

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/main/kotlin/sc/iview/commands/analysis/CellTrackingBase.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ open class CellTrackingBase(
6565

6666
private lateinit var lightTetrahedron: List<PointLight>
6767

68-
val volumeTPWidget = TextBoard()
68+
val volumeTimepointWidget = TextBoard()
6969

7070
/** determines whether the volume and hedgehogs should keep listening for updates or not */
7171
var cellTrackingActive: Boolean = false
@@ -212,7 +212,7 @@ open class CellTrackingBase(
212212
TrackerRole.RightHand -> rightVRController = device
213213
}
214214
if (device.role == TrackerRole.RightHand) {
215-
attachCursorAndTPWidget()
215+
attachCursorAndTimepointWidget()
216216
device.model?.name = "rightHand"
217217
} else if (device.role == TrackerRole.LeftHand) {
218218
device.model?.name = "leftHand"
@@ -543,24 +543,24 @@ open class CellTrackingBase(
543543
}
544544

545545
/** Attach a spherical cursor to the right controller. */
546-
private fun attachCursorAndTPWidget(debug: Boolean = false) {
546+
private fun attachCursorAndTimepointWidget(debug: Boolean = false) {
547547
// Only attach if not already attached
548548
if (sciview.findNodes { it.name == "VR Cursor" }.isNotEmpty()) {
549549
return
550550
}
551551

552-
volumeTPWidget.text = volume.currentTimepoint.toString()
553-
volumeTPWidget.name = "Volume Timepoint Widget"
554-
volumeTPWidget.fontColor = Vector4f(0.4f, 0.45f, 1f, 1f)
555-
volumeTPWidget.spatial {
552+
volumeTimepointWidget.text = volume.currentTimepoint.toString()
553+
volumeTimepointWidget.name = "Volume Timepoint Widget"
554+
volumeTimepointWidget.fontColor = Vector4f(0.4f, 0.45f, 1f, 1f)
555+
volumeTimepointWidget.spatial {
556556
scale = Vector3f(0.07f)
557557
position = Vector3f(-0.05f, -0.05f, 0.12f)
558558
rotation = Quaternionf().rotationXYZ(-1.57f, -1.57f, 0f)
559559
}
560560

561561
rightVRController?.model?.let {
562562
cursor.attachCursor(sciview, it)
563-
sciview.addNode(volumeTPWidget, activePublish = false, parent = it)
563+
sciview.addNode(volumeTimepointWidget, activePublish = false, parent = it)
564564
}
565565
}
566566

src/main/kotlin/sc/iview/commands/analysis/HedgehogAnalysis.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,10 @@ class HedgehogAnalysis(val spines: List<SpineMetadata>, val localToWorld: Matrix
446446
fun main(args: Array<String>) {
447447
val logger = LoggerFactory.getLogger("HedgehogAnalysisMain")
448448
// main should only be called for testing purposes
449-
val file = File("C:/path/to/your/test/CSV")
450-
val analysis = HedgehogAnalysis.fromCSV(file)
451-
val results = analysis.run()
452-
logger.info("Results: \n$results")
449+
if (args.isNotEmpty()) {
450+
val file = File(args[0])
451+
val analysis = HedgehogAnalysis.fromCSV(file)
452+
val results = analysis.run()
453+
logger.info("Results: \n$results")
454+
}
453455
}

src/main/kotlin/sc/iview/commands/analysis/SpineMetadata.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ data class SpineMetadata(
2020
val confidence: Float,
2121
val samples: List<Float>,
2222
val samplePosList: List<Vector3f> = ArrayList()
23-
)
23+
)

0 commit comments

Comments
 (0)