改进

compositions.py

@@ -9,9 +9,11 @@ from typing import Tuple, Dict
 import particles as pt
 import puzzles as pz
 import re
+import random
+import copy
 
 class Composition():
-    def __init__(self, screen: Screen, reactor, atom: Tuple[pt.Electron, pt.Nucleon, Dict]):
+    def __init__(self, screen: Screen, reactor, atom: Tuple[pt.Electron, pt.Nucleon, Dict] = pt.Atom.placeholder()):
         self.screen = screen
         self.atom = atom    
         from reactor import Reactor
@@ -30,10 +32,17 @@ class Composition():
         yield Label("示例标签", id="testlabel")
         yield Button("示例按钮", id="testbtn")
     def handler(self, event, type_):
-        if hasattr(event, "button"):
+        return 1
+        #if hasattr(event, "button"):
             #print(event.button.id)
-            self.screen.query_one("#testlabel", Label).update("hi")
+        #    self.screen.query_one("#testlabel", Label).update("hi")
 
+class Finished(Composition):
+    def __init__(self, screen: Screen, reactor, atom: Tuple[pt.Electron, pt.Nucleon, Dict]):
+        super().__init__(screen, reactor, atom)
+    def compose(self):
+        yield Label("本次记忆进程结束", id=self.regid("msg"))
+        #yield Button("示例按钮", id="testbtn")
 class Placeholder(Composition):
     def __init__(self, screen: Screen):
         self.screen = screen
@@ -128,7 +137,11 @@ class FillBlank(Composition):
         self.puzzle.refresh()
     def compose(self):
         self._work()
-        yield Label(self.puzzle.wording, id="sentence")
+        yield Label(self.puzzle.wording, id=self.regid("sentence"))
+        ans = copy.copy(self.puzzle.answer)
+        random.shuffle(ans)
+        for i in ans:
+            yield 
         yield Button("我已知晓", id="ok")
     def handler(self, event, type_):
         if event.button.id == "ok":