Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 45563210d5a5
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e74ff3958bb2
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 29, 2020

  1. Copy the full SHA
    aed1b5a View commit details
  2. WaveformArea: channel infobox text now uses explicit tab stops for ey…

    …e patterns to ensure better alignment
    azonenberg committed Oct 29, 2020
    Copy the full SHA
    e74ff39 View commit details
Showing with 36 additions and 8 deletions.
  1. +1 −1 lib
  2. +5 −0 src/glscopeclient/WaveformArea_cairo.cpp
  3. +23 −0 src/glscopeclient/masks/dphy-inneronly.yml
  4. +7 −7 src/glscopeclient/masks/dphy.yml
2 changes: 1 addition & 1 deletion lib
5 changes: 5 additions & 0 deletions src/glscopeclient/WaveformArea_cairo.cpp
Original file line number Diff line number Diff line change
@@ -615,10 +615,15 @@ void WaveformArea::RenderChannelInfoBox(
Rect& box,
int labelmargin)
{
//Set up tab stops for eye labels etc
Pango::TabArray tabs(1, true);
tabs.set_tab(0, Pango::TAB_LEFT, 300);

//Figure out text size
int twidth;
int theight;
Glib::RefPtr<Pango::Layout> tlayout = Pango::Layout::create(get_pango_context());
tlayout->set_tabs(tabs);
tlayout->set_font_description(m_infoBoxFont);
tlayout->set_text(text);
tlayout->get_pixel_size(twidth, theight);
23 changes: 23 additions & 0 deletions src/glscopeclient/masks/dphy-inneronly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
protocol:
name: D-PHY (w/o overshoot limits)
reference: D-PHY 2.0 figure 58, table 35
displaylimits:
ymin: -400
ymax: 400
units:
xscale: ui
yscale: mv
mask:

- points:
- x: -0.265
y: 0
- x: 0
y: 47
- x: 0.265
y: 0
- x: 0
y: -47

conditions:
hitrate: 1.0e-6
14 changes: 7 additions & 7 deletions src/glscopeclient/masks/dphy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
protocol:
name: D-PHY
reference: D-PHY 1.00.00 Specification Table 16/17 for upper/lower limits. Opening guesstimated from compliance software screenshots.
name: D-PHY (w/ overshoot limits)
reference: D-PHY 2.0 figure 58, table 35 for center opening, plus table 20 for max Vod
displaylimits:
ymin: -400
ymax: 400
@@ -30,14 +30,14 @@ mask:
y: 450

- points:
- x: -0.2
- x: -0.265
y: 0
- x: 0
y: 140
- x: 0.2
y: 47
- x: 0.265
y: 0
- x: 0
y: -140
y: -47

conditions:
hitrate: 0.0
hitrate: 1.0e-6