diff --git a/_Sidebar.md b/_Sidebar.md index 444e32f..e83a3b1 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -48,7 +48,7 @@ **[Grouping items](grouping_items)** — select, move and copy several items as one -**[Finding your place on a folio](navigating_folios)** — go to a cell like B13 or 4-B7, keep the headers in sight, show the cell limits +**[Finding your place on a folio](navigating_folios)** — go to a cell like B13 or 4-B7, keep the headers in sight, show the cell limits, zoom and pan **[Drawing faster](drawing_faster)** — place without dragging, the S shortcut bar, command search, gestures diff --git a/api_reference.md b/api_reference.md index 488e73b..c9504a5 100644 --- a/api_reference.md +++ b/api_reference.md @@ -213,10 +213,6 @@ It reports each file as OK, WARN (loads but suspicious — for instance zero terminals) or FAIL (unparseable, wrong root tag, missing bounding box), and exits non-zero on any failure. Put it in CI if you generate `.elmt` files. -> **Status: pending.** The terminal-name checks in this paragraph describe -> [PR #1159](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1159), -> not yet merged. This notice will come out once it merges. - It also checks terminal names, with the same rule the element editor applies on save (see **[Using the element editor](element_editor)** §5): two terminals of one element sharing a name is a **FAIL**, and terminals without a name are diff --git a/conductors.md b/conductors.md index 2248d67..b813341 100644 --- a/conductors.md +++ b/conductors.md @@ -199,12 +199,6 @@ matches where its terminals are — because something moved without the path being updated — QElectroTech quietly discards it on load and re-routes automatically. The drawing looks fine; the hand-routing is lost. -> **Status: pending.** The next paragraph describes -> [PR #1161](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1161), -> not yet merged. Until it lands, one unreadable length (`nan`) in a damaged -> file turns the whole stored route into `nan` on the first save, and the -> next save drops it. This notice will come out once it merges. - The same happens when a stored segment length is not a usable number — a project file damaged by an outside tool or a disk error, with `nan` or `inf` where a length should be. The conductor is routed automatically on load and diff --git a/data_files/project_diagram_child_conductors.md b/data_files/project_diagram_child_conductors.md index cf498ca..496b553 100644 --- a/data_files/project_diagram_child_conductors.md +++ b/data_files/project_diagram_child_conductors.md @@ -31,10 +31,6 @@ attribute : none routed automatically. A conductor with no `` children is routed automatically. -> **Status: pending.** The next paragraph describes -> [PR #1161](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1161), -> not yet merged. This notice will come out once it merges. - Every number above must be finite. `nan`, `inf` and `-inf` parse as numbers, so QElectroTech checks for them: a non-finite segment length is ignored (so the route no longer adds up and is routed automatically), a non-finite `x` or diff --git a/element_editor.md b/element_editor.md index 87d185d..696e16d 100644 --- a/element_editor.md +++ b/element_editor.md @@ -123,12 +123,6 @@ you it can't be wired to anything, which is sometimes exactly what you want ### Terminal names -> **Status: pending.** Everything in this subsection describes -> [PR #1159](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1159), -> not yet merged. Nothing here works until that lands — check the PR before -> trying any of this against your own build. This notice will come out once -> it merges. - Every terminal of a symbol should have a name, and no two terminals of the same symbol may share one. The wiring list (what connects to what) names each end of a wire as *symbol label : terminal name*, so two terminals both called diff --git a/mouse_modifiers.md b/mouse_modifiers.md index 67039f7..0f22ffa 100644 --- a/mouse_modifiers.md +++ b/mouse_modifiers.md @@ -149,10 +149,15 @@ puts it back. | Action | Result | |---|---| -| **Ctrl**+mouse wheel | zoom in and out (trackpad/gesture mode) | +| mouse wheel | zoom in and out (default mouse mode) | +| **Ctrl**+mouse wheel | scroll up and down (default mouse mode); zoom in and out (trackpad/gesture mode) | | **Ctrl**+**+** / **Ctrl**+**−** | zoom in and out | +| middle button drag | pan | | **Ctrl**+wheel over the folio tabs | switch folio | +The zoom commands, trackpad mode and the *Centre on cursor* key are in +**[Finding your place on a folio](navigating_folios)** §4. + --- ## 8. Cancelling something you started diff --git a/navigating_folios.md b/navigating_folios.md index 44852de..2800604 100644 --- a/navigating_folios.md +++ b/navigating_folios.md @@ -5,7 +5,8 @@ down the side. People use it to talk about a drawing — "the contactor in B13", "the report to 4-B7" — and QElectroTech uses it too, in cross-reference and folio-report labels. -This page covers three ways of using that grid while you work: +This page covers three ways of using that grid while you work, and then the +zoom and pan controls for getting around a folio: 1. **[Going to a cell](#1-going-to-a-cell)** — type `B13`, or `4-B7` for a cell on another page, and the view zooms there. @@ -14,6 +15,9 @@ This page covers three ways of using that grid while you work: the view instead of scrolling away. 3. **[Showing the cell limits](#3-showing-the-cell-limits-across-the-drawing)** — faint dashed lines across the drawing where each column and row ends. +4. **[Moving around a zoomed-in folio](#4-moving-around-a-zoomed-in-folio)** + — the zoom commands, the mouse wheel and middle button, and a key that + brings the point under the mouse to the middle of the window. The first two were asked for in [issue #1034](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/1034). @@ -167,6 +171,82 @@ Like the bars, the lines are part of the view, not the drawing: they are --- +## 4. Moving around a zoomed-in folio + +### Zoom commands + +All of these are in the **Affichage** (*View*) menu, at the bottom. Every +shortcut can be changed in the shortcut editor. + +| Command | Default shortcut | What it does | +|---|---|---| +| **Zoom avant** / **Zoom arrière** (*Zoom in / out*) | your platform's standard zoom keys — usually **Ctrl++** / **Ctrl+−**, not the bare + and − keys | one step in or out, about 15 % | +| **Zoom sur le contenu** (*Zoom on content*) | **Ctrl+8** | fits everything drawn on the folio into the window, ignoring the folio border — what other CAD programs call *zoom extents* | +| **Zoom adapté** (*Fit*) | **Ctrl+9** | fits the folio border into the window | +| **Pas de zoom** (*No zoom*) | **Ctrl+0** | back to 100 % | +| **Centrer sur le curseur** (*Centre on cursor*) | none — see below | brings the point under the mouse to the middle of the window, keeping the zoom | + +The zoom keys and the mouse wheel zoom **around the mouse pointer**: the +point under the pointer stays where it is while everything else grows or +shrinks. A quick way across a large folio is therefore to zoom out, put the +pointer on the part you want, and zoom back in. + +### Mouse and trackpad + +| Action | Result | +|---|---| +| Mouse wheel | zoom in and out | +| **Ctrl**+mouse wheel | scroll the folio up and down, without zooming | +| Middle button held and dragged | pan: the folio follows the mouse | +| **Mode Visualisation** (hand icon on the toolbar, or *Affichage → Mode Visualisation*) | the left button pans too; nothing can be selected or edited until you switch back to **Mode Selection** | + +A trackpad sends its two-finger scroll as mouse-wheel turns, so with the +settings above a two-finger swipe zooms. Tick **Utiliser les gestes du pavé +tactile** (*Use trackpad gestures*) in *Configuration → Configurer +QElectroTech → Général* and it changes to: + +| Action | Result | +|---|---| +| Two-finger swipe | scroll the folio in any direction | +| **Ctrl**+two-finger swipe | zoom in and out | + +The folio stops scrolling at its border. To zoom out further than the whole +folio, tick **Autoriser le dézoom au delà du folio** (*Allow zooming out +beyond the folio*) on the same page. + +### Centre on cursor + +> **Status: pending.** This subsection describes +> [PR #1190](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/1190), +> not yet merged. Nothing here works until that lands — check the PR before +> trying any of this against your own build. This notice will come out once +> it merges. + +**Affichage → Centrer sur le curseur** scrolls the folio so the point under +the mouse becomes the middle of the window. The zoom does not change. Point +at the part of the drawing you want to look at next, press the key, and it +comes to the middle; press it again somewhere else to keep going. It is the +*centre on cursor* key of KiCad and similar programs, and was asked for in +[forum topic 3199](https://qelectrotech.org/forum/viewtopic.php?id=3199). + +**It has no key until you give it one.** Most single letters are already +used or would get in the way of typing, so it ships without one. To set one: + +1. *Configuration → Configurer QElectroTech*, page **Raccourcis** + (*Shortcuts* — see **[Preferences](preferences)** §4). +2. Type `centrer` in the filter box and pick **Centrer sur le curseur** + under *Éditeur de schémas*. +3. Give it a key — for example **C**. If another command already uses that + key, the page tells you which one. + +| Situation | What happens | +|---|---| +| Pointer over the folio | the point under it moves to the middle of the window | +| Pointer near the folio border | the folio scrolls as far as its border allows, so the point ends up as close to the middle as it can get | +| Pointer outside the drawing area — for instance, choosing the command from the menu with the mouse | nothing | + +--- + ## See also - **[Linking wires across pages](folio_links)** — the `%f-%l%c` report labels diff --git a/tips_and_tricks.md b/tips_and_tricks.md index 9d42930..4928275 100644 --- a/tips_and_tricks.md +++ b/tips_and_tricks.md @@ -120,13 +120,17 @@ For **Wires:** - **Ctrl+8:** Zoom on content - **Ctrl+9:** Fit zoom (adapted to the folio) - **Ctrl+0** (Cmd+0 Mac): Reset zoom -- **Mouse wheel:** Fine zoom control -- **Ctrl+Scroll:** Precise zoom +- **Mouse wheel:** Zoom in and out around the mouse pointer — zoom out, point + at the next area, zoom back in **Pan Tricks:** -- Hold **Space + drag** to pan without selecting - **Middle mouse button** drag to pan -- **Arrow keys** nudge view (when nothing selected) +- **Ctrl+Scroll** scrolls up and down without zooming +- **Mode Visualisation** (hand icon): left-drag pans without selecting +- Space rotates the selection; it does not pan + +Full reference, trackpad mode and the *Centre on cursor* key: +**[Moving around a zoomed-in folio](navigating_folios#4-moving-around-a-zoomed-in-folio)**. **Quick Navigation:** - **Project panel** (left): Click folio to jump to it diff --git a/user_manual.md b/user_manual.md index 285b724..51bf6bb 100644 --- a/user_manual.md +++ b/user_manual.md @@ -436,15 +436,21 @@ is silently left as literal text rather than flagged as an error. ### Zoom & Pan **Zoom Methods:** -- **Scroll wheel:** Up to zoom in, down to zoom out -- **+/-** keys: Magnify or reduce -- **Ctrl+Scroll:** Fine zoom control -- **View → Zoom → Fit to Page:** Auto-fit diagram +- **Scroll wheel:** Up to zoom in, down to zoom out, around the mouse pointer +- **Ctrl++ / Ctrl+−** (your platform's standard zoom keys): Magnify or reduce + — the bare + and − keys do nothing +- **Affichage → Zoom sur le contenu** (Ctrl+8): fit everything drawn +- **Affichage → Zoom adapté** (Ctrl+9): fit the folio border +- **Affichage → Pas de zoom** (Ctrl+0): back to 100 % **Pan (Move View):** - **Middle mouse button:** Click and drag to pan -- **Space + drag:** Hold space and drag to pan -- **Arrow keys:** Nudge view (when nothing selected) +- **Ctrl+Scroll:** Scroll up and down without zooming +- **Mode Visualisation** (hand icon): the left button pans too, nothing can be + edited + +Arrow keys move the *selection*, not the view. Trackpad settings and the +full list: **[Moving around a zoomed-in folio](navigating_folios#4-moving-around-a-zoomed-in-folio)**. --- @@ -604,7 +610,9 @@ See **[Automating QElectroTech](api_reference)** and the | Rotate group as one | Shift+Space | Shift+Space | | Zoom In | Ctrl++ | Cmd++ | | Zoom Out | Ctrl+- | Cmd+- | +| Zoom on content (fit everything drawn) | Ctrl+8 | Cmd+8 | | Fit to Page | Ctrl+9 | Cmd+9 | +| No zoom (100 %) | Ctrl+0 | Cmd+0 | ---