286 Commits

Author SHA1 Message Date
Andreas Nordin
08e53bcd48
Feature: bidirectional AWG/mm2 unit conversion (#41)
* Fix AWG<-> mm2 conversions

Add an inverted dictionary and a lookup function from awg -> mm2. Also
do some minor refactoring. Both sides of the conversion table were
converted to strings, since '0000' and '2/0' are perfectly valid AWG
values.

* Update example ex02 with awg -> mm2 conversion

Show conversions for ex02, and make sure it displays conversions in both
directions. Rebuild the example files.

* Fix faulty conversion of non-(mm2,AWG) units

The parsing allows arbitrary units to be used for cable dimensions --
this might be valid units, e.g. square inches, or invalid, e.g. bananas.
We only allow conversion between mm2 and AWG, so check that the
gauge_unit is either of those before conversion. If not, pass through as
is.

* Fix AWG string casing in output

Convert e.g. 'awg, 'AwG' to upper case for consistent rendering. Leave
any other input gauge units as they were.

Co-authored-by: Daniel Rojas <github@danielrojas.net>
2020-06-29 14:41:45 +02:00
Daniel Rojas
c42b33b38d Address FIXMEs and fine-tune merge of #39 2020-06-29 12:35:40 +02:00
Gabe R
82b173f2ce Refactor and clean up code (#39)
* Format all files using autopep8 to add basic PEP8 conformity.
* Add Exception types to bare excepts to prevent catching `ctrl+c`
* Remove some unnecessary assignment to dummy variables before returning
* Add `Optional` to type hints that can be `NoneType`
* Change a number of single-letter variables to more descriptive names
* Replace string.format() use with Python's f-strings, as they tends to be cleaner, and provide a performance boost.
  * One multiline string was left as string.format() as I do not believe f-strings support multiline
  * Some of the string.format() instances had unused/ignored arguments. I left them out of the f-strings, but I marked those cases with a comments that begins `# FIXME:`
* Rename variables that were shadowding python standard functions (specifically `format->fmt`, `input->inp`, `type->maintype`)
  * Some instances of `type` were not changed, as it breaks the yaml parsing. Needs to be looked into.
* Move classes in `wireviz.py` to two new files `DataClasses.py` and `Harness.py`.

Co-authored-by: Daniel Rojas <github@danielrojas.net>
2020-06-29 11:57:03 +02:00
Tyler Ward
92b6b21895 Added ability to set part numbers 2020-06-28 22:11:05 +01:00
Tyler Ward
a3728f52ce
Fix for Designators apearing across all colours of wires of a guage. (#37)
The wirelist for the bom now has individual designators added. this also 
alows for the removal of designator list merging later.
2020-06-28 22:58:24 +02:00
Florian Pigorsch
eb65be39dc Fix some typos: budnle, conector, separetely 2020-06-28 14:55:09 +02:00
Daniel Rojas
7060c38f07 Add parse_file() function and use it in build_examples.py 2020-06-28 12:28:13 +02:00
Daniel Rojas
5d84bb86eb Update gitignore 2020-06-28 11:43:31 +02:00
Daniel Rojas
154e28f257 Change gen_bom to generate_bom 2020-06-28 11:43:22 +02:00
Andreas Nordin
1f06c6017c refactor: rename 'input' -> 'yaml_data'
'input' overloads a python built-in name. Refactor to avoid this.
2020-06-28 10:52:08 +02:00
Andreas Nordin
f14a07fe95 feature: add --prepend-file option
- Allow prepending a separate YAML file for e.g. including common
  template definitions. This is accomodated by a new commandline option,
  --prepend-file, which takes a path to a YAML file. This is prepended
  to the regular input as-is.

- Refactor file loading to accomodate the above. This includes moving
  relevant parts to main() and instead supplying parse () with a string
  representation of the YAML data. Also add early file existance checks
  and bail out if any of the inputs are inaccessible or nonexistant.
2020-06-28 10:51:49 +02:00
Andreas Nordin
cdb2cf2b91 update build_examples script 2020-06-28 10:49:47 +02:00
Andreas Nordin
9af391ff9d clean up imports, cmdline handling
Order imports properly. Fix path when running script directly from repo
rather than as an installed package. Refactor command line handling.
2020-06-28 10:47:15 +02:00
Andreas Nordin
5514fd4244 refactor dependencies and installation
There are hard copies of the graphviz and pyyaml dependencies included
in the repo. Remove these.

Sort out installation and dependency handling by writing a functional
setup.py script. Rename top level documentation. Refactor wireviz.py
slightly to allow it to run as an installed script.

# Conflicts:
#	src/batch.py
#	src/wireviz/batch.py
#	src/wireviz/build_examples.py
2020-06-28 10:46:24 +02:00
Daniel Rojas
dfb184c1a4 Move source from src/ to src/wireviz/
in preparation for merge of refactor brancb
2020-06-28 10:39:11 +02:00
Daniel Rojas
4661992151 Fine-tune wire BOM output if no gauge is specified 2020-06-27 23:54:55 +02:00
Daniel Rojas
790e9c93c4 Update demos and examples 2020-06-27 23:46:22 +02:00
Daniel Rojas
da80d4ba85 Auto-assign pincount = 1 for ferrules at initialization 2020-06-27 23:37:37 +02:00
Daniel Rojas
d0023c1d41 Make custom pin numbers and hidden unused pins work nicely together 2020-06-27 23:31:58 +02:00
Daniel Rojas
304152f6b6 Merge branch 'hide_unconnected' into dev
# Conflicts:
#	src/wireviz.py
2020-06-27 23:09:35 +02:00
Daniel Rojas
8bf296b186 Auto-generate pin numbers if only pincount is specified 2020-06-27 11:13:16 +02:00
Daniel Rojas
b4ddbaec35
Merge pull request #10 from kimmoli/custom-pinnumbers
Add optional custom pinnumbers to connector
2020-06-27 10:52:46 +02:00
Kimmo Lindholm
955cf83cfb Add optional custom pinnumbers to connector 2020-06-24 23:41:48 +03:00
Morrison-Reed Elliot (BEG/EVS1-NA)
c3621498a7 implemented functionality to hide pins that are not connected 2020-06-24 11:47:08 -04:00
Manuel Scholz
2dfdbd577a
Update wv_helper.py
Added bigger AWG sizes
2020-06-23 11:49:53 +02:00
Daniel Rojas
4384ca504d Fine-tune tutorial, add tutorial BOMs 2020-06-15 18:42:24 +02:00
Daniel Rojas
37f0f8b408 Add syntax highlighting to readme's 2020-06-15 18:00:13 +02:00
Daniel Rojas
f09a81c9b4 Add batch tutorial generation 2020-06-15 16:49:42 +02:00
Daniel Rojas
17a6e430f7 Add tutorial folder to batch script 2020-06-15 11:38:24 +02:00
Daniel Rojas
f8582876a1 Improve ferrule handling, BOM creation 2020-06-15 11:37:10 +02:00
Daniel Rojas
a7be096d71 Make wires white by default if no color is specified 2020-06-15 11:36:52 +02:00
Daniel Rojas
4fa700eb2d Include BOM in example gallery 2020-06-14 21:56:06 +02:00
Daniel Rojas
a6cfa53fb9 Implement HTML output 2020-06-14 21:31:41 +02:00
Daniel Rojas
6785417c5a Implement sorting of BOM sections 2020-06-14 21:31:02 +02:00
Daniel Rojas
5a601f73d0 Move color stuff and helper functions into separate modules 2020-06-14 20:53:27 +02:00
Daniel Rojas
22cc494aca Remove unused code 2020-06-14 20:43:25 +02:00
Daniel Rojas
653937fc2e Improve BOM item names 2020-06-14 20:20:41 +02:00
Daniel Rojas
aeccc2ec69 Implement handling of wire bundles during BOM creation 2020-06-14 19:01:40 +02:00
Daniel Rojas
d5356260ca Change type: bundle to category: bundle 2020-06-14 17:52:22 +02:00
Daniel Rojas
d97d1e1f41 Restructure and simplify BOM creation 2020-06-14 17:46:21 +02:00
Daniel Rojas
2eb6f1caff Implement proof-of-concept HTML output 2020-06-14 00:25:36 +02:00
Daniel Rojas
a5035456ea Fine-tune some details 2020-06-14 00:18:16 +02:00
Daniel Rojas
a43d7701f4 Change 'gender' to 'subtype' for more flexibility 2020-06-13 20:15:48 +02:00
Daniel Rojas
d2abf5f597 Make BOM output optional 2020-06-13 19:50:50 +02:00
Daniel Rojas
db313365ee Streamline BOM creation, implement cutlist 2020-06-13 19:10:45 +02:00
Daniel Rojas
a8b9fc03c7 Add shield parameter to BOM generation 2020-06-13 18:07:49 +02:00
Daniel Rojas
19f0a82544 Improve handling of mm² and AWG gauges 2020-06-13 17:57:20 +02:00
Daniel Rojas
3eaabc3b53 Rename nodes and wires to connectors and cables 2020-06-13 16:11:09 +02:00
Daniel Rojas
2687afcdd2 Rename num_wires to wirecount 2020-06-13 15:46:26 +02:00
Daniel Rojas
5bff36d4c4 Rename num_pins to pincount 2020-06-13 15:40:21 +02:00