mirror of
https://github.com/ankitects/anki.git
synced 2025-09-20 23:12:21 -04:00
reversed new/young/mature in graphs, this made the graphs so much nicer!
This commit is contained in:
parent
cc08fd402c
commit
ccfab29fb8
1 changed files with 10 additions and 10 deletions
|
@ -83,13 +83,13 @@ from cards where type = 1 and priority in (1,2,3,4) and interval > 21""")
|
||||||
|
|
||||||
dayReps = self.deck.s.all("""
|
dayReps = self.deck.s.all("""
|
||||||
select day,
|
select day,
|
||||||
newEase0+newEase1+newEase2+newEase3+newEase4 as newReps,
|
matureEase0+matureEase1+matureEase2+matureEase3+matureEase4 as matureReps,
|
||||||
reps-(matureEase0+matureEase1+matureEase2+matureEase3+matureEase4) as combinedYoungReps,
|
reps-(newEase0+newEase1+newEase2+newEase3+newEase4) as combinedYoungReps,
|
||||||
reps as combinedMatureReps
|
reps as combinedNewReps
|
||||||
from stats""")
|
from stats""")
|
||||||
|
|
||||||
todaydt = datetime.datetime(*list(time.localtime(time.time())[:3]))
|
todaydt = datetime.datetime(*list(time.localtime(time.time())[:3]))
|
||||||
for dest, source in [("dayRepsNew", "newReps"), ("dayRepsYoung", "combinedYoungReps"), ("dayRepsMature", "combinedMatureReps")]:
|
for dest, source in [("dayRepsNew", "combinedNewReps"), ("dayRepsYoung", "combinedYoungReps"), ("dayRepsMature", "matureReps")]:
|
||||||
self.stats[dest] = dict(
|
self.stats[dest] = dict(
|
||||||
map(lambda dr: (-(todaydt -datetime.datetime(
|
map(lambda dr: (-(todaydt -datetime.datetime(
|
||||||
*(int(x)for x in dr["day"].split("-")))).days, dr[source]), dayReps))
|
*(int(x)for x in dr["day"].split("-")))).days, dr[source]), dayReps))
|
||||||
|
@ -98,18 +98,18 @@ from stats""")
|
||||||
self.calcStats()
|
self.calcStats()
|
||||||
fig = Figure(figsize=(self.width, self.height), dpi=self.dpi)
|
fig = Figure(figsize=(self.width, self.height), dpi=self.dpi)
|
||||||
graph = fig.add_subplot(111)
|
graph = fig.add_subplot(111)
|
||||||
dayslists = [self.stats['next'], self.stats['daysByType']['young']]
|
dayslists = [self.stats['next'], self.stats['daysByType']['mature']]
|
||||||
|
|
||||||
for dayslist in dayslists[:days]:
|
for dayslist in dayslists:
|
||||||
self.addMissing(dayslist, self.stats['lowestInDay'], days)
|
self.addMissing(dayslist, self.stats['lowestInDay'], days)
|
||||||
|
|
||||||
argl = []
|
argl = []
|
||||||
|
|
||||||
for dayslist in dayslists[:days]:
|
for dayslist in dayslists:
|
||||||
dl = [x for x in dayslist.items() if x[0] <= days]
|
dl = [x for x in dayslist.items() if x[0] <= days]
|
||||||
argl.extend(list(self.unzip(dl)))
|
argl.extend(list(self.unzip(dl)))
|
||||||
|
|
||||||
self.filledGraph(graph, days, ["#7777ff", "#77ffff"], *argl)
|
self.filledGraph(graph, days, ["#77ffff", "#7777ff"], *argl)
|
||||||
|
|
||||||
cheat = fig.add_subplot(111)
|
cheat = fig.add_subplot(111)
|
||||||
b1 = cheat.bar(0, 0, color = "#77ffff")
|
b1 = cheat.bar(0, 0, color = "#77ffff")
|
||||||
|
@ -130,9 +130,9 @@ from stats""")
|
||||||
fig = Figure(figsize=(self.width, self.height), dpi=self.dpi)
|
fig = Figure(figsize=(self.width, self.height), dpi=self.dpi)
|
||||||
graph = fig.add_subplot(111)
|
graph = fig.add_subplot(111)
|
||||||
|
|
||||||
args = sum((self.unzip(self.stats[type].items(), limit=days, reverseLimit=True) for type in ["dayRepsMature", "dayRepsYoung", "dayRepsNew"]), [])
|
args = sum((self.unzip(self.stats[type].items(), limit=days, reverseLimit=True) for type in ["dayRepsMature", "dayRepsYoung", "dayRepsNew"][::-1]), [])
|
||||||
|
|
||||||
self.filledGraph(graph, days, ["#7777ff", "#77ffff", "#ff7777"], *args)
|
self.filledGraph(graph, days, ["#ff7777", "#77ffff", "#7777ff"], *args)
|
||||||
|
|
||||||
cheat = fig.add_subplot(111)
|
cheat = fig.add_subplot(111)
|
||||||
b1 = cheat.bar(-3, 0, color = "#ff7777")
|
b1 = cheat.bar(-3, 0, color = "#ff7777")
|
||||||
|
|
Loading…
Reference in a new issue