File save dialog revamp. Display spectrum name in charts legends

vikulin · vikulin · commit d50c91c2bc8c · 2025-05-19T14:18:02.000+03:00
diff --git a/app/src/main/kotlin/io/github/vikulin/opengammakit/SpectrumFragment.kt b/app/src/main/kotlin/io/github/vikulin/opengammakit/SpectrumFragment.kt
@@ -318,14 +318,9 @@ class SpectrumFragment : SerialConnectionFragment(),
         }
 
         btnSaveSpectrum.setOnClickListener {
-            if(spectrumDataSet.data.size>1){
-                // show select spectrum to save into a file
-                val spectrumFileChooserDialog = SaveSelectedSpectrumDialogFragment.newInstance(spectrumDataSet)
-                spectrumFileChooserDialog.show(childFragmentManager, "save_spectrum_file_dialog_fragment")
-            } else {
-                val saveSpectrumIntoFileDialog = SaveSpectrumDataIntoFileDialogFragment.newInstance(spectrumDataSet)
-                saveSpectrumIntoFileDialog.show(childFragmentManager, "save_spectrum_into_file_dialog_fragment")
-            }
+            // show select spectrum to save into a file
+            val spectrumFileChooserDialog = SaveSelectedSpectrumDialogFragment.newInstance(spectrumDataSet)
+            spectrumFileChooserDialog.show(childFragmentManager, "save_spectrum_file_dialog_fragment")
         }
 
         btnToggleFilter.setOnClickListener {
@@ -533,12 +528,12 @@ class SpectrumFragment : SerialConnectionFragment(),
         return components.joinToString("")
     }
 
-    private fun getSpectrumLabel(index: Int, entry: GammaKitEntry): String{
-        val ct = entry.resultData.energySpectrum.validPulseCount
-        val mt = entry.resultData.energySpectrum.measurementTime
-        val ch = entry.resultData.energySpectrum.numberOfChannels
+    private fun getSpectrumLabel(index: Int, entry: OpenGammaKitData): String{
+        val ct = entry.data[index].resultData.energySpectrum.validPulseCount
+        val mt = entry.data[index].resultData.energySpectrum.measurementTime
+        val ch = entry.data[index].resultData.energySpectrum.numberOfChannels
         val t = formatTimeSkipZeros(mt)
-        return (entry.deviceData.deviceName?:"Spectrum ${index + 1}")+" Ch $ch Ct $ct T $t"
+        return entry.data[index].deviceData.deviceName +" ${entry.derivedSpectra[index]?.name} Ch $ch Ct $ct T $t"
     }
 
     private fun setupChart() {
@@ -553,7 +548,7 @@ class SpectrumFragment : SerialConnectionFragment(),
             val entries = spectrum.mapIndexed { ch, count ->
                 Entry(ch.toFloat(), count.toFloat())
             }
-            val label = getSpectrumLabel(entry.key, spectrumDataSet.data[entry.key])
+            val label = getSpectrumLabel(entry.key, spectrumDataSet)
             LineDataSet(entries, label).apply {
                 mode = LineDataSet.Mode.CUBIC_BEZIER
                 lineWidth = 1.5f
@@ -616,7 +611,7 @@ class SpectrumFragment : SerialConnectionFragment(),
             val entries = spectrum.mapIndexed { ch, count ->
                 Entry(ch.toFloat(), count.toFloat())
             }
-            val label = getSpectrumLabel(entry.key, spectrumDataSet.data[entry.key])
+            val label = getSpectrumLabel(entry.key, spectrumDataSet)
             LineDataSet(entries, label).apply {
                 mode = LineDataSet.Mode.CUBIC_BEZIER
                 lineWidth = 1.5f
@@ -665,7 +660,7 @@ class SpectrumFragment : SerialConnectionFragment(),
             val energy = interpolateEnergy(sortedCalibrationList, index.toDouble())
             Entry(energy.toFloat(), count.toFloat())
         }
-        val label = getSpectrumLabel(selectedIndex, spectrumDataSet.data[selectedIndex])
+        val label = getSpectrumLabel(selectedIndex, spectrumDataSet)
         val calibratedDataSet = LineDataSet(energyEntries, label).apply {
             mode = LineDataSet.Mode.CUBIC_BEZIER
             lineWidth = 1.5f
@@ -1506,22 +1501,44 @@ class SpectrumFragment : SerialConnectionFragment(),
 
     override fun onChoose(uri: String) {
         val openGammaKitData = readAndParseFile(requireContext(), uri.toUri())
-        spectrumDataSet.data.addAll(openGammaKitData.data)
+
+        openGammaKitData.data.forEachIndexed { index, spectrum ->
+            val addedIndex = spectrumDataSet.data.size
+            spectrumDataSet.data.add(spectrum)
+
+            spectrumDataSet.derivedSpectra[addedIndex] = openGammaKitData.derivedSpectra[index]
+                ?: DerivedSpectrumEntry(
+                    name = "Copied from raw spectrum",
+                    resultSpectrum = spectrum.resultData.energySpectrum.spectrum.map { it.toDouble() },
+                    modifiers = mutableListOf(),
+                    peaks = mutableListOf()
+                )
+        }
+
         updateChartSpectrumData()
     }
 
-    override fun onChooseMultiple(selectedIndexes: List<Int>) {
-        // Filter entries based on selected indexes
-        val selectedEntries = spectrumDataSet.data.filterIndexed { index, _ ->
-            index in selectedIndexes
-        }.toMutableList()
+    override fun onChooseMultiple(selectedIndexes: MutableMap<Int, String>) {
+        // Filter entries and remap derivedSpectra with updated names
+        val selectedEntries = mutableListOf<GammaKitEntry>()
+        val selectedDerivedSpectra = mutableMapOf<Int, DerivedSpectrumEntry>()
+
+        for ((originalIndex, newName) in selectedIndexes) {
+            val entry = spectrumDataSet.data.getOrNull(originalIndex) ?: continue
+            selectedEntries.add(entry)
 
-        // Create a submap of derivedSpectra for selected indexes
-        val selectedDerivedSpectra = spectrumDataSet.derivedSpectra
-            .filterKeys { it in selectedIndexes }
-            .toMutableMap()
+            val derived = spectrumDataSet.derivedSpectra[originalIndex]?.copy(name = newName)
+                ?: DerivedSpectrumEntry(
+                    name = newName,
+                    resultSpectrum = entry.resultData.energySpectrum.spectrum.map { it.toDouble() },
+                    modifiers = mutableListOf(),
+                    peaks = mutableListOf()
+                )
+
+            selectedDerivedSpectra[selectedEntries.lastIndex] = derived
+        }
 
-        // Create a new OpenGammaKitData with the same schema version and modified data
+        // Create a new OpenGammaKitData with selected and renamed items
         val modifiedData = OpenGammaKitData(
             schemaVersion = spectrumDataSet.schemaVersion,
             data = selectedEntries,
diff --git a/app/src/main/kotlin/io/github/vikulin/opengammakit/adapter/SpectrumFwhmSelectAdapter.kt b/app/src/main/kotlin/io/github/vikulin/opengammakit/adapter/SpectrumFwhmSelectAdapter.kt
@@ -20,7 +20,7 @@ class SpectrumFwhmSelectAdapter(
 
     inner class SpectrumViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val colorIndicator: MaterialCardView = itemView.findViewById(R.id.colorIndicator)
-        val deviceName: TextView = itemView.findViewById(R.id.deviceName)
+        val deviceName: TextView = itemView.findViewById(R.id.spectrumName)
 
         fun bind(entry: GammaKitEntry, index: Int) {
             colorIndicator.setBackgroundTintList(ColorStateList.valueOf(SpectrumFragment.getLineColor(dialog.requireContext(), index)))
diff --git a/app/src/main/kotlin/io/github/vikulin/opengammakit/adapter/SpectrumSaveAdapter.kt b/app/src/main/kotlin/io/github/vikulin/opengammakit/adapter/SpectrumSaveAdapter.kt
@@ -6,49 +6,50 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
-import android.widget.TextView
+import android.widget.EditText
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
 import io.github.vikulin.opengammakit.R
 import io.github.vikulin.opengammakit.SpectrumFragment
-import io.github.vikulin.opengammakit.model.GammaKitEntry
+import io.github.vikulin.opengammakit.model.OpenGammaKitData
+import kotlin.collections.mutableMapOf
 
 class SpectrumSaveAdapter(
     private val context: Context,
-    private val spectrumData: List<GammaKitEntry>
+    private val spectrumData: OpenGammaKitData
 ) : RecyclerView.Adapter<SpectrumSaveAdapter.SpectrumViewHolder>() {
 
-    private val selectedPositions = mutableSetOf<Int>()
+    private val selectedPositions = mutableMapOf<Int, String>()
 
     inner class SpectrumViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         private val colorIndicator: MaterialCardView = itemView.findViewById(R.id.colorIndicator)
-        private val deviceName: TextView = itemView.findViewById(R.id.deviceName)
+        private val spectrumName: EditText = itemView.findViewById(R.id.spectrumName)
         private val checkBox: CheckBox = itemView.findViewById(R.id.spectrumCheckBox)
 
-        fun bind(entry: GammaKitEntry, index: Int) {
+        fun bind(entry: OpenGammaKitData, index: Int) {
             colorIndicator.setBackgroundTintList(
                 ColorStateList.valueOf(SpectrumFragment.getLineColor(context, index))
             )
 
-            val name = entry.deviceData.deviceName.takeIf { it.isNotEmpty() } ?: "Spectrum #$index"
-            deviceName.text = name
+            val name = entry.derivedSpectra[index]?.name ?: "Noname"
+            spectrumName.setText(name)
             checkBox.isChecked = selectedPositions.contains(index)
 
             itemView.setOnClickListener {
-                toggleSelection(index)
+                toggleSelection(index, spectrumName.text.toString())
                 notifyItemChanged(index)
             }
 
             checkBox.setOnClickListener {
-                toggleSelection(index)
+                toggleSelection(index, spectrumName.text.toString())
             }
         }
 
-        private fun toggleSelection(index: Int) {
+        private fun toggleSelection(index: Int, name: String) {
             if (selectedPositions.contains(index)) {
                 selectedPositions.remove(index)
             } else {
-                selectedPositions.add(index)
+                selectedPositions[index] = name
             }
         }
     }
@@ -59,16 +60,12 @@ class SpectrumSaveAdapter(
     }
 
     override fun onBindViewHolder(holder: SpectrumViewHolder, position: Int) {
-        holder.bind(spectrumData[position], position)
+        holder.bind(spectrumData, position)
     }
 
-    override fun getItemCount(): Int = spectrumData.size
+    override fun getItemCount(): Int = spectrumData.data.size
 
-    fun getSelectedItems(): List<GammaKitEntry> {
-        return selectedPositions.map { spectrumData[it] }
-    }
-
-    fun getSelectedIndexes(): List<Int> {
-        return selectedPositions.toList()
+    fun getSelectedIndexes(): MutableMap<Int, String> {
+        return selectedPositions
     }
 }
diff --git a/app/src/main/kotlin/io/github/vikulin/opengammakit/view/SaveSelectedSpectrumDialogFragment.kt b/app/src/main/kotlin/io/github/vikulin/opengammakit/view/SaveSelectedSpectrumDialogFragment.kt
@@ -53,7 +53,7 @@ class SaveSelectedSpectrumDialogFragment : DialogFragment() {
         val spectrumData = arguments?.getSerializable(SPECTRUM_DATA) as? OpenGammaKitData
             ?: return view
 
-        adapter = SpectrumSaveAdapter(this.requireContext(), spectrumData.data)
+        adapter = SpectrumSaveAdapter(this.requireContext(), spectrumData)
         recyclerView.layoutManager = LinearLayoutManager(context)
         recyclerView.adapter = adapter
 
@@ -73,6 +73,6 @@ class SaveSelectedSpectrumDialogFragment : DialogFragment() {
 
     // Updated callback to support multiple selection
     interface ChooseSpectrumDialogListener {
-        fun onChooseMultiple(selectedIndexes: List<Int>)
+        fun onChooseMultiple(selectedIndexes: MutableMap<Int, String>)
     }
 }
diff --git a/app/src/main/kotlin/io/github/vikulin/opengammakit/view/SaveSpectrumDataIntoFileDialogFragment.kt b/app/src/main/kotlin/io/github/vikulin/opengammakit/view/SaveSpectrumDataIntoFileDialogFragment.kt
@@ -60,7 +60,7 @@ class SaveSpectrumDataIntoFileDialogFragment : DialogFragment() {
         val formatter = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault())
         val timestamp = formatter.format(Date())
         val fileName = "spectrum_$timestamp.json"
-        fileNameEditText.setText(fileName)
+        fileNameEditText.text = fileName
         selectedLocationText.text = "Documents/OpenGammaKit/"
         selectLocationButton.setOnClickListener {
             val name = fileNameEditText.text.toString().trim()
diff --git a/app/src/main/res/layout/item_fwhm_spectrum.xml b/app/src/main/res/layout/item_fwhm_spectrum.xml
@@ -15,7 +15,7 @@
         android:layout_marginEnd="20dp" />
 
     <TextView
-        android:id="@+id/deviceName"
+        android:id="@+id/spectrumName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="Spectrum #1"
diff --git a/app/src/main/res/layout/item_save_spectrum.xml b/app/src/main/res/layout/item_save_spectrum.xml
@@ -14,14 +14,20 @@
         android:backgroundTint="@color/colorAccent"
         android:layout_marginEnd="20dp" />
 
-    <TextView
-        android:id="@+id/deviceName"
+    <EditText
+        android:id="@+id/spectrumName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:autofillHints="name"
+        android:minWidth="300dp"
         android:text="Spectrum #1"
+        android:hint="Spectrum name"
+        android:maxLength="10"
+        android:inputType="text"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
         android:textColor="@color/colorPrimaryText"
         android:textSize="14sp"
-        android:layout_weight="1"
         android:gravity="center_vertical" />
 
     <CheckBox

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class SaveSelectedSpectrumDialogFragment : DialogFragment() {`
`53`	`53`	`val spectrumData = arguments?.getSerializable(SPECTRUM_DATA) as? OpenGammaKitData`
`54`	`54`	`?: return view`
`55`	`55`
`56`		`- adapter = SpectrumSaveAdapter(this.requireContext(), spectrumData.data)`
	`56`	`+ adapter = SpectrumSaveAdapter(this.requireContext(), spectrumData)`
`57`	`57`	`recyclerView.layoutManager = LinearLayoutManager(context)`
`58`	`58`	`recyclerView.adapter = adapter`
`59`	`59`
`@@ -73,6 +73,6 @@ class SaveSelectedSpectrumDialogFragment : DialogFragment() {`
`73`	`73`
`74`	`74`	`// Updated callback to support multiple selection`
`75`	`75`	`interface ChooseSpectrumDialogListener {`
`76`		`- fun onChooseMultiple(selectedIndexes: List<Int>)`
	`76`	`+ fun onChooseMultiple(selectedIndexes: MutableMap<Int, String>)`
`77`	`77`	`}`
`78`	`78`	`}`