From: Frederik Gladhorn <gladhorn@kde.org>
Date: Thu, 6 Nov 2008 00:20:51 +0000 (+0000)
Subject: make statistics recursive
X-Git-Tag: v4.1.80^0
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=ec29efba73ad3af68e22df731f1b25988be6e740;p=libqmvoc.git

make statistics recursive

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=880632
---

diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp
index 354d003..d26ca73 100644
--- a/keduvocdocument/keduvoccontainer.cpp
+++ b/keduvocdocument/keduvoccontainer.cpp
@@ -243,21 +243,21 @@ void KEduVocContainer::invalidateChildLessonEntries()
     }
 }
 
-double KEduVocContainer::averageGrade(int translation)
+double KEduVocContainer::averageGrade(int translation, EnumEntriesRecursive recursive)
 {
     // grades range from 0..7 right now
     int sum = 0;
-    foreach (KEduVocExpression *entry, entries(NotRecursive)) {
+    foreach (KEduVocExpression *entry, entries(recursive)) {
         sum += entry->translation(translation)->grade();
     }
     // make that a percentage
-    return (sum * 100.0/7.0)/entryCount(NotRecursive);
+    return (sum * 100.0/7.0)/entryCount(recursive);
 }
 
-int KEduVocContainer::expressionsOfGrade(int translation, grade_t grade)
+int KEduVocContainer::expressionsOfGrade(int translation, grade_t grade, EnumEntriesRecursive recursive)
 {
     int sum = 0;
-    foreach (KEduVocExpression *entry, entries(NotRecursive)) {
+    foreach (KEduVocExpression *entry, entries(recursive)) {
         if (entry->translation(translation)->grade() == grade) {
             sum++;
         }
diff --git a/keduvocdocument/keduvoccontainer.h b/keduvocdocument/keduvoccontainer.h
index 42e464d..016aa18 100644
--- a/keduvocdocument/keduvoccontainer.h
+++ b/keduvocdocument/keduvoccontainer.h
@@ -131,9 +131,9 @@ public:
      */
     void setImageUrl(const KUrl &url);
 
-    double averageGrade(int translation);
+    double averageGrade(int translation, EnumEntriesRecursive recursive);
 
-    int expressionsOfGrade(int translation, grade_t grade);
+    int expressionsOfGrade(int translation, grade_t grade, EnumEntriesRecursive recursive);
 
     /**
      * Remove grades from all entries of this lessons