dc1fd3d9ba
PNS test app: Add logging information for curved track routing
2021-09-20 20:35:24 +01:00
b84d1456d5
KIFACE_I -> KIFACE_BASE.
2021-09-14 23:45:14 +01:00
60a593b44b
Fix defines for qa mock
2021-09-05 19:28:33 -07:00
a397e85589
Implement PTH/NPTH/courtyard collision tests.
...
Fixes https://gitlab.com/kicad/code/kicad/issues/9081
2021-09-04 00:16:26 +01:00
8a305eec32
Remove broken RefDesStringCompare
...
This function attempted a poor-man's natural compare but it assumed
specific structure of the string. This broke for strings with
numberings that looked like decimals.
Instead, we use our natural string comparison function and remove the
references to this older function and its similar elements.
Fixes https://gitlab.com/kicad/code/kicad/issues/9067
2021-09-01 11:48:01 -07:00
3a7721d41c
Remove now-invalid mock call
2021-08-27 13:08:10 -07:00
ed39b33d74
Fix edge case in CIRCLE::Intersect that caused a divide-by-zero crash
...
Also add some additional test cases.
2021-08-25 19:11:19 +01:00
e6ca9837a2
Clear numbers from non-numberable pads and don't run DRC on them.
...
This was also the last straw on the misnamed PAD::GetName() and
PAD::SetName(), which are now PAD::GetNumber() and PAD::SetNumber().
Fixes https://gitlab.com/kicad/code/kicad/issues/9017
2021-08-24 01:03:06 +01:00
1e23ce1c95
Pull some fixes back from 7.0.
...
1) An earlier 6.0 fix to apply pad clearance overrides to NPTH pads
got broken, so this replaces it.
2) Allow min/max/opt to be set by different rules.
3) Fixes a bug where board minimum enforcement over a local override
didn't get the right message text.
2021-08-21 16:43:11 +01:00
1a252b4f96
Add a compile error for ill-defined rules, and more performance.
...
Also adds const-safety to GetBoard().
2021-08-16 12:14:17 +01:00
41619ebbe2
Decouple PROGRESS_REPORTER interface from implementations.
2021-08-14 21:05:49 +01:00
80355f04a9
Fix SHAPE_LINE_CHAIN::Replace at end of chain
2021-08-13 16:59:45 -04:00
d9cf939ba1
SHAPE_LINE_CHAIN::Replace Don't call front() or back() if empty
...
Fixes https://gitlab.com/kicad/code/kicad/-/issues/8949
2021-08-12 16:32:06 +01:00
22df01183d
Fix edge cases in CIRCLE::Intersect that were causing KiROUND overflow
2021-08-11 17:31:27 +01:00
c8944286c0
Fix qa_pcbnew memory dump in msvc
...
Quick fix for now as it was frustrating to run qa_pcbnew
and not be able to see the output
2021-08-10 21:29:25 +01:00
a208dac8d8
Convert hole clearance tests from NPTH holes to all holes.
2021-08-09 22:26:00 +01:00
ae87dc686a
Fix SHAPE_LINE_CHAIN::NearestPoint when aAllowInternalShapePoints=false
...
Fixes https://gitlab.com/kicad/code/kicad/-/issues/8770
2021-08-08 20:58:20 +01:00
fb3a6ef2db
Add qa Test for SHAPE_LINE_CHAIN::Slice
2021-08-08 19:09:54 +01:00
1332208ab1
Update test expectation.
2021-08-06 22:24:33 +01:00
eaf8eb284a
Add true arc-to-polyline collisions
2021-08-05 17:45:12 +01:00
dd65ce9523
Simplify & move new arc collision code into Kimath library
...
Don't need to check intersections with the circle, just fix the
calculated "projected" point from the end points.
Fixes https://gitlab.com/kicad/code/kicad/-/issues/8234
2021-08-05 17:45:12 +01:00
b6be10f05c
Fix CIRCLE::Intersect( const SEG& aSeg ) and add unit tests
2021-08-05 17:45:12 +01:00
9c15ba9673
qa: arc playground with fixed endpoint corner case
2021-08-05 17:45:12 +01:00
2573ac19a5
Fix "false intersection" case and attempt to fix "missing intersection"
2021-08-05 17:45:12 +01:00
318435aedb
Add more test cases: simulate zone fill around arc + diff pair meander
2021-08-05 17:45:11 +01:00
f2925dc6cb
Added a few more test cases
2021-08-05 17:45:11 +01:00
9922e85ecf
arc collision playground: some cleanup
2021-08-05 17:45:11 +01:00
7e94f85870
arc collision playground
2021-08-05 17:45:11 +01:00
539154466d
playground with arc2arc collision
2021-08-05 17:45:11 +01:00
c5e195bdff
Cleanup (includes and formatting).
2021-08-03 18:37:23 +01:00
813d8f0957
Fix broken QA build on Linux.
2021-08-03 12:02:42 -04:00
c00f4ed5d2
Add regression tests for track cleaner.
2021-08-03 16:17:18 +01:00
43523df843
Measure distance from pad center, not pad hull.
...
Otherwise we think the wrong end of really short track segments is
connected to the pad, leaving the other end dangling.
Fixes https://gitlab.com/kicad/code/kicad/issues/8909
2021-08-02 22:42:54 +01:00
2a2dc1c0ff
Fix false test failures.
2021-08-01 22:18:18 +01:00
878538abff
Run each Boost test with it's own fixture.
2021-07-31 20:12:52 +01:00
faa1ff4ec6
Add false-negative DRC tests (and fix first bug found by them).
2021-07-31 16:41:44 +01:00
bceb3794f8
Remove ZONE_FILLER_TOOL since it's not really necessary.
...
It was causing intermittent failures on GTK. We'll no doubt want
tools in the QA framework at some point, but probably not necessary
for 6.0....
2021-07-31 01:50:42 +01:00
5155093ec0
Fix compile issue on gcc
2021-07-30 15:13:34 -07:00
8d6cd4ad99
Add a bunch more zone fill and DRC regression tests.
...
Also tries to fix a compile issue on gcc.
2021-07-30 21:15:21 +01:00
b8bb04c432
Release project before potentially reloading project and board.
2021-07-30 18:37:14 +01:00
8c69a856fc
Add zone filler tests.
...
One test has pads of a bunch of different shapes and provokes some
errors to make sure they're caught.
The others are all past issues with the zone filler to make sure we
don't suffer any regressions. (They should all just pass with no DRC
errors.)
2021-07-30 17:09:24 +01:00
6aaf4413b3
Fix kicad_string.h / string.cpp mismatch.
...
They don't define a KiCad string class, so the header file name was
somewhat misleading. But the fact that they didn't match definitely
made coding more difficult.
2021-07-29 16:03:25 +01:00
f221220fe2
Rename layer ids file.
...
It hasn't had anything to do with colors or visibility for some time
now.
2021-07-29 16:03:25 +01:00
43cb710297
Fix broken PNS router QA build.
2021-07-27 15:07:56 -04:00
37b200cb3e
Pass wxString objects by reference instead of on the stack.
2021-07-27 08:41:27 -04:00
531f5480a7
Reduce line-breaks and increase SNR.
2021-07-24 14:25:59 +01:00
7869ac7e67
fix typo in commit f16239d
2021-07-22 20:45:22 +02:00
f16239d326
QA test: try to fix a compil problem on MSVC only
2021-07-22 20:41:37 +02:00
e35b469f30
QA tests: fix a few compil issues due to code change.
2021-07-22 18:18:12 +02:00
4319d92a12
Fix test breakage from dialog onClose() change.
2021-07-22 15:55:55 +01:00
0fb864d596
Pull some name changes back from 7.0 to ease merging.
2021-07-21 20:58:59 +01:00
bf80b9c04c
Last of the NULL expunging.
2021-07-20 10:32:22 -04:00
fbd267665b
Fix test case.
2021-07-08 18:23:28 +01:00
a4263ebce5
Clean up Altium special string handling
...
1) Fix a couple of bugs in case processing
2) Make case processing more explicit to prevent more (1)
3) Move label processing to AltiumSpecialStringsToKiCadVariables
4) Strip double-quotes from special strings (and add test cases)
5) Change PROJECTNAME to just filename, not full path
6) PROJECTREV and REVISION are two different things
7) Add support for Altium's Application_BuildNumber
8) Fix some issues in trimming spaces around special strings
2021-07-08 15:34:38 +01:00
9d348d7e6d
Coverity issue fixes.
2021-07-06 13:32:34 -04:00
cee5920d5c
Remove dead code (SHAPE_LINE_CHAIN::DetectArcs)
2021-07-03 19:37:50 +00:00
778c64de88
Implement ClearArcs() and check curved polys don't get a booleanOp
...
We cannot (yet) support passing several curved outlines through clipper.
In these cases, the caller should ClearArcs() before processing.
2021-07-03 19:37:50 +00:00
260a9d0540
Use ZFillFunction to modify arcs post clipper (does not fully work yet)
...
Added a unit test to verify union and intersection of polygons result
in desired results: subject + clip - intersect == union
2021-07-03 19:37:50 +00:00
a9a8aa8243
SHAPE_LINE_CHAIN splitArc on Insert, Remove and Replace
...
This ensures that the arc shapes remain correct after removing
a point belonging to an arc or inserting a point in the middle
of an arc.
Simplify implementation of Replace( ..., aP ). Now a Remove
operation followed by an Insert operation.
Improve QA test for SHAPE_LINE_CHAIN Append, Insert and Replace
Implement SHAPE_LINE_CHAIN::splitArc to break up an arc into two
Implement SHAPE_ARC::ConstructFromStartEndCenter and add qa test
2021-07-03 19:37:50 +00:00
2f069c0b19
Add test for detecting arcs post clipper
2021-07-03 19:37:50 +00:00
e54a44e1d3
Add qa test for SHAPE_POLY_SET::Simplify()
2021-07-03 19:37:50 +00:00
3ee8b4825c
Implement SHAPE_LINE_CHAIN::DetectArcs and add qa test
2021-07-03 19:37:50 +00:00
14c3d9055e
Add CIRCLE::Contains( VECTOR2I aP ) and add unit tests
2021-07-03 19:37:50 +00:00
175b474c3e
Coverity issue fixes.
...
Fixes issues #280412 , #314755 , #329615 , #332459 , #332157 , #332167 ,
2021-06-30 18:08:49 -04:00
5c21f93803
Consistency in progress and error messages.
2021-06-26 13:23:43 +01:00
e50eaed7b9
altium: Improve parsing of UTF-8 data
...
This is an implementation based on d4ccec05 from @fxtentacle
2021-06-26 13:58:56 +02:00
81fc710a5d
Use consistent terminology.
...
Fixes https://gitlab.com/kicad/code/kicad/issues/8681
2021-06-26 10:11:41 +01:00
cd130be2db
Fix PNS Test App and enable build option in CI
2021-06-24 11:24:50 +00:00
3d7e18561d
Checkpoint of app-specific single-instance checking.
...
(I'm about to nuke single-instance checking entirely, but wanted to
make sure this was captured in GIT somewhere.)
2021-06-20 21:37:02 +01:00
24e7924997
qa: fixed building of the P&S debug tool after the changes/refactoring of the 3D viewer code. The tool can now be built
...
if KICAD_BUILD_PNS_DEBUG_TOOL is ON.
2021-06-19 23:21:23 +02:00
89718dd3ba
Naming conventions.
2021-06-19 19:36:53 +01:00
ee3eac325d
Expunge the use of the word part from Eeschema code.
2021-06-15 08:32:11 -04:00
71c183d7bb
Rename LIB_PART to LIB_SYMBOL.
2021-06-14 07:11:17 -04:00
82f3df4086
Attempt to fix Python qa code after renames
2021-06-13 11:20:19 -04:00
096e342386
Prefix TRACK, ARC and VIA.
2021-06-11 22:07:02 +01:00
44086ff2b2
Pull 3D preferences into KiCad preferences architecture.
...
Fixes https://gitlab.com/kicad/code/kicad/issues/5187
2021-06-11 11:19:40 +01:00
fbc135e69f
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 10:34:49 -04:00
f968fc8719
Fix source comment / documentation typos
2021-06-09 19:32:58 +00:00
e42f4a8f70
Fix build of PNS log viewer after header changes
2021-06-06 16:07:38 -04:00
df10067bc2
Fix DRC qa build
2021-06-06 15:33:45 -04:00
5a325c59db
qa/pns: playground tool now can draw lines with annotated vertices
2021-06-03 22:44:53 +02:00
5c01b0a32e
qa: prevent double pybind11 initalization (throws an exception)
2021-06-03 22:44:53 +02:00
4f05262705
Cleanup includes in board.h and footprint.h
2021-06-03 20:19:52 +01:00
23f8851409
Remove pcb_group include from board header
2021-06-03 20:03:31 +01:00
de89505f02
Fix QA for rounding segments
2021-06-03 10:18:50 -07:00
c7d188a8d0
Centralizing SCRIPTING class
2021-06-01 20:18:24 +00:00
81d58bcea9
Working python window
2021-06-01 20:18:24 +00:00
a0e28f1475
qa/pns: follow up changes in PNS::DEBUG_DECORATOR in the log viewer tool
2021-05-29 00:13:24 +02:00
1c23b505e0
qa/pns: factor out simple 'playground' app to a separate file
2021-05-29 00:13:24 +02:00
d31d2e28ca
qa/pns: work in progress on pns_log_viewer.
2021-05-29 00:13:24 +02:00
ea4161c42f
qa_utils: remove mockups that are not used anymore
2021-05-29 00:13:24 +02:00
e2785b117b
Fix Locale issue in QA tests
2021-05-28 13:25:18 -07:00
4c3d78dec0
Break out separate holes-co-located violation.
...
Fixes https://gitlab.com/kicad/code/kicad/issues/8456
2021-05-20 10:36:56 +01:00
31da3e7dc6
qa: merge unit_test_utils to qa_utils
2021-05-19 11:02:52 +00:00
55c1d814f9
Fix hierarchical propagation for designs with unmatched hier ports
...
Fixes https://gitlab.com/kicad/code/kicad/-/issues/8397
2021-05-10 17:54:09 -04:00
ce0ec29fe6
qa: test case for PROPERTY::IsValueDefined()
2021-05-03 23:45:54 +02:00
0f0c5c194b
Add qa test: save and reload schematic with page numbers
...
Note: PGM_BASE::InitPgm() is creating a SETTINGS_MANAGER object, which
in turn tries to display a "migrate settings" dialog when no settings
are found, but obviously the dialog can't be displayed inside docker.
Needed to add an optional parameter to InitPgm() in order to allow
running in headless mode.
2021-05-03 19:38:31 +01:00
ae009e0758
Ensure clipboard data is available after KiCad closes
...
Always Flush() after SetData()
2021-05-03 19:38:31 +01:00
03cf2b517f
Enum class PAD_ATTR_T
...
Renamed such that python stays the same
2021-05-01 10:51:54 -04:00
21fde9b629
enum class PCB_SHAPE_TYPE_T
2021-04-30 22:36:12 -04:00
13473420e5
Remove duplicated routine and fix bug in UTIL version.
2021-04-17 15:10:59 +01:00
4fc41627e9
Update and modernize linux metadata files
...
* Switch to using org.kicad.kicad as the main app ID
* Move the appstream file to a metainfo file
* Rename all metadata files to use the reverse DNS scheme
* Add header matching to mime type files where possible
* Add a mime type for gerber job files
* Add a QA test that verifies all the linux metadata files and
run it in CI
* Update the visible names in the launcher entries to be more
consistent with the internal visible names
* Update various strings and items in the metainfo file so they
are more descriptive and easier to read
2021-04-15 16:34:12 +00:00
2b86b34124
Eeschema: split out SCH_SHEET_PIN declarations into separate header.
2021-04-06 17:15:49 -04:00
2c05d99d9f
SHAPE_POLY_SET: Fix segment collision testing
...
It appears as though there was an optimization to skip testing segments if
one of their endpoints (and only the A point) was inside. Unclear the reason
for this, but I'm going to assume that it was intended to optimize the case
where both points are inside (like the point case above it).
2021-04-04 20:12:45 -04:00
0a0935e0f3
Remove ACTIONS::TranslateLegacyId and TOOL_DISPATCHER::DispatchWxCommand
...
After commit 9535153f9e
2021-03-30 23:20:22 +00:00
68f3d09ac1
altium: introduce tokenizer for query language
...
Based on this tokenizer, a LL1 parser will be built in the future.
2021-03-21 16:39:23 +01:00
d9229697d8
altium: special string override map should be case-insensitive
...
This only fixes overrides where we explicitly map an override. Wrongly written variables pointing to fields are not corrected by this.
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/6256
2021-03-20 20:42:25 +01:00
cd26db24f9
altium: allow text in special strings
...
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/6256#note_529783269
2021-03-20 19:25:57 +01:00
e4b99b9bb5
Fix SHAPE_ARC::Collide and add Unit Tests
2021-03-20 16:11:43 +00:00
1d879e36cc
Make drc_proto an optional part of the build
2021-03-20 12:09:20 -04:00
812d38736e
Naming conventions.
2021-03-19 23:06:19 +00:00
4482b3baba
altium: Handle special strings and convert them into KiCad variables. Use Comment for VALUE.
...
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/6256
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/7736
2021-03-14 16:40:36 +01:00
b20f18e6c5
Properly handle mixed-up group buses
...
Fixes https://gitlab.com/kicad/code/kicad/-/issues/7870
2021-03-11 18:24:39 -05:00
7ef9082c86
altium: add unit-tests for ReadProperties() and fix some issues found while doing so
2021-03-08 23:03:00 +01:00
5ca7a2c457
Fix some issues with group bus prefix handling
...
Fixes https://gitlab.com/kicad/code/kicad/-/issues/7196
2021-03-04 23:37:46 -05:00
7a00e01b3e
Eeschema: fix false positive library symbol changed ERC errors.
...
This fix required sorting all of the LIB_PART draw items to ensure
accurate comparison between the symbols stored in the schematic and the
original library symbols. This has a noticeable impact on symbol library
load performance. It may also cause significant changes the next time
the library is saved due to changes in the draw item sorting. Hashing
may be a better solution here but this addressed the immediate problem.
A skeleton method SCH_SCREEN::SwapSymbolLinks() was added because there
is most likely an issue with orphaned symbols in the schematic library
symbol cache during undo/redo operations. More testing is required to
verify this.
Fixes https://gitlab.com/kicad/code/kicad/-/issues/7263
2021-03-04 17:59:24 -05:00
cc6df515a1
Make ARCs accessible from python
2021-03-01 17:34:47 +00:00
8a33542bcd
SCH_COMPONENT::GetField() expects a vector index, not a field id.
...
Check this at compile time. Callers wanting to use an index now must
use SCH_COMPONENT::GetFields()[i] instead.
Fixes https://gitlab.com/kicad/code/kicad/issues/7757
2021-02-28 15:10:37 +00:00
824a942f55
Update Python test QA
...
We don't need to explicitly calculate the bounding box anymore as it is
lazily calculated when needed
2021-02-26 13:55:36 -08:00
04d058d60a
qa: don't enable the P&S hacktool build by default
2021-02-25 17:18:23 +01:00
6936b98469
qa: router debug/hack tool.
...
Adds Tom's internal P&S debugging tool. This is a work in progress and the code is quite messy for the moment, but I can't keep it in private branches forever and waste time rebasing it.
Note: experimental and *very unclean* code. Use at your own risk.
2021-02-25 17:18:23 +01:00
1786ae8773
Eeschema: use symbol nomenclature for object file naming.
2021-02-24 08:48:02 -05:00
a8ef81aef1
Don't track project local settings in this repo
2021-02-21 20:30:57 -05:00
67f16110af
Fix netlist QA after API changes in 8a12aa4e
2021-02-21 20:30:57 -05:00
872184fe8b
Revert "Bump minimum required CMake version to 3.10"
...
This reverts commit a475f45753
2021-02-09 18:46:13 -05:00
a475f45753
Bump minimum required CMake version to 3.10
...
This allows us to remove even more workarounds
2021-02-08 12:23:08 +00:00
5c3ee0443c
Make footprint properties accessible from python
...
Now that footprint properties inherit custom fields from schematic
they are very useful.
Setting custom properties from python will also be handy in plugins
that need to somehow mark their own objects.
2021-02-05 02:31:48 +00:00
e5ea94c90b
altium: add testcase for PropertiesReadKiCadUnitFrac
2021-02-04 20:16:34 +01:00
8778599c0d
Apply same nettie hack to zone filler
...
The nettie hack is used in DRC but we also need to use it in zone filler
to allow zones to be used with netties. We limit this to the
appropriate nets in the nettie
Fixes https://gitlab.com/kicad/code/kicad/issues/7351
2021-01-31 16:16:48 -08:00
db3b79a046
altium: Fix #6462 improve parsing of metric units
...
Because Altium uses imperial units for storage, this leads to rounding errors.
This code tries to correct those rounding errors for the user.
2021-01-31 16:18:57 +01:00
9ddfd82b91
altium: Fix #6242 by increasing clamp limit for unit conversation. Furthermore fix error which happens when parsing negative units.
2021-01-31 13:59:51 +01:00
ff7742c6b8
File naming and include cleanup.
2021-01-28 11:35:18 +00:00
99d203feae
Clarify CIRCLE::ConstructFromTanTanPt
...
Remove unused bool aAlternateSolution and add doxygen comments
2021-01-24 16:41:11 +00:00
48823c0723
Formatting fixes and fix qa_kimath following rebase
2021-01-24 16:41:10 +00:00
19620cebe7
qa tests: fix test_circle
2021-01-24 16:41:10 +00:00
6ed5ed52b8
qa tests for CIRCLE geometry library
2021-01-24 16:41:10 +00:00
b6a50d2f74
qa tests for SEG perpendicularity and parallelism
2021-01-24 16:41:10 +00:00
6e7ae93cc8
EDIT_TOOL::DragArcTrack Fix incorrect undo history when items are deleted
...
Need to make sure we only apply one COMMIT operation per object before calling COMMIT::Push() or COMMIT::Revert()
2021-01-24 16:41:10 +00:00
977fe1ed49
Update netnames in tests for now (though Jon will probably change them).
2021-01-23 10:46:45 +00:00
1491330596
Fix various memory leaks exposed by qa_eeschema
2021-01-18 22:40:58 -05:00
915bf95d4d
Add no-connects testcase
2021-01-14 21:01:03 -05:00
02681fcf0e
Move no-connect processing to connection graph
...
This way the net names can be inspected in eeschema and cross-probing works.
Testcases updated for the name changes
CHANGED: all unconnected pins are now included in the netlist with no_connect_ prefixes
2021-01-14 20:55:49 -05:00
9b69c1e198
Fix a bone-headed cause of non-determinism
2021-01-14 19:20:37 -05:00
654e9a77db
Connectivity: defer and parallelize item updates
...
Good for ~15% performance improvement in large designs
2021-01-14 12:21:19 -05:00
6fb1ed2824
Make sure hierarchical overrides are deterministic
...
Without alphabetic sorting here, we are at the mercy of
the r-tree and multithreading.
2021-01-14 12:21:19 -05:00
3e920c665f
Special case via area generation.
...
Fixes https://gitlab.com/kicad/code/kicad/issues/7105
2021-01-14 12:48:44 +00:00
b90e72ed07
Don't simplify hierarchical nets based on weak drivers
...
This behavior provided shorter net names, but was confusing if
the user gives an explicit strong driver in the subsheet but not
one in the parent sheet.
Testcases updated for net name changes; connectivity is the same
Fixes https://gitlab.com/kicad/code/kicad/-/issues/4201
2021-01-13 22:10:56 -05:00
f30cea8034
Formatting.
2021-01-12 23:56:35 +00:00
b40e3a39f5
Minor cleanup.
2021-01-04 23:59:36 +00:00
487aa37d2e
Connectivity: don't rename things multiple times in subsheets
...
Depending on what order the subgraphs are processed in, it's
possible to hit a case where the parent sheet renames a bus
member before the bus neighbor renaming logic runs. In this
case, we don't want to apply the bus neighbor logic as it will
break connectivity to the parent sheet if that bus was not
also renamed (for example, if the hier ports only make net
connections and not bus connections)
Fixes https://gitlab.com/kicad/code/kicad/-/issues/6887
2020-12-29 16:42:30 -05:00
Roberto Fernandez Bautista
Jeff Young
Seth Hillbrand
Jon Evans
Tomasz Wlostowski
Wayne Stambaugh
jean-pierre charras
Thomas Pointhuber
luz paz
Marek Roszko
Ian McInerney
Sylwester Kocjan
qu1ck
Simon Richter
Michael Kavanagh