launcher: math derive short form + help

This commit is contained in:
2 * r + 2 * t 2025-01-15 15:45:20 +11:00
parent 5802af6701
commit 47aa362b88
2 changed files with 13 additions and 7 deletions

View file

@ -121,9 +121,9 @@ const Result = ({
<button className="result" cursor="pointer" onClicked={onClicked}> <button className="result" cursor="pointer" onClicked={onClicked}>
<box> <box>
{icon && Astal.Icon.lookup_icon(icon) ? ( {icon && Astal.Icon.lookup_icon(icon) ? (
<icon className="icon" icon={icon} /> <icon valign={Gtk.Align.START} className="icon" icon={icon} />
) : ( ) : (
<label className="icon" label={materialIcon} /> <label valign={Gtk.Align.START} className="icon" label={materialIcon} />
)} )}
{sublabel ? ( {sublabel ? (
<box vertical valign={Gtk.Align.CENTER} className="has-sublabel"> <box vertical valign={Gtk.Align.CENTER} className="has-sublabel">

View file

@ -95,7 +95,12 @@ export default class Math extends GObject.Object {
let result: string, icon: string; let result: string, icon: string;
try { try {
if (equation.includes("=")) { if (equation.startsWith("help")) {
equation = "Help";
result =
"This is a calculator powered by Math.js.\nAvailable functions:\n\thelp: show help\n\tclear: clear history\n\t<x> = <equation>: sets <x> to <equation>\n\tsimplify <equation>: simplifies <equation>\n\tderive <x> <equation>: derives <equation> with respect to <x>\n\tdd<x> <equation>: short form of derive\n\trationalize <equation>: rationalizes <equation>\n\t<equation>: evaluates <equation>\nSee the documentation for syntax and inbuilt functions.";
icon = "help";
} else if (equation.includes("=")) {
const [left, right] = equation.split("="); const [left, right] = equation.split("=");
try { try {
this.#variables[left.trim()] = simplify(right).toString(); this.#variables[left.trim()] = simplify(right).toString();
@ -107,10 +112,11 @@ export default class Math extends GObject.Object {
} else if (equation.startsWith("simplify")) { } else if (equation.startsWith("simplify")) {
result = simplify(equation.slice(8), this.#variables).toString(); result = simplify(equation.slice(8), this.#variables).toString();
icon = "function"; icon = "function";
} else if (equation.startsWith("derive")) { } else if (equation.startsWith("derive") || equation.startsWith("dd")) {
const respectTo = equation.split(" ")[1]; const isShortForm = equation.startsWith("dd");
if (!respectTo) throw new Error("Format: derive <respect-to> <equation>"); const respectTo = isShortForm ? equation.split(" ")[0].slice(2) : equation.split(" ")[1];
result = derivative(equation.slice(7 + respectTo.length), respectTo).toString(); if (!respectTo) throw new Error(`Format: ${isShortForm ? "dd" : "derive "}<respect-to> <equation>`);
result = derivative(equation.slice((isShortForm ? 2 : 7) + respectTo.length), respectTo).toString();
icon = "function"; icon = "function";
} else if (equation.startsWith("rationalize")) { } else if (equation.startsWith("rationalize")) {
result = rationalize(equation.slice(11), this.#variables).toString(); result = rationalize(equation.slice(11), this.#variables).toString();