Update app.py

app.py

@@ -133,12 +133,15 @@ def analyze(inFileName):
             categorySelections = st.session_state["categorySelect"][currFileIndex]
             
             noVoice, oneVoice, multiVoice = su.calcSpeakingTypes(currAnnotation,currTotalTime)
+            sumNoVoice = su.sumTimes(noVoice)
+            sumOneVoice = su.sumTimes(oneVoice)
+            sumMultiVoice = su.sumTimes(multiVoice)
             
             df3 = pd.DataFrame(
                 {
-                    "values": [su.sumTimes(noVoice),
-                                su.sumTimes([n for _,n in oneVoice]),
-                                su.sumTimes([n for _,n in multiVoice])],
+                    "values": [sumNoVoice,
+                                sumOneVoice,
+                                sumMultiVoice],
                     "names": ["No Voice","One Voice","Multi Voice"],
                 }
             )
@@ -175,9 +178,6 @@ def analyze(inFileName):
             speakerList,timeList = su.sumTimesPerSpeaker(oneVoice)
             multiSpeakerList, multiTimeList = su.sumMultiTimesPerSpeaker(multiVoice)
             summativeMultiSpeaker = sum(multiTimeList)
-            sumNoVoice = su.sumTimes(noVoice)
-            sumOneVoice = su.sumTimes([n for _,n in oneVoice])
-            sumMultiVoice = su.sumTimes([n for _,n in multiVoice])
             basePercentiles = [sumNoVoice/currTotalTime,
                                  sumOneVoice/currTotalTime,
                                  sumMultiVoice/currTotalTime
@@ -559,7 +559,7 @@ else:
                 for i in indices:
                     currSpeakerList, currAnnotation, currTotalTime = st.session_state.results[i]
                     categorySelections = st.session_state["categorySelect"][i]
-                    catSummary,extraCats = calcCategories(currAnnotation,categorySelections)
+                    catSummary,extraCats = su.calcCategories(currAnnotation,categorySelections)
                     st.session_state.summaries[i]["categories"] = (catSummary,extraCats)
                     for extra in extraCats:
                         df6_dict[extra] = []
@@ -573,7 +573,7 @@ else:
                     summary, extras = st.session_state.summaries[i]["categories"]
                     theseCategories = st.session_state.categories + extras
                     for j, timeSlots in enumerate(summary):
-                        df6_dict[theseCategories[j]].append(su.sumTimes([t for _,t in timeSlots])/st.session_state.results[i][2])
+                        df6_dict[theseCategories[j]].append(sum([t.duration for _,t in timeSlots])/st.session_state.results[i][2])
                     for category in allCategories:
                         if category not in theseCategories:
                             df6_dict[category].append(0)