luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dedicated function for calculating y extent of custom wave equations

This commit is contained in:
Stefan Frederik 2022-02-17 01:22:15 +01:00
parent 798ecd74f3
commit fc6268395b
10 changed files with 2870 additions and 2047 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XSchemWin/XSchemWix/doc.wxs
View File

@ -315,6 +315,9 @@
<Component Id="cmp99C532DCC5EF9E1CD1D26BED58B2934E" Guid="{25622185-DA1B-43B3-89E5-646B7AE4E02C}">
<File Id="fil04166376BFA25115160171891B16FB23" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs14.png" />
</Component>
<Component Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" Guid="{271368C9-DBA8-4B72-8BEC-E1A17C41A941}">
<File Id="fil52A4BE0CB79D0FD8C836704442CBDD88" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs15.png" />
</Component>
<Component Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" Guid="{06F4736F-88F7-459A-BF81-9F04C78C45B7}">
<File Id="fil00E7CE2F76CC18FC1618A1670E025C42" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\gschemtoxschem.png" />
</Component>
@ -961,6 +964,7 @@
<ComponentRef Id="cmpE98EB455E6D39076B1A40C1CAB3D835E" />
<ComponentRef Id="cmp5D66F2AD13E998B64847AB8B0624EE21" />
<ComponentRef Id="cmp99C532DCC5EF9E1CD1D26BED58B2934E" />
<ComponentRef Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" />
<ComponentRef Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" />
<ComponentRef Id="cmpDB80566B13B66B2A92E91DA0585404A9" />
<ComponentRef Id="cmp8C7AB373FA963AF5F88C8B394FB28B19" />

568
XSchemWin/XSchemWix/heat_doc.wxs
View File

File diff suppressed because it is too large Load Diff

4066
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

168
XSchemWin/XSchemWix/xschem_library.wxs
View File

@ -359,6 +359,12 @@
<Component Id="cmp899706CD9039D5A8BC0C5E13DCE254B5" Guid="{6D6FF59E-5D24-4C2F-9A17-259E55A17C9D}">
<File Id="fil7C567D41EF33CE8499F852AA2E887FCC" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\bus_keeper.sch" />
</Component>
<Component Id="cmp1DA8686E51EE54628A1EF282FA6566ED" Guid="{68FC41DB-F87A-4C81-BC2A-A360A7E75EED}">
<File Id="fil1AF59F26D67F060C3D0C3FD0CFA58B22" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\classD_amp.sch" />
</Component>
<Component Id="cmp972BF309F294B048634E24CA4AC8228C" Guid="{DC70A83B-4D76-4CF0-A345-DA8905954CB3}">
<File Id="filF46D4B14C2D222B8F99F374067AC2903" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\classD_amp.sym" />
</Component>
<Component Id="cmp8CF61E04071D6AA12777E1E88D7539C6" Guid="{4C2BC9F0-6DB0-4754-9AD9-D3D08439EF82}">
<File Id="fil8B315C5E4DB78D2DA67612A1B49BCB26" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\cmos_example.sch" />
</Component>
@ -383,6 +389,12 @@
<Component Id="cmp00B1BD8B540699C4FCE9585AD3A5816F" Guid="{33CEC06D-CF28-48C8-A7A4-205F0BB8F981}">
<File Id="fil33EF305C6CA71D88FAFF0E656B02405F" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\dlatch.sym" />
</Component>
<Component Id="cmpED16AF8703AD971D0B6506CD450B9162" Guid="{AE2D3E03-1F12-4A04-89CA-3F608D3570C3}">
<File Id="filE2309E8A6D381E7461E4F3A337AFDFBB" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\doublepin.sch" />
</Component>
<Component Id="cmp91FA08C399DCD73BEB8A3FB61D4E1633" Guid="{7694FCBE-0700-496B-A9FE-1168687B4626}">
<File Id="fil0C3A541FF912AA01CB026B0265F18074" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\doublepin.sym" />
</Component>
<Component Id="cmp8FC79A963A5B1BB42A1ABE90314A402D" Guid="{B473760C-860B-43A2-858C-FC5DD6F4C591}">
<File Id="fil7A87FF60DDFE284B53DC1A48AAB0D991" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\flop.sch" />
</Component>
@ -578,6 +590,9 @@
<Component Id="cmpAEF56BDB09D122243A6EAE07734B3F38" Guid="{3832BB54-5B22-4FCF-BFCE-AA9F5F4D0293}">
<File Id="filF8FB9273C9701B1D5629728BB87CEAFD" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\test_backannotated_subckt.sym" />
</Component>
<Component Id="cmp1CB191EAD2BF728BA3BBB51212CD9247" Guid="{69C694D5-5DD4-4A22-994C-6A3580F442B4}">
<File Id="fil58F186B07EB593663AEED328B4D974F3" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\test_doublepin.sch" />
</Component>
<Component Id="cmp77E0F6C53A43FB1A2E8231AA49C7A604" Guid="{62C5CBE3-D841-4D0E-A076-75414096A2DA}">
<File Id="fil44DEAF0637B5696172643A0ED1297267" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\examples\test_lm324.sch" />
</Component>
@ -4783,9 +4798,27 @@
</Component>
</Directory>
<Directory Id="dir56DE5EF8751BC7CC27D761D41B807A4F" Name="ngspice">
<Component Id="cmpC80271A5349A90213C6C95A09525C583" Guid="{AE22ED48-C857-4FCF-BA8F-E1826806383E}">
<File Id="filA99C97286021D4015876834A07A4543C" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\adc.sch" />
</Component>
<Component Id="cmp3317993A543FED5BC3FC331C40B79598" Guid="{450C9A76-EBCE-4FFC-9B5A-69FDAFB9FBF6}">
<File Id="fil205F89079F0C4DAD4C11542E4025F03D" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\adc.sym" />
</Component>
<Component Id="cmp3C9FD81880B7434EA7FD7217DF0B7D35" Guid="{7CE08E79-0652-4062-BA1C-79D0C9E71070}">
<File Id="fil65AC0306286A0785594767FB2015FDB2" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\amp_xschem.sch" />
</Component>
<Component Id="cmp8DCE9492BAC02978FFAB56FE9E79E5EA" Guid="{27B2070E-AEBA-4E68-9DA0-B12B87C5B7D0}">
<File Id="fil1041071951F33F0DA96A6D36BA27C1D3" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\and3_ngspice.sch" />
</Component>
<Component Id="cmpDCACD51A58A3AD46750B2833164D1858" Guid="{BDA716F4-5FA4-4161-9736-FA17C4E5F96C}">
<File Id="filD7B0922B85994C075BC61E29891C2324" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\and3_ngspice.sym" />
</Component>
<Component Id="cmp2088AAC35A08E0518ACDC24298104ED3" Guid="{5389F974-D58D-468F-9F73-9F3183BAB316}">
<File Id="filED83AD38D1E0F9CD9547EB324FF4BE94" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\and_ngspice.sch" />
</Component>
<Component Id="cmp4E42D794E5F6CF3E7A3EDA9C016D70A3" Guid="{BE45874B-B68F-4B3B-90DC-29D4ABDEA6EF}">
<File Id="fil89878C652A9ABFF428748D5D5EECE0EB" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\and_ngspice.sym" />
</Component>
<Component Id="cmp81121000EE29EDB7D590EC4C84F1AA2A" Guid="{A8F771A4-8B16-49FA-A581-85D0B728E74A}">
<File Id="fil34A55EC1C05159C07FC90AED847FFF66" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\autozero_comp.sch" />
</Component>
@ -4795,24 +4828,105 @@
<Component Id="cmp89838BB57E0FD4179DCA4965EB90E8C7" Guid="{97778F38-5A7D-4D0A-A747-4639545FB0A0}">
<File Id="fil12622F9C466C8C2E0ADDBEFBAD8AE5BB" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\buck.sch" />
</Component>
<Component Id="cmp80F17668356F715FB30000BA77553EBA" Guid="{1AEFCA10-5D52-4934-A5B4-774EFE511D5E}">
<File Id="fil76CC1010EF62948C6E2502EA33C400C3" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\buf_ngspice.sch" />
</Component>
<Component Id="cmpBD9487EA59ED3AE24081A421B0769C70" Guid="{3E53A085-CD8D-4C2B-83F1-4DF53DD0A916}">
<File Id="fil1913C63870D1A2D7B6ECA18755E04D1C" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\buf_ngspice.sym" />
</Component>
<Component Id="cmp97AB2F4BC3ABE4634A8B25AB0F5E28BD" Guid="{628DCE86-A044-429E-8179-EF786003F7F8}">
<File Id="fil09B1BC8CA7EDB49128AFFA261BD67560" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\colpitts_xschem.sch" />
</Component>
<Component Id="cmp6C8538AD865B9244E22742A53E668C8D" Guid="{605787D0-46A9-4430-A6E1-971BC103ADE3}">
<File Id="fil07BBA91AA3F7537AA56C17F6FE718B4F" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\comp_65nm.sch" />
</Component>
<Component Id="cmpB174562BA266302D106AEF801F8BC10A" Guid="{6A59AAC0-101B-4341-A60C-AE1FAC322E62}">
<File Id="fil10607E9D36519FEB41FEA881FFAEA3EF" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\comp_65nm.sym" />
</Component>
<Component Id="cmp6FB1961F0E5EE52F80240E75956353EA" Guid="{C966774A-A479-485B-BD2F-C30B2F574E00}">
<File Id="fil5ACDD9E8393BACFCF6987990AAD0CE66" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\comp_ngspice.sch" />
</Component>
<Component Id="cmp9D304AFBFB87D8E4FB32989B69160AB2" Guid="{D4DB211F-1D1E-4E93-83E7-F220C746D828}">
<File Id="fil62A64AFDE6F2BAD711B403B66C065871" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\comp_ngspice.sym" />
</Component>
<Component Id="cmp5939E8B864B2C6BA45646DF8566FDC96" Guid="{BE507D70-F77C-43A0-B02E-177D3620F654}">
<File Id="fil2C2220977E1D5768F573B6526F6D16A0" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\counter_6bit_ngspice.sch" />
</Component>
<Component Id="cmp62F93427FE69E5A06D66F6A8CEAEDF3E" Guid="{7774EBB7-225B-411B-9341-48E79BF6E231}">
<File Id="fil076CC74D5ECEE84FD0F1EAF04FF56B63" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\counter_6bit_ngspice.sym" />
</Component>
<Component Id="cmp5547F9E68EDF6E118AD8BA716982ADB3" Guid="{611CA23B-3370-4598-9B95-BC87743F8625}">
<File Id="filB378B505E858540E93C9E9C4CFE9CFBD" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\delta_sigma.sch" />
</Component>
<Component Id="cmp70D8EDA5E2D1C25F9EF091255B0E5459" Guid="{55E78524-0BA3-4BAB-B7D8-B046B29D2755}">
<File Id="filF63EED06EAB648574272CEC9437B4D1B" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\flip_flop_ngspice.sch" />
</Component>
<Component Id="cmpBAEAE74C45E5CA5F74FAB388199B41B6" Guid="{3AB132B2-6C9C-4AF9-9E77-0FE3208EA670}">
<File Id="fil63CBE4589D6E4B008EDE3E8B4168FCDB" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\flip_flop_ngspice.sym" />
</Component>
<Component Id="cmpE6EFB433893F0DC06DEFB3CB09F50A90" Guid="{62DDE764-13DE-4872-8FA1-E671540CA83D}">
<File Id="fil30DFECEC7992C814CED68BBC5110FC53" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\full_adder_ngspice.sch" />
</Component>
<Component Id="cmp14C6048D7BD7F0AAC48CA7807E87ADE6" Guid="{5B41D431-BB84-4E63-BE32-CEC86C60F226}">
<File Id="fil4FA449BB44AC9081810E6D542C6419BC" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\full_adder_ngspice.sym" />
</Component>
<Component Id="cmp999E7E543733046022E7393631AEA4AB" Guid="{981D593A-5298-4AE3-90B7-8DB8CFC3B627}">
<File Id="fil45F62FEE267C9DEF4439DABE2378744E" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\half_adder_ngspice.sch" />
</Component>
<Component Id="cmp30744FF632886461F2D65E57EDAF901F" Guid="{3821483F-2FAB-4744-90D3-30A7D7E38F26}">
<File Id="fil71750D7BA279F93E2A6B4BC3BE97DA52" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\half_adder_ngspice.sym" />
</Component>
<Component Id="cmpAAB0F94489117FE884153D1DF652E569" Guid="{F169AA1E-69D5-4EE8-B7C3-E035B6BB7842}">
<File Id="filA30EA3771A8232F7BDF00B9CF26B3028" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\hpf_xschem.sch" />
</Component>
<Component Id="cmpA247B6D361250BBE807B16C9A2919624" Guid="{C4FFBB7E-A9B5-46C0-9B7E-85BC9C59EB93}">
<File Id="filFADE1FF495FECAC542DC9CA7CD87C90F" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\inv-2.sym" />
</Component>
<Component Id="cmp5BDA8540D9FEA91E6525FFA5D901FC6E" Guid="{A6FF78E4-62A7-4EBB-ABA8-DF5A619C087C}">
<File Id="fil77AC804C7514EE081437C6B20B0D45A2" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\inv_ngspice.sch" />
</Component>
<Component Id="cmpDD0E46819A9CE9406E219DFBB9663CF4" Guid="{A46357DB-ED29-4A7F-AF16-B9F65DFEE3A9}">
<File Id="fil6BF8BB6490127F72FB3F32033848C5EF" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\inv_ngspice.sym" />
</Component>
<Component Id="cmp04E9142E7C1602DB2F78AABE9908C18D" Guid="{E8B67FA4-BD9D-4389-86EA-8244CDB53618}">
<File Id="fil60CC8BE945A9044ED5C30F0BB2CF686A" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\keeper_ngspice.sch" />
</Component>
<Component Id="cmpB6EE3406A0F5355D38F1705845040835" Guid="{0C0C8651-D70C-47E1-BEFA-D311C5FCDD23}">
<File Id="fil3B5D1F4F03C0130029FDD0BAD79F7A4B" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\keeper_ngspice.sym" />
</Component>
<Component Id="cmp0226EFC50405ED797101CDF8A3C921C3" Guid="{33C8E123-8632-4EF6-BD28-CC628576EE69}">
<File Id="filC039852278CF75581EA6C9FF9B43FD8F" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\led_driver.sch" />
</Component>
<Component Id="cmp2525358307E5F5A3D0223C039A00C3FB" Guid="{5FBEDC90-2ECD-404C-B53E-2F5E39B950D5}">
<File Id="fil92AD2EC5A350EF4DFBC1527D17D93A02" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\lm741.sym" />
</Component>
<Component Id="cmp4B38D53ABB2A452C7D40B5AE17A860DF" Guid="{6B629941-86FD-4263-87FC-CD042F17F74F}">
<File Id="fil5299FCDB9317D3A3BA259346766C5A6D" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\nand_ngspice.sch" />
</Component>
<Component Id="cmp2379179C3D9E67B7506595F1BF992645" Guid="{77B68C97-27A2-49D5-83C8-034659C52266}">
<File Id="fil8C44ECA9CDCF62FF82FA21B040306300" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\nand_ngspice.sym" />
</Component>
<Component Id="cmp9BDCED51AA73C88336582C7A3ABFFF68" Guid="{FD26902D-CC98-460B-A5D4-088C59D2F6EF}">
<File Id="filC203B735210715109ADA88F5CE5E828F" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\nmos4-v.sym" />
</Component>
<Component Id="cmp6CFE85A8A105A5006A0E23C782740903" Guid="{C89A88AA-D516-49A1-868C-BE98E53746B1}">
<File Id="fil521011F49A81B5857D2D3DBCFE343F6B" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\nor_ngspice.sch" />
</Component>
<Component Id="cmp797FBAAAB976BF91E487DAE6BA739BDD" Guid="{3E5A8951-B8D7-4B0C-9482-BC7EA1DD117C}">
<File Id="fil8F200CAC8C80930986F5A6E19F5A86F4" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\nor_ngspice.sym" />
</Component>
<Component Id="cmp04E8EE6D7CCB96733BD93BC3145D5F34" Guid="{75E46ABF-66D4-46F2-8417-5FF343B99911}">
<File Id="fil15BDDE7BB82F91FC648650BC10F4DC70" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\opamp_65nm.sch" />
</Component>
<Component Id="cmpA65350BE25D3519FF9B1B7CD29E7D542" Guid="{0AD1E1D5-4AE1-4713-A929-AA89C2BDF07B}">
<File Id="fil4B2AB284909B502CBAB8AEFBD92AC258" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\opamp_65nm.sym" />
</Component>
<Component Id="cmp737D832DDEBD2FD6E70A5B88E75527F2" Guid="{526F5C41-4CE1-4A45-8C5B-CF53E33C9437}">
<File Id="fil17926AC6205392C3883FF533E566A0FD" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\or_ngspice.sch" />
</Component>
<Component Id="cmpF08A5168EC37991D875CB5B0CCF41603" Guid="{2069653C-8C81-46DD-8A0A-41C379B28419}">
<File Id="fil78C2AA6D034208BC069D4BBF8FECF600" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\or_ngspice.sym" />
</Component>
<Component Id="cmpCBC7FB80FEAF230C77237A28A4B323F6" Guid="{D057A855-4606-4767-AEFC-B509BB0D9BB4}">
<File Id="filCC2B69724CC82FEB8DFE51D4477B64AB" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\passgate.sym" />
</Component>
@ -4831,6 +4945,18 @@
<Component Id="cmpC7926C63F014277EC36E893A1F3696D4" Guid="{A963CEAC-807D-436C-9E23-06C4A78DEE37}">
<File Id="filBA2604076D7BCA03B0B63CC6789EDECF" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\stimuli.autozero_comp_xyce" />
</Component>
<Component Id="cmp2015FC5E9167C308D6475A30BA070CCC" Guid="{D361B039-2E14-43E9-87FA-BD8B838B9B57}">
<File Id="filB305FE5A1DAB26443C2475270AF03EA2" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\xnor_ngspice.sch" />
</Component>
<Component Id="cmpCDAAA8F82466F91565BD09D130FB616A" Guid="{E78C0375-012D-4753-ABB6-41F4195191AB}">
<File Id="fil43B130C0C7A71383AF3A7858919863B7" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\xnor_ngspice.sym" />
</Component>
<Component Id="cmp3CDEBE336A570223DF766E1A767D37CE" Guid="{22207282-E2F0-4549-AFA2-7345A4DA0EC3}">
<File Id="fil8464BF7971FF46F07E8358420E3FB827" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\xor_ngspice.sch" />
</Component>
<Component Id="cmp1F8997B22A7D08567BB15C73851418F2" Guid="{6D1FD93F-2994-44CD-9186-CA36C3AE8323}">
<File Id="fil95911A877A642C5D3E09DA8EB64DD3FC" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\ngspice\xor_ngspice.sym" />
</Component>
</Directory>
<Directory Id="dirBD835285122EBEFC359E369581C7F6C9" Name="pcb">
<Component Id="cmp55E5CC645BE7A7C627C0B2B83746BDF6" Guid="{D404BDE3-666E-4503-B0DC-96BABD34263B}">
@ -5371,6 +5497,8 @@
<ComponentRef Id="cmp3932C1998BA36C445E269CDCD6794D3F" />
<ComponentRef Id="cmpA1380E32F6F1CDC77DD5A1A942461D79" />
<ComponentRef Id="cmp899706CD9039D5A8BC0C5E13DCE254B5" />
<ComponentRef Id="cmp1DA8686E51EE54628A1EF282FA6566ED" />
<ComponentRef Id="cmp972BF309F294B048634E24CA4AC8228C" />
<ComponentRef Id="cmp8CF61E04071D6AA12777E1E88D7539C6" />
<ComponentRef Id="cmp32F04546D3D34E506668FDCAF140AD26" />
<ComponentRef Id="cmp691FABAD9E70CAB633C4951FA945525F" />
@ -5379,6 +5507,8 @@
<ComponentRef Id="cmpDAB9FD1BFB650AB1F914EC01154D3191" />
<ComponentRef Id="cmpADED9789CB9FCC2F3F7C192D39844489" />
<ComponentRef Id="cmp00B1BD8B540699C4FCE9585AD3A5816F" />
<ComponentRef Id="cmpED16AF8703AD971D0B6506CD450B9162" />
<ComponentRef Id="cmp91FA08C399DCD73BEB8A3FB61D4E1633" />
<ComponentRef Id="cmp8FC79A963A5B1BB42A1ABE90314A402D" />
<ComponentRef Id="cmpDB0464BCB509B3DF7634CBC60E64E21F" />
<ComponentRef Id="cmpE559991D3010EDBECBDEAF63C8243A6E" />
@ -5444,6 +5574,7 @@
<ComponentRef Id="cmpFE3AD86DCDB95AEE8C922AF6F1910FC1" />
<ComponentRef Id="cmp0F886DAEE595168D462438D292C5868D" />
<ComponentRef Id="cmpAEF56BDB09D122243A6EAE07734B3F38" />
<ComponentRef Id="cmp1CB191EAD2BF728BA3BBB51212CD9247" />
<ComponentRef Id="cmp77E0F6C53A43FB1A2E8231AA49C7A604" />
<ComponentRef Id="cmp4B4D8B4C4B196D864383F4138BBA8B2D" />
<ComponentRef Id="cmp7BBFD4FFD4BD205783E8852433FC5873" />
@ -6843,22 +6974,59 @@
<ComponentRef Id="cmp652C5B945784DFDAEAAE49D2A8C837DA" />
<ComponentRef Id="cmp957C66E1E554227595BB630A4EC0D0E2" />
<ComponentRef Id="cmp23DA7B587E0A71317E6EDB446EDB625E" />
<ComponentRef Id="cmpC80271A5349A90213C6C95A09525C583" />
<ComponentRef Id="cmp3317993A543FED5BC3FC331C40B79598" />
<ComponentRef Id="cmp3C9FD81880B7434EA7FD7217DF0B7D35" />
<ComponentRef Id="cmp8DCE9492BAC02978FFAB56FE9E79E5EA" />
<ComponentRef Id="cmpDCACD51A58A3AD46750B2833164D1858" />
<ComponentRef Id="cmp2088AAC35A08E0518ACDC24298104ED3" />
<ComponentRef Id="cmp4E42D794E5F6CF3E7A3EDA9C016D70A3" />
<ComponentRef Id="cmp81121000EE29EDB7D590EC4C84F1AA2A" />
<ComponentRef Id="cmp6459B0DD74A47A086E6B614933AFC28C" />
<ComponentRef Id="cmp89838BB57E0FD4179DCA4965EB90E8C7" />
<ComponentRef Id="cmp80F17668356F715FB30000BA77553EBA" />
<ComponentRef Id="cmpBD9487EA59ED3AE24081A421B0769C70" />
<ComponentRef Id="cmp97AB2F4BC3ABE4634A8B25AB0F5E28BD" />
<ComponentRef Id="cmp6C8538AD865B9244E22742A53E668C8D" />
<ComponentRef Id="cmpB174562BA266302D106AEF801F8BC10A" />
<ComponentRef Id="cmp6FB1961F0E5EE52F80240E75956353EA" />
<ComponentRef Id="cmp9D304AFBFB87D8E4FB32989B69160AB2" />
<ComponentRef Id="cmp5939E8B864B2C6BA45646DF8566FDC96" />
<ComponentRef Id="cmp62F93427FE69E5A06D66F6A8CEAEDF3E" />
<ComponentRef Id="cmp5547F9E68EDF6E118AD8BA716982ADB3" />
<ComponentRef Id="cmp70D8EDA5E2D1C25F9EF091255B0E5459" />
<ComponentRef Id="cmpBAEAE74C45E5CA5F74FAB388199B41B6" />
<ComponentRef Id="cmpE6EFB433893F0DC06DEFB3CB09F50A90" />
<ComponentRef Id="cmp14C6048D7BD7F0AAC48CA7807E87ADE6" />
<ComponentRef Id="cmp999E7E543733046022E7393631AEA4AB" />
<ComponentRef Id="cmp30744FF632886461F2D65E57EDAF901F" />
<ComponentRef Id="cmpAAB0F94489117FE884153D1DF652E569" />
<ComponentRef Id="cmpA247B6D361250BBE807B16C9A2919624" />
<ComponentRef Id="cmp5BDA8540D9FEA91E6525FFA5D901FC6E" />
<ComponentRef Id="cmpDD0E46819A9CE9406E219DFBB9663CF4" />
<ComponentRef Id="cmp04E9142E7C1602DB2F78AABE9908C18D" />
<ComponentRef Id="cmpB6EE3406A0F5355D38F1705845040835" />
<ComponentRef Id="cmp0226EFC50405ED797101CDF8A3C921C3" />
<ComponentRef Id="cmp2525358307E5F5A3D0223C039A00C3FB" />
<ComponentRef Id="cmp4B38D53ABB2A452C7D40B5AE17A860DF" />
<ComponentRef Id="cmp2379179C3D9E67B7506595F1BF992645" />
<ComponentRef Id="cmp9BDCED51AA73C88336582C7A3ABFFF68" />
<ComponentRef Id="cmp6CFE85A8A105A5006A0E23C782740903" />
<ComponentRef Id="cmp797FBAAAB976BF91E487DAE6BA739BDD" />
<ComponentRef Id="cmp04E8EE6D7CCB96733BD93BC3145D5F34" />
<ComponentRef Id="cmpA65350BE25D3519FF9B1B7CD29E7D542" />
<ComponentRef Id="cmp737D832DDEBD2FD6E70A5B88E75527F2" />
<ComponentRef Id="cmpF08A5168EC37991D875CB5B0CCF41603" />
<ComponentRef Id="cmpCBC7FB80FEAF230C77237A28A4B323F6" />
<ComponentRef Id="cmp0F9FE65C90437BA6A6262ADD2D07CC18" />
<ComponentRef Id="cmp48D7195380E19ED4C8F932A9689DD5B1" />
<ComponentRef Id="cmp77356AD341ED858C86F7395F40A57F7A" />
<ComponentRef Id="cmpDB6B5CBFE445584C13D50BDB01BBE11A" />
<ComponentRef Id="cmpC7926C63F014277EC36E893A1F3696D4" />
<ComponentRef Id="cmp2015FC5E9167C308D6475A30BA070CCC" />
<ComponentRef Id="cmpCDAAA8F82466F91565BD09D130FB616A" />
<ComponentRef Id="cmp3CDEBE336A570223DF766E1A767D37CE" />
<ComponentRef Id="cmp1F8997B22A7D08567BB15C73851418F2" />
<ComponentRef Id="cmp55E5CC645BE7A7C627C0B2B83746BDF6" />
<ComponentRef Id="cmp638723DEE6C9B17E1C8E1594DA083185" />
<ComponentRef Id="cmp5B93C1BFDDB73CBE28A4459E3406D3AC" />

17
src/callback.c
View File

@ -653,17 +653,14 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
j = -1;
if(!bus_msb && xctx->graph_values) {
char *express = NULL;
int ofs = 0;
if(strstr(ntok, ";")) {
my_strdup2(1505, &express, find_nth(ntok, ";", 2));
} else {
my_strdup2(1506, &express, ntok);
}
if(strstr(express, " ")) {
for(dset = 0 ; dset < xctx->graph_datasets; dset++) {
j = plot_raw_custom_data(sweep_idx, ofs, ofs + xctx->graph_npoints[dset] - 1, express);
ofs += xctx->graph_npoints[dset];
}
/* just probe a single point to get the index. custom data column already calculated */
j = calc_custom_data_yrange(sweep_idx, express, gr);
} else {
j = get_raw_index(express);
}
@ -693,15 +690,15 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
my_strdup(1422, &r->prop_ptr, subst_token(r->prop_ptr, "y1", dtoa(min)));
my_strdup(1423, &r->prop_ptr, subst_token(r->prop_ptr, "y2", dtoa(max)));
need_redraw = 1;
} else {
} else { /* digital plot */
my_strdup(1497, &r->prop_ptr, subst_token(r->prop_ptr, "ypos1",
get_tok_value(r->prop_ptr, "y1", 0) ));
my_strdup(1498, &r->prop_ptr, subst_token(r->prop_ptr, "ypos2",
get_tok_value(r->prop_ptr, "y2", 0) ));
need_redraw = 1;
}
}
} else {
} /* graph_master */
} else { /* not graph_left */
int dset = dataset == -1 ? 0 : dataset;
if(r->sel || !(r->flags & 2) || i == xctx->graph_master) {
xx1 = get_raw_value(dset, 0, 0);
@ -711,8 +708,8 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
need_redraw = 1;
}
}
}
}
} /* graph_values */
} /* key == 'f' */
else if( event == MotionNotify && (state & Button1Mask) && xctx->graph_bottom ) {
double wwx1, wwx2, p, delta, ccx, ddx;

70
src/draw.c
View File

@ -2129,7 +2129,7 @@ static void draw_graph_variables(int wcnt, int wave_color, int n_nodes, int swee
}
if(xctx->graph_sim_type == 3) {
if(strstr(ntok, "ph(") == ntok_ptr || strstr(ntok_ptr, "_ph"))
if(strstr(ntok_ptr, "ph(") == ntok_ptr || strstr(ntok_ptr, "_ph"))
my_snprintf(tmpstr, S(tmpstr), "%s[Phase]", alias_ptr);
else
my_snprintf(tmpstr, S(tmpstr), "%s[dB]", alias_ptr);
@ -2377,6 +2377,68 @@ int edit_wave_attributes(int what, int i, Graph_ctx *gr)
return ret;
}
/* derived from draw_graph(), calculate y range of custom equation graph data,
* handling multiple datasets ad wraps (as in multi-sweep DC sims).
*/
int calc_custom_data_yrange(int sweep_idx, const char *express, Graph_ctx *gr)
{
int idx = -1;
int p, dset, ofs;
int first, last;
double xx; /* the p-th sweep variable value: xctx->graph_values[sweep_idx][p] */
double start;
double end;
int sweepvar_wrap = 0; /* incremented on new dataset or sweep variable wrap */
int dataset = gr->dataset;
ofs = 0;
start = (gr->gx1 <= gr->gx2) ? gr->gx1 : gr->gx2;
end = (gr->gx1 <= gr->gx2) ? gr->gx2 : gr->gx1;
for(dset = 0 ; dset < xctx->graph_datasets; dset++) {
double prev_x, prev_prev_x;
int cnt=0, wrap;
register SPICE_DATA *gv = xctx->graph_values[sweep_idx];
first = -1;
prev_prev_x = prev_x = 0;
last = ofs;
for(p = ofs ; p < ofs + xctx->graph_npoints[dset]; p++) {
xx = gv[p];
wrap = (sweep_idx == 0 && cnt > 1 && XSIGN(xx - prev_x) != XSIGN(prev_x - prev_prev_x));
if(first != -1) { /* there is something to plot ... */
if(xx > end || xx < start || /* ... and we ran out of graph area ... */
wrap) { /* ... or sweep variable changed direction */
if(dataset == -1 || dataset == sweepvar_wrap) {
idx = plot_raw_custom_data(sweep_idx, first, last, express);
}
first = -1;
}
}
if(wrap) {
sweepvar_wrap++;
cnt = 0;
}
if(xx >= start && xx <= end) {
if(first == -1) first = p;
/* Build poly x array. Translate from graph coordinates to screen coords */
if(dataset == -1 || dataset == sweepvar_wrap) {
} /* if(dataset == -1 || dataset == sweepvar_wrap) */
last = p;
cnt++;
} /* if(xx >= start && xx <= end) */
prev_prev_x = prev_x;
prev_x = xx;
} /* for(p = ofs ; p < ofs + xctx->graph_npoints[dset]; p++) */
if(first != -1) {
if(dataset == -1 || dataset == sweepvar_wrap) {
idx = plot_raw_custom_data(sweep_idx, first, last, express);
}
}
/* offset pointing to next dataset */
ofs += xctx->graph_npoints[dset];
sweepvar_wrap++;
} /* for(dset...) */
return idx;
}
/* flags:
@ -2462,7 +2524,7 @@ void draw_graph(int i, const int flags, Graph_ctx *gr)
double xx; /* the p-th sweep variable value: xctx->graph_values[sweep_idx][p] */
double start;
double end;
int n_bits = 1, wrap;
int n_bits = 1;
SPICE_DATA **idx_arr = NULL;
int sweepvar_wrap = 0; /* incremented on new dataset or sweep variable wrap */
XPoint *point = NULL;
@ -2480,10 +2542,10 @@ void draw_graph(int i, const int flags, Graph_ctx *gr)
/* loop through all datasets found in raw file */
for(dset = 0 ; dset < xctx->graph_datasets; dset++) {
double prev_x, prev_prev_x;
int cnt=0;
int cnt=0, wrap;
register SPICE_DATA *gv = xctx->graph_values[sweep_idx];
first = last = -1;
first = -1;
poly_npoints = 0;
my_realloc(1401, &point, xctx->graph_npoints[dset] * sizeof(XPoint));
/* Process "npoints" simulation items

1
src/xschem.h
View File

@ -1029,6 +1029,7 @@ extern void free_rawfile(int dr);
extern int read_rawfile(const char *f);
extern double get_raw_value(int dataset, int idx, int point);
extern int plot_raw_custom_data(int sweep_idx, int first, int last, const char *ntok);
extern int calc_custom_data_yrange(int sweep_idx, const char *express, Graph_ctx *gr);
extern int schematic_waves_loaded(void);
extern int edit_wave_attributes(int what, int i, Graph_ctx *gr);
extern void draw_graph(int i, int flags, Graph_ctx *gr);

16
xschem_library/examples/mos_power_ampli.sch
View File

@ -11,8 +11,8 @@ y1=-47
y2=50
divy=4
subdivy=4
x1=0.0426618
x2=0.0449149
x1=0.0436647
x2=0.045091
divx=8
subdivx=1
dataset=0
@ -29,8 +29,8 @@ y1=0.94
y2=160
divy=4
subdivy=9
x1=0.0426618
x2=0.0449149
x1=0.0436647
x2=0.045091
divx=8
subdivx=9
dataset=0
@ -40,15 +40,15 @@ unitx=m
color="4 7"
node="tcleval(\\"Xm1 power;vpp $\{path\}outi - i(v.$\{path\}vu) *\\"
\\"Average;vpp $\{path\}outi - i(v.$\{path\}vu) * avg()\\")"
\\"Average;vpp $\{path\}outi - i(v.$\{path\}vu) * 2e-4 ravg()\\")"
}
B 2 1520 -1130 2440 -830 {flags=graph
y1=-0.05
y2=150
divy=4
subdivy=9
x1=0.0426618
x2=0.0449149
x1=0.0436647
x2=0.045091
divx=8
subdivx=9
dataset=0
@ -58,7 +58,7 @@ unitx=m
color="4 7"
node="tcleval(\\"Xm2 Power;$\{path\}outi vnn - i(v.$\{path\}vd) *\\"
\\"Average;$\{path\}outi vnn - i(v.$\{path\}vd) * avg()\\")"
\\"Average;$\{path\}outi vnn - i(v.$\{path\}vd) * 2e-4 ravg()\\")"
}
B 2 960 -960 1094 -897 {flags=image
alpha=0.7

2
xschem_library/examples/poweramp.sch
View File

File diff suppressed because one or more lines are too long

5
xschem_library/ngspice/adc.sch
View File

@ -20,8 +20,9 @@ node="sig_in
x1.integ
vref
x1.q
x1.comp"
color="4 7 10 8 12"
x1.comp
x1.fb"
color="4 11 10 8 12 9"
dataset=0
unitx=n
}