u

jangenoe · Nov 4, 2024 · 98f144c · 98f144c
1 parent c405658
commit 98f144c
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 9 deletions.
diff --git a/.github/common/convert-to-pptx.py b/.github/common/convert-to-pptx.py
@@ -136,26 +136,26 @@ def maketitle(cell,slide):
                                     par.line_spacing = Pt(8)
                                     par.font.color.rgb = RGBColor(0, 0, 0)
                                 slide.shapes[0].text_frame.fit_text(font_family="Courier",max_size=30, font_file=r".github/common/fonts/cour.ttf")
-                        elif "text" in output:
-                            if len(output)<20:
+                        elif "text" in cell.outputs:
+                            if len(cell.outputs["text"])<20:
                                 slide = prs.slides.add_slide(prs.slide_layouts[5])
                                 maketitle(cell,slide) 
-                                slide.shapes[0].text="".join(output)
+                                slide.shapes[0].text="".join(cell.outputs["text"])
                                 for par in slide.shapes[0].text_frame.paragraphs:
                                     par.line_spacing = Pt(8)
                                     par.font.color.rgb = RGBColor(0, 0, 0)
                                 slide.shapes[0].text_frame.fit_text(font_family="Courier",max_size=30, font_file=r".github/common/fonts/cour.ttf") 
                             else:
                                 slide = prs.slides.add_slide(prs.slide_layouts[5])
                                 maketitle(cell,slide) 
-                                slide.shapes[0].text="".join(output[:20])
+                                slide.shapes[0].text="".join(cell.outputs["text"][:20])
                                 for par in slide.shapes[0].text_frame.paragraphs:
                                     par.line_spacing = Pt(8)
                                     par.font.color.rgb = RGBColor(0, 0, 0)
                                 slide.shapes[0].text_frame.fit_text(font_family="Courier",max_size=30, font_file=r".github/common/fonts/cour.ttf")           
                                 slide = prs.slides.add_slide(prs.slide_layouts[5])
                                 maketitle(cell,slide) 
-                                slide.shapes[0].text="".join(output[20:])
+                                slide.shapes[0].text="".join(cell.outputs["text"][20:])
                                 for par in slide.shapes[0].text_frame.paragraphs:
                                     par.line_spacing = Pt(8)
                                     par.font.color.rgb = RGBColor(0, 0, 0)
@@ -201,6 +201,10 @@ def maketitle(cell,slide):
                                 print("   text_fit error for cell number "+str(index))
 
                         running_height+=box.height+Inches(0.3)
+                elif  cell.metadata.slideshow.get("slide_type", ())=="notes":
+                    notes_slide = slide.notes_slide  # Notes are always added to the former slide. Slide must already exist.
+                    notes_slide.notes_text_frame.text = "".join(cell.get('source', {}))
+
 
     slide = prs.slides.add_slide(prs.slide_layouts[10])
     slide = prs.slides.add_slide(prs.slide_layouts[9])

diff --git a/MicroEnNanoTechnologie/PCB.ipynb b/MicroEnNanoTechnologie/PCB.ipynb
@@ -81,7 +81,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b24a566e-36e0-495e-a9ef-d701ad8f7451",
+   "id": "5c7dcbb4-0042-432b-b483-4c166b8bf3c9",
    "metadata": {},
    "outputs": [],
    "source": []

diff --git a/ToegepasteAnalogeElektronica/Filters.ipynb b/ToegepasteAnalogeElektronica/Filters.ipynb
@@ -8385,7 +8385,9 @@
     "tags": []
    },
    "source": [
-    "### Butterworth laagdoorlaatfilter van de 5de orde"
+    "### Butterworth laagdoorlaatfilter van de 5de orde\n",
+    "\n",
+    "Wanneer we de transferfucntie van de Butterworth laagdoorlaatfilter van de 5de orde berekenen, bekomen we de volgende coeficienten:"
    ]
   },
   {
@@ -8399,7 +8401,7 @@
     "KULeuvenSlides": {
      "slide_code": "normal",
      "slide_ref": "",
-     "slide_title": "coefficienten transferfunctie vijfde orde Butterworth laagdoorlaatfilter (1 MHz)"
+     "slide_title": "Coefficienten transferfunctie vijfde orde Butterworth laagdoorlaatfilter (1 MHz)"
     },
     "editable": true,
     "execution": {
@@ -8446,6 +8448,48 @@
     "freqs_resp([[b5,a5]],4,8,Printcoef=True,ShowGraf=False);"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "KULeuvenSlides": {
+     "slide_code": "normal",
+     "slide_ref": "",
+     "slide_title": ""
+    },
+    "editable": true,
+    "slideshow": {
+     "slide_type": "notes"
+    },
+    "tags": []
+   },
+   "source": [
+    "Voor een laagdoorlaatfilter van de 5de orde is de orde van de veelterm in de teller 0 en de order van de veelterm in de noemer 5."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "KULeuvenSlides": {
+     "slide_code": "normal",
+     "slide_ref": "",
+     "slide_title": ""
+    },
+    "editable": true,
+    "mystnb": {
+     "figure": {
+      "caption": "",
+      "name": ""
+     }
+    },
+    "slideshow": {
+     "slide_type": "skip"
+    },
+    "tags": []
+   },
+   "source": [
+    "{numref}`filter-fig15` toont het bekomen Bode diagram van deze transferfunctie. We zien een verloop van 450 graden in de fase. Aangezien enkel 360 graden van de fase wordt weergegeven, zit er een schijnbare sprong in rond 800 kHz. Dit is geen echte sprong. De fase blijft continu verlopen."
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 47,
@@ -8474,7 +8518,7 @@
     "mystnb": {
      "figure": {
       "caption": "Amplitude en fase van een vijfde orde Butterworth laagdoorlaatfilter met afsnijfrequentie 1 MHz.",
-      "name": "fig15"
+      "name": "filter-fig15"
      }
     },
     "slideshow": {