Merge branch 'master' of github.com:fransschreuder/qucs

Conflicts:
	qucs-core/ChangeLog
	qucs-core/NEWS
	qucs-core/README
	qucs-core/RELEASE
	qucs-core/autodsp.sh
	qucs-core/configure.ac
	qucs-core/src/ChangeLog
	qucs-core/src/acsolver.cpp
	qucs-core/src/acsolver.h
	qucs-core/src/analyses.h
	qucs-core/src/analysis.cpp
	qucs-core/src/analysis.h
	qucs-core/src/applications.h
	qucs-core/src/characteristic.cpp
	qucs-core/src/characteristic.h
	qucs-core/src/check_citi.cpp
	qucs-core/src/check_citi.h
	qucs-core/src/check_csv.cpp
	qucs-core/src/check_csv.h
	qucs-core/src/check_dataset.cpp
	qucs-core/src/check_dataset.h
	qucs-core/src/check_mdl.cpp
	qucs-core/src/check_mdl.h
	qucs-core/src/check_netlist.cpp
	qucs-core/src/check_netlist.h
	qucs-core/src/check_touchstone.cpp
	qucs-core/src/check_touchstone.h
	qucs-core/src/check_zvr.cpp
	qucs-core/src/check_zvr.h
	qucs-core/src/circuit.cpp
	qucs-core/src/circuit.h
	qucs-core/src/compat.h
	qucs-core/src/components/ChangeLog
	qucs-core/src/components/Makefile.am
	qucs-core/src/components/amplifier.cpp
	qucs-core/src/components/amplifier.h
	qucs-core/src/components/attenuator.cpp
	qucs-core/src/components/attenuator.h
	qucs-core/src/components/biastee.cpp
	qucs-core/src/components/biastee.h
	qucs-core/src/components/capacitor.cpp
	qucs-core/src/components/capacitor.h
	qucs-core/src/components/cccs.cpp
	qucs-core/src/components/cccs.h
	qucs-core/src/components/ccvs.cpp
	qucs-core/src/components/ccvs.h
	qucs-core/src/components/circulator.cpp
	qucs-core/src/components/circulator.h
	qucs-core/src/components/coaxline.cpp
	qucs-core/src/components/coaxline.h
	qucs-core/src/components/component.h
	qucs-core/src/components/component_id.h
	qucs-core/src/components/components.h
	qucs-core/src/components/coupler.cpp
	qucs-core/src/components/coupler.h
	qucs-core/src/components/cross.cpp
	qucs-core/src/components/cross.h
	qucs-core/src/components/dcblock.cpp
	qucs-core/src/components/dcblock.h
	qucs-core/src/components/dcfeed.cpp
	qucs-core/src/components/dcfeed.h
	qucs-core/src/components/devices/Makefile.am
	qucs-core/src/components/devices/bjt.cpp
	qucs-core/src/components/devices/bjt.h
	qucs-core/src/components/devices/device.cpp
	qucs-core/src/components/devices/device.h
	qucs-core/src/components/devices/diac.cpp
	qucs-core/src/components/devices/diac.h
	qucs-core/src/components/devices/diode.cpp
	qucs-core/src/components/devices/diode.h
	qucs-core/src/components/devices/eqndefined.cpp
	qucs-core/src/components/devices/eqndefined.h
	qucs-core/src/components/devices/jfet.cpp
	qucs-core/src/components/devices/jfet.h
	qucs-core/src/components/devices/libdevices.ap
	qucs-core/src/components/devices/mosfet.cpp
	qucs-core/src/components/devices/mosfet.h
	qucs-core/src/components/devices/thyristor.cpp
	qucs-core/src/components/devices/thyristor.h
	qucs-core/src/components/devices/triac.cpp
	qucs-core/src/components/devices/triac.h
	qucs-core/src/components/digital/and.cpp
	qucs-core/src/components/digital/and.h
	qucs-core/src/components/digital/buffer.cpp
	qucs-core/src/components/digital/buffer.h
	qucs-core/src/components/digital/digisource.cpp
	qucs-core/src/components/digital/digisource.h
	qucs-core/src/components/digital/digital.cpp
	qucs-core/src/components/digital/digital.h
	qucs-core/src/components/digital/inverter.cpp
	qucs-core/src/components/digital/inverter.h
	qucs-core/src/components/digital/nand.cpp
	qucs-core/src/components/digital/nand.h
	qucs-core/src/components/digital/nor.cpp
	qucs-core/src/components/digital/nor.h
	qucs-core/src/components/digital/or.cpp
	qucs-core/src/components/digital/or.h
	qucs-core/src/components/digital/xnor.cpp
	qucs-core/src/components/digital/xnor.h
	qucs-core/src/components/digital/xor.cpp
	qucs-core/src/components/digital/xor.h
	qucs-core/src/components/ground.cpp
	qucs-core/src/components/ground.h
	qucs-core/src/components/gyrator.cpp
	qucs-core/src/components/gyrator.h
	qucs-core/src/components/iac.cpp
	qucs-core/src/components/iac.h
	qucs-core/src/components/idc.cpp
	qucs-core/src/components/idc.h
	qucs-core/src/components/iexp.cpp
	qucs-core/src/components/iexp.h
	qucs-core/src/components/ifile.cpp
	qucs-core/src/components/ifile.h
	qucs-core/src/components/iinoise.cpp
	qucs-core/src/components/iinoise.h
	qucs-core/src/components/inductor.cpp
	qucs-core/src/components/inductor.h
	qucs-core/src/components/inoise.cpp
	qucs-core/src/components/inoise.h
	qucs-core/src/components/iprobe.cpp
	qucs-core/src/components/iprobe.h
	qucs-core/src/components/ipulse.cpp
	qucs-core/src/components/ipulse.h
	qucs-core/src/components/irect.cpp
	qucs-core/src/components/irect.h
	qucs-core/src/components/isolator.cpp
	qucs-core/src/components/isolator.h
	qucs-core/src/components/itrafo.cpp
	qucs-core/src/components/itrafo.h
	qucs-core/src/components/ivnoise.cpp
	qucs-core/src/components/ivnoise.h
	qucs-core/src/components/libcomponent.ap
	qucs-core/src/components/microstrip/bondwire.cpp
	qucs-core/src/components/microstrip/bondwire.h
	qucs-core/src/components/microstrip/cpwgap.cpp
	qucs-core/src/components/microstrip/cpwgap.h
	qucs-core/src/components/microstrip/cpwline.cpp
	qucs-core/src/components/microstrip/cpwline.h
	qucs-core/src/components/microstrip/cpwopen.cpp
	qucs-core/src/components/microstrip/cpwopen.h
	qucs-core/src/components/microstrip/cpwshort.cpp
	qucs-core/src/components/microstrip/cpwshort.h
	qucs-core/src/components/microstrip/cpwstep.cpp
	qucs-core/src/components/microstrip/cpwstep.h
	qucs-core/src/components/microstrip/mscorner.cpp
	qucs-core/src/components/microstrip/mscorner.h
	qucs-core/src/components/microstrip/mscoupled.cpp
	qucs-core/src/components/microstrip/mscoupled.h
	qucs-core/src/components/microstrip/mscross.cpp
	qucs-core/src/components/microstrip/mscross.h
	qucs-core/src/components/microstrip/msgap.cpp
	qucs-core/src/components/microstrip/msgap.h
	qucs-core/src/components/microstrip/msline.cpp
	qucs-core/src/components/microstrip/msline.h
	qucs-core/src/components/microstrip/msmbend.cpp
	qucs-core/src/components/microstrip/msmbend.h
	qucs-core/src/components/microstrip/msopen.cpp
	qucs-core/src/components/microstrip/msopen.h
	qucs-core/src/components/microstrip/msrstub.cpp
	qucs-core/src/components/microstrip/msrstub.h
	qucs-core/src/components/microstrip/msstep.cpp
	qucs-core/src/components/microstrip/msstep.h
	qucs-core/src/components/microstrip/mstee.cpp
	qucs-core/src/components/microstrip/mstee.h
	qucs-core/src/components/microstrip/msvia.cpp
	qucs-core/src/components/microstrip/msvia.h
	qucs-core/src/components/microstrip/substrate.cpp
	qucs-core/src/components/microstrip/substrate.h
	qucs-core/src/components/mutual.cpp
	qucs-core/src/components/mutual.h
	qucs-core/src/components/mutual2.cpp
	qucs-core/src/components/mutual2.h
	qucs-core/src/components/mutualx.cpp
	qucs-core/src/components/mutualx.h
	qucs-core/src/components/opamp.cpp
	qucs-core/src/components/opamp.h
	qucs-core/src/components/open.cpp
	qucs-core/src/components/open.h
	qucs-core/src/components/pac.cpp
	qucs-core/src/components/pac.h
	qucs-core/src/components/phaseshifter.cpp
	qucs-core/src/components/phaseshifter.h
	qucs-core/src/components/rectline.cpp
	qucs-core/src/components/relais.cpp
	qucs-core/src/components/relais.h
	qucs-core/src/components/resistor.cpp
	qucs-core/src/components/resistor.h
	qucs-core/src/components/rfedd.cpp
	qucs-core/src/components/rfedd.h
	qucs-core/src/components/rlcg.cpp
	qucs-core/src/components/rlcg.h
	qucs-core/src/components/short.cpp
	qucs-core/src/components/short.h
	qucs-core/src/components/spfile.cpp
	qucs-core/src/components/spfile.h
	qucs-core/src/components/strafo.cpp
	qucs-core/src/components/strafo.h
	qucs-core/src/components/tee.cpp
	qucs-core/src/components/tee.h
	qucs-core/src/components/tline.cpp
	qucs-core/src/components/tline.h
	qucs-core/src/components/tline4p.cpp
	qucs-core/src/components/tline4p.h
	qucs-core/src/components/trafo.cpp
	qucs-core/src/components/trafo.h
	qucs-core/src/components/tswitch.cpp
	qucs-core/src/components/tswitch.h
	qucs-core/src/components/twistedpair.cpp
	qucs-core/src/components/twistedpair.h
	qucs-core/src/components/vac.cpp
	qucs-core/src/components/vac.h
	qucs-core/src/components/vam.cpp
	qucs-core/src/components/vam.h
	qucs-core/src/components/vccs.cpp
	qucs-core/src/components/vccs.h
	qucs-core/src/components/vcvs.cpp
	qucs-core/src/components/vcvs.h
	qucs-core/src/components/vdc.cpp
	qucs-core/src/components/vdc.h
	qucs-core/src/components/verilog/ChangeLog
	qucs-core/src/components/verilog/Makefile.am
	qucs-core/src/components/verilog/constants.vams
	qucs-core/src/components/verilog/disciplines.vams
	qucs-core/src/components/vexp.cpp
	qucs-core/src/components/vexp.h
	qucs-core/src/components/vfile.cpp
	qucs-core/src/components/vfile.h
	qucs-core/src/components/vnoise.cpp
	qucs-core/src/components/vnoise.h
	qucs-core/src/components/vpm.cpp
	qucs-core/src/components/vpm.h
	qucs-core/src/components/vprobe.cpp
	qucs-core/src/components/vprobe.h
	qucs-core/src/components/vpulse.cpp
	qucs-core/src/components/vpulse.h
	qucs-core/src/components/vrect.cpp
	qucs-core/src/components/vrect.h
	qucs-core/src/components/vvnoise.cpp
	qucs-core/src/components/vvnoise.h
	qucs-core/src/constants.h
	qucs-core/src/consts.h
	qucs-core/src/converter/ChangeLog
	qucs-core/src/converter/check_spice.cpp
	qucs-core/src/converter/check_spice.h
	qucs-core/src/converter/check_vcd.cpp
	qucs-core/src/converter/check_vcd.h
	qucs-core/src/converter/csv_producer.cpp
	qucs-core/src/converter/csv_producer.h
	qucs-core/src/converter/matlab_producer.cpp
	qucs-core/src/converter/matlab_producer.h
	qucs-core/src/converter/parse_spice.y
	qucs-core/src/converter/parse_vcd.y
	qucs-core/src/converter/qucs_producer.cpp
	qucs-core/src/converter/qucs_producer.h
	qucs-core/src/converter/qucsconv.cpp
	qucs-core/src/converter/scan_spice.l
	qucs-core/src/converter/scan_vcd.l
	qucs-core/src/converter/touchstone_producer.cpp
	qucs-core/src/converter/touchstone_producer.h
	qucs-core/src/dataset.cpp
	qucs-core/src/dataset.h
	qucs-core/src/dcsolver.cpp
	qucs-core/src/dcsolver.h
	qucs-core/src/devstates.cpp
	qucs-core/src/devstates.h
	qucs-core/src/differentiate.cpp
	qucs-core/src/differentiate.h
	qucs-core/src/environment.cpp
	qucs-core/src/environment.h
	qucs-core/src/eqnsys.cpp
	qucs-core/src/eqnsys.h
	qucs-core/src/equation.cpp
	qucs-core/src/equation.h
	qucs-core/src/evaluate.cpp
	qucs-core/src/evaluate.h
	qucs-core/src/exception.cpp
	qucs-core/src/exception.h
	qucs-core/src/exceptionstack.cpp
	qucs-core/src/exceptionstack.h
	qucs-core/src/fourier.cpp
	qucs-core/src/fourier.h
	qucs-core/src/gperfappgen.cpp
	qucs-core/src/hash.cpp
	qucs-core/src/hash.h
	qucs-core/src/hbsolver.cpp
	qucs-core/src/hbsolver.h
	qucs-core/src/history.cpp
	qucs-core/src/history.h
	qucs-core/src/input.cpp
	qucs-core/src/input.h
	qucs-core/src/integrator.cpp
	qucs-core/src/integrator.h
	qucs-core/src/interpolator.cpp
	qucs-core/src/interpolator.h
	qucs-core/src/libqucsator.h
	qucs-core/src/logging.c
	qucs-core/src/logging.h
	qucs-core/src/math/cbesselj.cpp
	qucs-core/src/math/cmplx.cpp
	qucs-core/src/math/cmplx.h
	qucs-core/src/math/complex.cpp
	qucs-core/src/math/complex.h
	qucs-core/src/math/fspecial.cpp
	qucs-core/src/math/fspecial.h
	qucs-core/src/math/precision.c
	qucs-core/src/math/precision.h
	qucs-core/src/math/real.cpp
	qucs-core/src/math/real.h
	qucs-core/src/matrix.cpp
	qucs-core/src/matrix.h
	qucs-core/src/matvec.cpp
	qucs-core/src/matvec.h
	qucs-core/src/module.cpp
	qucs-core/src/module.h
	qucs-core/src/nasolution.cpp
	qucs-core/src/nasolution.h
	qucs-core/src/nasolver.cpp
	qucs-core/src/nasolver.h
	qucs-core/src/net.cpp
	qucs-core/src/net.h
	qucs-core/src/netdefs.h
	qucs-core/src/node.cpp
	qucs-core/src/node.h
	qucs-core/src/nodelist.cpp
	qucs-core/src/nodelist.h
	qucs-core/src/nodeset.cpp
	qucs-core/src/nodeset.h
	qucs-core/src/object.cpp
	qucs-core/src/object.h
	qucs-core/src/operatingpoint.cpp
	qucs-core/src/operatingpoint.h
	qucs-core/src/pair.cpp
	qucs-core/src/pair.h
	qucs-core/src/parasweep.cpp
	qucs-core/src/parasweep.h
	qucs-core/src/parse_citi.y
	qucs-core/src/parse_csv.y
	qucs-core/src/parse_dataset.y
	qucs-core/src/parse_mdl.y
	qucs-core/src/parse_netlist.y
	qucs-core/src/parse_touchstone.y
	qucs-core/src/parse_zvr.y
	qucs-core/src/poly.h
	qucs-core/src/property.cpp
	qucs-core/src/property.h
	qucs-core/src/ptrlist.cpp
	qucs-core/src/ptrlist.h
	qucs-core/src/range.cpp
	qucs-core/src/range.h
	qucs-core/src/receiver.cpp
	qucs-core/src/receiver.h
	qucs-core/src/scan_citi.l
	qucs-core/src/scan_csv.l
	qucs-core/src/scan_dataset.l
	qucs-core/src/scan_mdl.l
	qucs-core/src/scan_netlist.l
	qucs-core/src/scan_touchstone.l
	qucs-core/src/scan_zvr.l
	qucs-core/src/spline.cpp
	qucs-core/src/spline.h
	qucs-core/src/spsolver.cpp
	qucs-core/src/spsolver.h
	qucs-core/src/states.cpp
	qucs-core/src/states.h
	qucs-core/src/strlist.cpp
	qucs-core/src/strlist.h
	qucs-core/src/sweep.cpp
	qucs-core/src/sweep.h
	qucs-core/src/tmatrix.cpp
	qucs-core/src/tmatrix.h
	qucs-core/src/transient.cpp
	qucs-core/src/transient.h
	qucs-core/src/tridiag.cpp
	qucs-core/src/tridiag.h
	qucs-core/src/trsolver.cpp
	qucs-core/src/trsolver.h
	qucs-core/src/tvector.cpp
	qucs-core/src/tvector.h
	qucs-core/src/ucs.cpp
	qucs-core/src/valuelist.cpp
	qucs-core/src/valuelist.h
	qucs-core/src/variable.cpp
	qucs-core/src/variable.h
	qucs-core/src/vector.cpp
	qucs-core/src/vector.h
	qucs-doc/NEWS
	qucs-doc/README
	qucs-doc/RELEASE
	qucs-doc/technical/ChangeLog
	qucs-doc/technical/transline.tex
	qucs-doc/tutorial/equations/content.tex
	qucs/ChangeLog
	qucs/NEWS
	qucs/README
	qucs/RELEASE
	qucs/autodsp.sh
	qucs/configure.ac
	qucs/contrib/innosetup/freehdl.iss
	qucs/contrib/innosetup/qucs.iss
	qucs/qucs-help/ChangeLog
	qucs/qucs-help/docs/en/Makefile.am
	qucs/qucs-help/docs/en/index.html
	qucs/qucs-lib/ChangeLog
	qucs/qucs-lib/library/Ideal.lib
	qucs/qucs-lib/symbolwidget.cpp
	qucs/qucs-transcalc/ChangeLog
	qucs/qucs-transcalc/coax.cpp
	qucs/qucs-transcalc/rectwaveguide.cpp
	qucs/qucs/ChangeLog
	qucs/qucs/Makefile.am
	qucs/qucs/bitmaps/Makefile.am
	qucs/qucs/bitmaps/photodiode.png
	qucs/qucs/bitmaps/phototransistor.png
	qucs/qucs/components/ChangeLog
	qucs/qucs/components/Makefile.am
	qucs/qucs/components/component.cpp
	qucs/qucs/components/components.h
	qucs/qucs/components/libcomponents.ap
	qucs/qucs/components/mslange.cpp
	qucs/qucs/diagrams/graph.cpp
	qucs/qucs/dialogs/settingsdialog.cpp
	qucs/qucs/dialogs/settingsdialog.h
	qucs/qucs/dialogs/simmessage.cpp
	qucs/qucs/dialogs/simmessage.h
	qucs/qucs/main.cpp
	qucs/qucs/main.h
	qucs/qucs/module.cpp
	qucs/qucs/paintings/graphictext.cpp
	qucs/qucs/qucs.ap
	qucs/qucs/qucs.cpp
	qucs/qucs/qucs.h
	qucs/qucs/qucs_ar.ts
	qucs/qucs/qucs_ca.ts
	qucs/qucs/qucs_cs.ts
	qucs/qucs/qucs_de.ts
	qucs/qucs/qucs_es.ts
	qucs/qucs/qucs_fr.ts
	qucs/qucs/qucs_he.ts
	qucs/qucs/qucs_hu.ts
	qucs/qucs/qucs_init.cpp
	qucs/qucs/qucs_it.ts
	qucs/qucs/qucs_jp.ts
	qucs/qucs/qucs_kk.ts
	qucs/qucs/qucs_pl.ts
	qucs/qucs/qucs_pt.ts
	qucs/qucs/qucs_ro.ts
	qucs/qucs/qucs_ru.ts
	qucs/qucs/qucs_sv.ts
	qucs/qucs/qucs_tr.ts
	qucs/qucs/qucs_uk.ts
	qucs/qucs/qucsdigi.bat
	qucs/qucs/qucsdigilib.bat
	qucs/qucs/qucsdoc.cpp
	qucs/qucs/qucsdoc.h
	qucs/qucs/schematic.cpp
	qucs/qucs/schematic_file.cpp
	qucs/qucs/syntax.cpp
	qucs/qucs/syntax.h
	qucs/qucs/textdoc.cpp
This commit is contained in:
Frans Schreuder 2012-03-22 13:23:20 +01:00
commit 8c3461fa09
85 changed files with 12813 additions and 16 deletions

View File

@ -1,3 +1,11 @@
<<<<<<< HEAD
=======
2011-03-18 Stefan Jahn <stefan@lkcc.org>
* configure.ac: Released version 0.0.16 and bumped up to version
0.0.17.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2009-04-27 Stefan Jahn <stefan@lkcc.org>
* qucs-filter-v2: Added preliminary 2nd version of qucs-filter

20
NEWS
View File

@ -1,7 +1,11 @@
--
-- NEWS
--
<<<<<<< HEAD
-- Copyright (C) 2003-2010 Stefan Jahn <stefan@lkcc.org>
=======
-- Copyright (C) 2003-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
--
-- This is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -23,9 +27,20 @@ This file lists user visible changes that were made between releases. For
more verbose descriptions of these and internal changes see the ChangeLog
files.
<<<<<<< HEAD
Version 0.0.16
--------------
=======
Version 0.0.17
--------------
Version 0.0.16
--------------
* implementation of interactive GNU Octave connection
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* support for C++ code export of symbol drawings associated with
Verilog-A files
* direct association of symbol drawings to Verilog-HDL, Verilog-A
@ -33,7 +48,12 @@ Version 0.0.16
* added Verilog-HDL and Verilog-A syntax highlighting in text documents
* support for pre-compiled VHDL modules and libraries made from user
written VHDL code
<<<<<<< HEAD
* new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g
=======
* new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g, tunnel diode,
ideal coupled transmission line, hybrid, HICUM L0 v1.3
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* translation into Kazakh
* allow equations in Verilog-HDL and VHDL subcircuits

15
README
View File

@ -1,7 +1,11 @@
--
-- README
--
<<<<<<< HEAD
-- Copyright (C) 2003, 2005 Stefan Jahn <stefan@lkcc.org>
=======
-- Copyright (C) 2003, 2005, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
--
-- This is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -72,6 +76,7 @@ file INSTALL included in this distribution.
Please note: Users of the FreeBSD OS may use a GNU make (probably gmake)
to compile and install the package.
<<<<<<< HEAD
Getting the latest CVS snapshot
===============================
@ -81,6 +86,16 @@ version might not even compile.
$ cvs -z3 -d:pserver:anonymous@qucs.cvs.sourceforge.net:/cvsroot/qucs \
co qucs
=======
Getting the latest SVN snapshot
===============================
You can always get the latest Qucs version from our SVN repository.
Please use an official release if you want to work with Qucs. The SVN
version might not even compile.
$ svn co https://qucs.svn.sourceforge.net/svnroot/qucs/trunk/qucs
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Press 'Enter' when asked for a password. Run `sh autogen.sh' and
`configure' with the appropriate options. Maintainance currently

12
RELEASE
View File

@ -3,7 +3,11 @@
--
-- release instructions.
--
<<<<<<< HEAD
-- Copyright (C) 2004, 2006 Stefan Jahn <stefan@lkcc.org>
=======
-- Copyright (C) 2004, 2006, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
--
-- This is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -38,13 +42,21 @@ Distribution process:
command `automake -a -f -c' with latest automake version installed.
- Run `make distclean', `sh autogen.sh' and `make all'.
- Run `make distcheck'.
<<<<<<< HEAD
- Check this status into CVS and tag it.
=======
- Check this status into SVN and tag it.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* Bump up version.
- Add a ChangeLog entry in toplevel directory.
- Add new section in NEWS.
- Bump up version number in `configure.ac'.
<<<<<<< HEAD
- Check into CVS.
=======
- Check into SVN.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* Distribute the package.
- Upload the package to the SourceForge server and add a News item.

View File

@ -19,7 +19,11 @@
# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
# Boston, MA 02110-1301, USA.
#
<<<<<<< HEAD
# $Id: autodsp.sh,v 1.1 2007/02/25 17:04:18 ela Exp $
=======
# $Id$
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
use strict;

View File

@ -2,7 +2,11 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
<<<<<<< HEAD
AC_INIT(qucs,0.0.16,qucs-bugs@lists.sourceforge.net)
=======
AC_INIT(qucs,0.0.17,qucs-bugs@lists.sourceforge.net)
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
AC_CONFIG_SRCDIR([qucs/qucs.cpp])
AC_CONFIG_HEADERS([config.h])
@ -266,6 +270,13 @@ DOC_PATH="$prefix/share/qucs/docs/"
AC_DEFINE_UNQUOTED([DOCDIR], ["$DOC_PATH"],
[Where the documentation files go.])
unset DOC_PATH
<<<<<<< HEAD
=======
OCTAVE_PATH="$prefix/share/qucs/octave/"
AC_DEFINE_UNQUOTED([OCTAVEDIR], ["$OCTAVE_PATH"],
[Where the octave script files go.])
unset OCTAVE_PATH
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
dnl Definitions at top of <config.h>.
AH_TOP([
@ -312,6 +323,10 @@ AC_CONFIG_FILES([Makefile
qucs-attenuator/bitmaps/Makefile
qucs/Makefile
qucs/bitmaps/Makefile
<<<<<<< HEAD
=======
qucs/octave/Makefile
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
qucs/components/Makefile
qucs/diagrams/Makefile
qucs/paintings/Makefile

View File

@ -1,7 +1,11 @@
;
; freehdl.iss - inno Setup script file
;
<<<<<<< HEAD
; Copyright (C) 2006, 2008 Stefan Jahn <stefan@lkcc.org>
=======
; Copyright (C) 2006, 2008, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
;
; This is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@ -23,10 +27,17 @@
; NOTE: additional files: bin/libregex.dll lib/libregex.a
;
<<<<<<< HEAD
#define RELEASE "0.0.7"
#define BASENAME "freehdl"
#define APPNAME "FreeHDL"
#define APPVERNAME "FreeHDL 0.0.7 binary package for Win32"
=======
#define RELEASE "0.0.8"
#define BASENAME "freehdl"
#define APPNAME "FreeHDL"
#define APPVERNAME "FreeHDL 0.0.8 binary package for Win32"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#define URL "http://www.freehdl.seul.org"
#define TREE "C:\home\freetree"

View File

@ -1,7 +1,11 @@
;
; qucs.iss - inno Setup script file
;
<<<<<<< HEAD
; Copyright (C) 2005, 2006, 2007, 2008 Stefan Jahn <stefan@lkcc.org>
=======
; Copyright (C) 2005-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
;
; This is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@ -19,10 +23,17 @@
; Boston, MA 02110-1301, USA.
;
<<<<<<< HEAD
#define RELEASE "0.0.14"
#define BASENAME "qucs"
#define APPNAME "Qucs"
#define APPVERNAME "Quite Universal Circuit Simulator 0.0.14 binary package for Win32"
=======
#define RELEASE "0.0.16"
#define BASENAME "qucs"
#define APPNAME "Qucs"
#define APPVERNAME "Quite Universal Circuit Simulator 0.0.16 binary package for Win32"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#define URL "http://qucs.sourceforge.net"
#define TREE "C:\home\qucstree"

View File

@ -1,3 +1,11 @@
<<<<<<< HEAD
=======
2011-03-11 Stefan Jahn <stefan@lkcc.org>
* docs/en/octave.html: Added short description of Octave
interface.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2009-10-08 Stefan Jahn <stefan@lkcc.org>
* docs/cs/index.html: Updated Czech translations of internal help

View File

@ -4,7 +4,11 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2005, 2006 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004, 2005, 2006, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -24,7 +28,11 @@
HTML = index.html short.html start.html mathfunc.html subcircuit.html \
programs.html internal.html characters.html matching.html start_digi.html \
<<<<<<< HEAD
start_opt.html
=======
start_opt.html octave.html
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
PIC = qucsmain.png paste.png wire.png select.png contab.png subcircuit.png \
qucsdigi.png optimization1.png optimization2.png optimization3.png \
optimization4.png optimization5.png optimization6.png optimization7.png \

View File

@ -20,6 +20,10 @@ Help Index<br><br>
<a href="start.html">Getting Started - Analog Simulation</a><br>
<a href="start_digi.html">Getting Started - Digital Simulation</a><br>
<a href="start_opt.html">Getting Started - Optimization</a><br>
<<<<<<< HEAD
=======
<a href="octave.html">Getting Started - Octave Scripts</a><br>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<a href="short.html">Short Description of Actions</a><br>
<a href="subcircuit.html">Working with Subcircuits</a><br>
<a href="mathfunc.html">Short Description of mathematical Functions</a><br>

View File

@ -0,0 +1,55 @@
<html>
<head>
<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<meta name="Author" content="Michael Margraf">
<title>Qucs - Getting Started Octave</title>
</head>
<body>
<a name="top" id="top"></a>
<center><h3>
- Qucs -<br>
Quite Universal Circuit Simulator<br>
</h3>
<h1>
Getting Started with<br>
Octave Scripts<br><br>
</h1></center>
Qucs can also be used to develop Octave scripts (see <a
href="http://www.octave.org">http://www.octave.org</a>). This document
should give you a short description on how to do this.
<br><br>
If the user creates a new text document and saves it with the Octave
extension, e.g. 'name.m' then the file will be listed at the Octave
files of the active project. The script can be executed with F2 key or
by pressing the simulate button in the toolbar. The output can bee
seen in the Octave window that opens automatically (per default on the
right-hand side). At the bottom of the Octave window there is a
command line where the user can enter single commands. It has a
history function that can be used with the cursor up/down keys.
<br><br>
There are two Octave functions that load Qucs simulation results from
a dataset file: loadQucsVariable() and loadQucsDataset(). Please use
the help function in the Octave command line to learn more about them
(i.e. type help loadQucsVariable and help loadQucsDataset).
<br>
<h3>Postprocessing</h3>
Octave can also be used for automatic postprocessing of a Qucs
simulation result. This is done by editing the data display file of a
schematic (Document Settings... in File menu). If the filename of an
Octave script (filename extension m) from the same project is entered,
this script will be executed after the simulation is finished.
<br><br><a href="#top">back to the top</a><br>
</body>
</html>

View File

@ -1,3 +1,10 @@
<<<<<<< HEAD
=======
2011-03-01 Stefan Jahn <stefan@lkcc.org>
* library/Ideal.lib: Fixed HardLimiter and Abs components.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2010-10-23 Stefan Jahn <stefan@lkcc.org>
* symbolwidget.cpp (createSymbol): Adjusted symbol for new HICUM

View File

@ -394,7 +394,11 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2"
</Model>
<Symbol>
<Line -20 -20 0 40 #000080 2 1>
<<<<<<< HEAD
<.PortSym 30 0 3 180>
=======
<.PortSym 30 0 2 180>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<Line 30 0 -10 0 #000080 2 1>
<Line -30 0 10 0 #000080 2 1>
<Line -20 -20 40 0 #000080 2 1>
@ -574,7 +578,11 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2"
.Def:End
</Model>
<Symbol>
<<<<<<< HEAD
<.PortSym 30 0 3 180>
=======
<.PortSym 30 0 2 180>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<Line -30 0 10 0 #000080 2 1>
<.PortSym -30 0 1 0>
<Line 20 0 10 0 #000080 2 1>

View File

@ -263,7 +263,11 @@ int SymbolWidget::createSymbol(const QString& Lib_, const QString& Comp_)
else if(Comp == "hicumL2V2p1" || Comp == "hic2_full" ||
Comp == "hic0_full" || Comp == "hicumL0V1p2" ||
Comp == "hicumL2V2p23" || Comp == "hicumL2V2p24" ||
<<<<<<< HEAD
Comp == "hicumL0V1p2g") {
=======
Comp == "hicumL0V1p2g" || Comp == "hicumL0V1p3") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// normal bipolar
Lines.append(new Line(-10,-15,-10, 15,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, 0,-10, 0,QPen(QPen::darkBlue,2)));

View File

@ -1,3 +1,16 @@
<<<<<<< HEAD
=======
2011-04-03 Stefan Jahn <stefan@lkcc.org>
* rectwaveguide.cpp (analyze): Fixed calculation of Z0 in
rectangular waveguide.
2011-03-02 Stefan Jahn <stefan@lkcc.org>
* coax.cpp (alphac_coax): Fixed factor of 2 in conductor loss
calculation.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2009-05-14 Stefan Jahn <stefan@lkcc.org>
* coax.cpp (show_results): Fixed computation of cut-off

View File

@ -3,7 +3,11 @@
*
* Copyright (C) 2001 Gopal Narayanan <gopal@astro.umass.edu>
* Copyright (C) 2002 Claudio Girardi <claudio.girardi@ieee.org>
<<<<<<< HEAD
* Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
=======
* Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -100,7 +104,11 @@ double coax::alphac_coax ()
{
double ac, Rs;
Rs = sqrt((M_PI * f * mur* MU0)/sigma);
<<<<<<< HEAD
ac = (0.5 * sqrt(er)) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0);
=======
ac = sqrt(er) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
ac = ac * 20.0 / log(10.0);
return ac;
}

View File

@ -43,7 +43,11 @@ rectwaveguide::~rectwaveguide()
double rectwaveguide::kval ()
{
double kval;
<<<<<<< HEAD
kval = 2. * M_PI * f * sqrt(mur * er)/C0;
=======
kval = 2.0 * M_PI * f * sqrt (mur * er) / C0;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return kval;
}
@ -54,7 +58,11 @@ double rectwaveguide::kval ()
double rectwaveguide::kc (int m, int n)
{
double kcval;
<<<<<<< HEAD
kcval = sqrt(pow((m*M_PI/a),2.0) + pow((n*M_PI/b),2.0));
=======
kcval = sqrt (pow ((m * M_PI / a), 2.0) + pow ((n * M_PI / b), 2.0));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return kcval;
}
@ -65,7 +73,11 @@ double rectwaveguide::kc (int m, int n)
double rectwaveguide::fc (int m, int n)
{
double fcval;
<<<<<<< HEAD
fcval = (kc(m, n) * C0)/ (2 * M_PI * sqrt(mur * er));
=======
fcval = kc (m, n) * C0 / (2.0 * M_PI * sqrt (mur * er));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return fcval;
}
@ -79,10 +91,17 @@ double rectwaveguide::alphac ()
double ac;
short m, n, mmax, nmax;
<<<<<<< HEAD
Rs = sqrt((M_PI * f * mur* MU0)/sigma);
k = kval();
ac = 0.0;
mmax = (int) floor (f/fc(1,0));
=======
Rs = sqrt ((M_PI * f * mur * MU0) / sigma);
k = kval ();
ac = 0.0;
mmax = (int) floor (f / fc (1,0));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
nmax = mmax;
/* below from Ramo, Whinnery & Van Duzer */
@ -120,7 +139,11 @@ double rectwaveguide::alphac ()
}
}
<<<<<<< HEAD
ac = ac * 20.0 * log10(exp(1.)); /* convert from Np/m to db/m */
=======
ac = ac * 20.0 * log10 (exp (1.0)); /* convert from Np/m to db/m */
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return ac;
}
@ -130,8 +153,13 @@ double rectwaveguide::alphac ()
double rectwaveguide::alphac_cutoff ()
{
double acc;
<<<<<<< HEAD
acc = sqrt(pow(kc(1,0),2.0) - pow(kval(),2.0));
acc = 20 * log10(exp(1.0)) * acc;
=======
acc = sqrt (pow (kc(1,0), 2.0) - pow (kval (), 2.0));
acc = 20 * log10 (exp (1.0)) * acc;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return acc;
}
@ -143,11 +171,19 @@ double rectwaveguide::alphad()
double k, beta;
double ad;
<<<<<<< HEAD
k = kval();
beta = sqrt(pow(k,2.) - pow(kc(1,0),2.0));
ad = (pow(k,2.0) * tand)/(2.0 * beta);
ad = ad * 20.0 * log10(exp(1.)); /* convert from Np/m to db/m */
=======
k = kval ();
beta = sqrt (pow (k, 2.0) - pow (kc (1,0), 2.0));
ad = (pow (k, 2.0) * tand) / (2.0 * beta);
ad = ad * 20.0 * log10 (exp (1.0)); /* convert from Np/m to db/m */
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return ad;
}
@ -186,7 +222,10 @@ void rectwaveguide::get_rectwaveguide_elec ()
ang_l = getProperty ("Ang_l", UNIT_ANG, ANG_RAD);
}
<<<<<<< HEAD
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
/*
* get_rectwaveguide_phys
* get and assign rectwaveguide physical parameters
@ -199,7 +238,10 @@ void rectwaveguide::get_rectwaveguide_phys ()
l = getProperty ("L", UNIT_LENGTH, LENGTH_M);
}
<<<<<<< HEAD
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
/*
* analyze - analysis function
*/
@ -218,6 +260,7 @@ void rectwaveguide::analyze ()
/* Get and assign physical parameters */
get_rectwaveguide_phys();
<<<<<<< HEAD
k = kval();
if (kc(1,0) <= k) {
@ -236,6 +279,25 @@ void rectwaveguide::analyze ()
er_eff = (1.0 - pow((fc(1,0)/f),2.0));
} else {
/*evanascent modes */
=======
k = kval ();
if (kc (1,0) <= k) {
/* propagating modes */
beta = sqrt (pow (k, 2.0) - pow (kc (1,0), 2.0));
lambda_g = 2.0 * M_PI / beta;
/* Z0 = (k * ZF0) / beta; */
Z0 = k * ZF0 / beta;
/* calculate electrical angle */
lambda_g = 2.0 * M_PI / beta;
ang_l = 2.0 * M_PI * l / lambda_g; /* in radians */
atten_cond = alphac () * l;
atten_dielectric = alphad () * l;
er_eff = (1.0 - pow ((fc (1,0) / f), 2.0));
} else {
/* evanascent modes */
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Z0 = 0;
ang_l = 0;
er_eff = 0;

View File

@ -1,3 +1,78 @@
<<<<<<< HEAD
=======
2011-03-18 Stefan Jahn <stefan@lkcc.org>
* qucs.cpp (slotOpenContent): Allowing double click on .vhd files.
* schematic_file.cpp (saveSymbolCpp): Including terminal centers
into computation of the boundig box when exporting the C++ code
for the symbol.
* qucsdigilib.bat, qucsdigi.bat: Fixing digital simulation
scripts.
2011-03-10 Stefan Jahn <stefan@lkcc.org>
* dialogs/settingsdialog.cpp (SettingsDialog): Fixed position of
data display and dataset input text fields.
2011-03-09 Stefan Jahn <stefan@lkcc.org>
* diagrams/graph.cpp (getSelected): Fixed out-of-bounds access for
diagrams with invalid (empty) graphs clicking into the diagram for
selecting.
2011-03-08 Stefan Jahn <stefan@lkcc.org>
* dialogs/settingsdialog.cpp (SettingsDialog): Added script
setting to simulations. The script can be enabled to be run after
simulation.
2011-03-07 Stefan Jahn <stefan@lkcc.org>
* qucs.cpp (slotFileSettings), textdoc.cpp (createPopupMenu):
Disabling document settings dialog for Octave files.
2011-03-06 Stefan Jahn <stefan@lkcc.org>
* qucs_de.ts: Updated German translations.
2011-03-05 Stefan Jahn <stefan@lkcc.org>
* schematic_file.cpp (saveSymbolCpp): Fixed bounding box
calculation for generated C++ symbol code.
* syntax.cpp: Added syntax highlighting for Octave files.
2011-03-04 Stefan Jahn <stefan@lkcc.org>
* qucs.cpp (openProject): When changing projects, also change
Octave current directory.
* octave/getQucsVariable.m, octave/showQucsDataSet.m,
octave/loadQucsDataSet.m: Added default scripts.
* octave_window.cpp (OctaveWindow): Setting fixed-width font for
Octave window. Adding Octave script path location for default
scripts.
* paintings/graphictext.cpp (saveCpp): Fixed text rotation of
generated Text() component.
2011-03-03 Stefan Jahn <stefan@lkcc.org>
* octave_window.cpp (startOctave): First implementation of
GNU Octave connection to qucs. Thank you very much Michael!
2011-03-01 Stefan Jahn <stefan@lkcc.org>
* qucs.cpp (QucsApp): Fixed usage for "qucs <filename>" on command
line.
* dialogs/simmessage.cpp (startSimulator): Avoid outputting file
names of library file include names into the netlist.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2010-04-14 Stefan Jahn <stefan@lkcc.org>
* schematic.cpp (setName): Handling schematic etc. filenames with

View File

@ -4,7 +4,11 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -22,7 +26,11 @@
# Boston, MA 02110-1301, USA.
#
<<<<<<< HEAD
SUBDIRS = bitmaps components diagrams paintings dialogs
=======
SUBDIRS = bitmaps components diagrams paintings dialogs octave
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if COND_WIN32
bin_SCRIPTS = qucsdigi.bat qucsveri.bat qucsdigilib.bat
@ -32,13 +40,21 @@ endif
bin_PROGRAMS = qucs
<<<<<<< HEAD
MOCHEADERS = qucs.h schematic.h textdoc.h
=======
MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
qucs_SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \
qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \
viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \
<<<<<<< HEAD
schematic_file.cpp syntax.cpp module.cpp
=======
schematic_file.cpp syntax.cpp module.cpp octave_window.cpp
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
nodist_qucs_SOURCES = $(MOCFILES)

View File

@ -4,7 +4,11 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -53,7 +57,11 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
dmux4to16.png ha1b.png fa1b.png fa2b.png pad2bit.png pad3bit.png \
pad4bit.png binarytogrey4bit.png greytobinary4bit.png comp_1bit.png \
comp_2bit.png comp_4bit.png hpribin4bit.png msrstub.png phototransistor.png \
<<<<<<< HEAD
rlcg.png nigbt.png
=======
rlcg.png nigbt.png hybrid.png ctline.png tunneldiode.png
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
# toolbar pictures
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \

BIN
qucs/bitmaps/ctline.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

BIN
qucs/bitmaps/hybrid.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

View File

@ -1,3 +1,24 @@
<<<<<<< HEAD
=======
2011-04-05 Stefan Jahn <stefan@lkcc.org>
* component.cpp (getComponentFromName): Fixing wrong rotation /
mirror bug of SPICE file components.
2011-03-12 Stefan Jahn <stefan@lkcc.org>
* hicumL0V1p3.cpp (hicumL0V1p3): Added new HICUM/L0 v1.3 model.
2011-03-11 Stefan Jahn <stefan@lkcc.org>
* ctline.cpp (CoupledTLine): Ideal coupled transmission line
added.
* hybrid.cpp (Hybrid): New hybrid model added.
* tunneldiode.cpp (TunnelDiode): Added tunnel diode model.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2010-10-23 Stefan Jahn <stefan@lkcc.org>
* hicumL0V1p2g.cpp (hicumL0V1p2g): Added new HICUM/L0 v1.2g model.

View File

@ -4,7 +4,11 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2007, 2008, 2009, 2010 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -57,7 +61,11 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
pad2bit.cpp pad3bit.cpp pad4bit.cpp binarytogrey4bit.cpp vafile.cpp \
greytobinary4bit.cpp comp_1bit.cpp comp_2bit.cpp comp_4bit.cpp \
hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \
<<<<<<< HEAD
hicumL0V1p2g.cpp
=======
hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
nodist_libcomponents_a_SOURCES = $(MOCFILES)
@ -85,7 +93,12 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
andor4x4.h dmux2to4.h dmux3to8.h dmux4to16.h ha1b.h fa1b.h fa2b.h pad2bit.h \
pad3bit.h pad4bit.h binarytogrey4bit.h greytobinary4bit.h comp_1bit.h \
comp_2bit.h comp_4bit.h hpribin4bit.h msrstub.h phototransistor.h nigbt.h \
<<<<<<< HEAD
vafile.h hicumL2V2p24.h hicumL0V1p2g.h
=======
vafile.h hicumL2V2p24.h hicumL0V1p2g.h hybrid.h ctline.h tunneldiode.h \
hicumL0V1p3.h
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs

View File

@ -1522,6 +1522,10 @@ Component* getComponentFromName(QString& Line)
cstr.remove (0,1); // remove leading "<"
if (cstr == "Lib") c = new LibComp ();
else if (cstr == "Eqn") c = new Equation ();
<<<<<<< HEAD
=======
else if (cstr == "SPICE") c = new SpiceFile();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else if (cstr == "Rus") c = new Resistor (false); // backward compatible
else if (cstr.left (6) == "SPfile" && cstr != "SPfile") {
// backward compatible

View File

@ -56,6 +56,10 @@
#include "vcvs.h"
#include "ccvs.h"
#include "tline.h"
<<<<<<< HEAD
=======
#include "ctline.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "tline_4port.h"
#include "twistedpair.h"
#include "coaxialline.h"
@ -87,6 +91,10 @@
#include "mosfet.h"
#include "mosfet_sub.h"
#include "eqndefined.h"
<<<<<<< HEAD
=======
#include "tunneldiode.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "dc_sim.h"
#include "ac_sim.h"
#include "tr_sim.h"
@ -110,6 +118,10 @@
#include "mutual.h"
#include "mutual2.h"
#include "coupler.h"
<<<<<<< HEAD
=======
#include "hybrid.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "switch.h"
#include "relais.h"
#include "am_modulator.h"
@ -146,6 +158,10 @@
#include "EKV26MOS.h"
#include "hicumL0V1p2.h"
#include "hicumL0V1p2g.h"
<<<<<<< HEAD
=======
#include "hicumL0V1p3.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "hicumL2V2p23.h"
#include "hicumL2V2p24.h"
#include "photodiode.h"

View File

@ -0,0 +1,86 @@
/***************************************************************************
copyright : (C) 2010 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "ctline.h"
CoupledTLine::CoupledTLine()
{
Description = QObject::tr("coupled transmission lines");
Arcs.append(new Arc(-28,-40, 18, 38,16*232, 16*33,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc(-28, 2, 18, 38, 16*95, 16*33,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-20,-2,-16,-2,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-20, 2,-16, 2,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc( 10,-40, 18, 38,16*270, 16*40,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc( 10, 2, 18, 38, 16*50, 16*40,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc(-38,-10, 16, 28, 16*45, 16*45,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc(-38,-18, 16, 28,16*270, 16*45,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc( 22,-10, 16, 28, 16*90, 16*45,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc( 22,-18, 16, 28,16*225, 16*45,QPen(Qt::darkBlue,2)));
// shield
Arcs.append(new Arc(-20, -9, 8, 18, 0, 16*360,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc( 11, -9, 8, 18,16*270, 16*180,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-16, -9, 16, -9,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-16, 9, 16, 9,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30,-10));
Ports.append(new Port( 30,-10));
Ports.append(new Port( 30, 10));
Ports.append(new Port(-30, 10));
x1 = -30; y1 =-12;
x2 = 30; y2 = 12;
tx = x1+4;
ty = y2+4;
Model = "CTLIN";
Name = "Line";
Props.append(new Property("Ze", "50 Ohm", true,
QObject::tr("characteristic impedance of even mode")));
Props.append(new Property("Zo", "50 Ohm", true,
QObject::tr("characteristic impedance of odd mode")));
Props.append(new Property("L", "1 mm", true,
QObject::tr("electrical length of the line")));
Props.append(new Property("Ere", "1", false,
QObject::tr("relative dielectric constant of even mode")));
Props.append(new Property("Ero", "1", false,
QObject::tr("relative dielectric constant of odd mode")));
Props.append(new Property("Ae", "0 dB", false,
QObject::tr("attenuation factor per length of even mode")));
Props.append(new Property("Ao", "0 dB", false,
QObject::tr("attenuation factor per length of odd mode")));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("simulation temperature in degree Celsius")));
}
// -------------------------------------------------------------------
Component* CoupledTLine::newOne()
{
return new CoupledTLine();
}
Element* CoupledTLine::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Coupled Transmission Line");
BitmapFile = (char *) "ctline";
if(getNewOne) return new CoupledTLine();
return 0;
}

27
qucs/components/ctline.h Normal file
View File

@ -0,0 +1,27 @@
/***************************************************************************
copyright : (C) 2010 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef CTLINE_H
#define CTLINE_H
#include "component.h"
class CoupledTLine : public Component {
public:
CoupledTLine();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -0,0 +1,401 @@
/*
* hicumL0V1p3.cpp - device implementations for hicumL0V1p3 module
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
*/
#include "node.h"
#include "hicumL0V1p3.h"
hicumL0V1p3::hicumL0V1p3()
{
Description = QObject::tr ("HICUM Level 0 v1.3 verilog device");
Props.append (new Property ("Type", "npn", true,
QObject::tr ("polarity") + " [npn, pnp]"));
Props.append (new Property ("is", "1.0e-16", false,
QObject::tr ("(Modified) saturation current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("it_mod", "0", false,
QObject::tr ("Flag for using third order solution for transfer current")));
Props.append (new Property ("mcf", "1.00", false,
QObject::tr ("Non-ideality coefficient of forward collector current")));
Props.append (new Property ("mcr", "1.00", false,
QObject::tr ("Non-ideality coefficient of reverse collector current")));
Props.append (new Property ("vef", "1.0e6", false,
QObject::tr ("forward Early voltage (normalization volt.)")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("ver", "1.0e6", false,
QObject::tr ("reverse Early voltage (normalization volt.)")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("aver", "0.0", false,
QObject::tr ("bias dependence for reverse Early voltage")));
Props.append (new Property ("iqf", "1.0e6", false,
QObject::tr ("forward d.c. high-injection roll-off current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("fiqf", "0", false,
QObject::tr ("flag for turning on base related critical current")));
Props.append (new Property ("iqr", "1.0e6", false,
QObject::tr ("inverse d.c. high-injection roll-off current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("iqfh", "1.0e6", false,
QObject::tr ("high-injection correction current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("tfh", "0.0", false,
QObject::tr ("high-injection correction factor")));
Props.append (new Property ("ahq", "0", false,
QObject::tr ("Smoothing factor for the d.c. injection width")));
Props.append (new Property ("ibes", "1e-18", false,
QObject::tr ("BE saturation current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("mbe", "1.0", false,
QObject::tr ("BE non-ideality factor")));
Props.append (new Property ("ires", "0.0", false,
QObject::tr ("BE recombination saturation current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("mre", "2.0", false,
QObject::tr ("BE recombination non-ideality factor")));
Props.append (new Property ("ibcs", "0.0", false,
QObject::tr ("BC saturation current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("mbc", "1.0", false,
QObject::tr ("BC non-ideality factor")));
Props.append (new Property ("cje0", "1.0e-20", false,
QObject::tr ("Zero-bias BE depletion capacitance")
+" ("+QObject::tr ("F")+")"));
Props.append (new Property ("vde", "0.9", false,
QObject::tr ("BE built-in voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("ze", "0.5", false,
QObject::tr ("BE exponent factor")));
Props.append (new Property ("aje", "2.5", false,
QObject::tr ("Ratio of maximum to zero-bias value")));
Props.append (new Property ("vdedc", "0.9", false,
QObject::tr ("BE charge built-in voltage for d.c. transfer current")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("zedc", "0.5", false,
QObject::tr ("charge BE exponent factor for d.c. transfer current")));
Props.append (new Property ("ajedc", "2.5", false,
QObject::tr ("BE capacitance ratio (maximum to zero-bias value) for d.c. transfer current")));
Props.append (new Property ("t0", "0.0", false,
QObject::tr ("low current transit time at Vbici=0")
+" ("+QObject::tr ("s")+")"));
Props.append (new Property ("dt0h", "0.0", false,
QObject::tr ("Base width modulation contribution")
+" ("+QObject::tr ("s")+")"));
Props.append (new Property ("tbvl", "0.0", false,
QObject::tr ("SCR width modulation contribution")
+" ("+QObject::tr ("s")+")"));
Props.append (new Property ("tef0", "0.0", false,
QObject::tr ("Storage time in neutral emitter")
+" ("+QObject::tr ("s")+")"));
Props.append (new Property ("gte", "1.0", false,
QObject::tr ("Exponent factor for emitter transit time")));
Props.append (new Property ("thcs", "0.0", false,
QObject::tr ("Saturation time at high current densities")
+" ("+QObject::tr ("s")+")"));
Props.append (new Property ("ahc", "0.1", false,
QObject::tr ("Smoothing factor for current dependence")));
Props.append (new Property ("tr", "0.0", false,
QObject::tr ("Storage time at inverse operation")
+" ("+QObject::tr ("s")+")"));
Props.append (new Property ("rci0", "150", false,
QObject::tr ("Low-field collector resistance under emitter")
+" ("+QObject::tr ("Ohm")+")"));
Props.append (new Property ("vlim", "0.5", false,
QObject::tr ("Voltage dividing ohmic and satur.region")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("vpt", "100", false,
QObject::tr ("Punch-through voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("vces", "0.1", false,
QObject::tr ("Saturation voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("cjci0", "1.0e-20", false,
QObject::tr ("Total zero-bias BC depletion capacitance")
+" ("+QObject::tr ("F")+")"));
Props.append (new Property ("vdci", "0.7", false,
QObject::tr ("BC built-in voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("zci", "0.333", false,
QObject::tr ("BC exponent factor")));
Props.append (new Property ("vptci", "100", false,
QObject::tr ("Punch-through voltage of BC junction")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("cjcx0", "1.0e-20", false,
QObject::tr ("Zero-bias external BC depletion capacitance")
+" ("+QObject::tr ("F")+")"));
Props.append (new Property ("vdcx", "0.7", false,
QObject::tr ("External BC built-in voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("zcx", "0.333", false,
QObject::tr ("External BC exponent factor")));
Props.append (new Property ("vptcx", "100", false,
QObject::tr ("Punch-through voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("fbc", "1.0", false,
QObject::tr ("Split factor = Cjci0/Cjc0")));
Props.append (new Property ("rbi0", "0.0", false,
QObject::tr ("Internal base resistance at zero-bias")
+" ("+QObject::tr ("Ohm")+")"));
Props.append (new Property ("vr0e", "2.5", false,
QObject::tr ("forward Early voltage (normalization volt.)")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("vr0c", "1.0e6", false,
QObject::tr ("forward Early voltage (normalization volt.)")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("fgeo", "0.656", false,
QObject::tr ("Geometry factor")));
Props.append (new Property ("rbx", "0.0", false,
QObject::tr ("External base series resistance")
+" ("+QObject::tr ("Ohm")+")"));
Props.append (new Property ("rcx", "0.0", false,
QObject::tr ("Emitter series resistance")
+" ("+QObject::tr ("Ohm")+")"));
Props.append (new Property ("re", "0.0", false,
QObject::tr ("External collector series resistance")
+" ("+QObject::tr ("Ohm")+")"));
Props.append (new Property ("itss", "0.0", false,
QObject::tr ("Substrate transistor transfer saturation current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("msf", "1.0", false,
QObject::tr ("Substrate transistor transfer current non-ideality factor")));
Props.append (new Property ("iscs", "0.0", false,
QObject::tr ("SC saturation current")
+" ("+QObject::tr ("A")+")"));
Props.append (new Property ("msc", "1.0", false,
QObject::tr ("SC non-ideality factor")));
Props.append (new Property ("cjs0", "1.0e-20", false,
QObject::tr ("Zero-bias SC depletion capacitance")
+" ("+QObject::tr ("F")+")"));
Props.append (new Property ("vds", "0.3", false,
QObject::tr ("SC built-in voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("zs", "0.3", false,
QObject::tr ("External SC exponent factor")));
Props.append (new Property ("vpts", "100", false,
QObject::tr ("SC punch-through voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("cbcpar", "0.0", false,
QObject::tr ("Collector-base isolation (overlap) capacitance")
+" ("+QObject::tr ("F")+")"));
Props.append (new Property ("cbepar", "0.0", false,
QObject::tr ("Emitter-base oxide capacitance")
+" ("+QObject::tr ("F")+")"));
Props.append (new Property ("eavl", "0.0", false,
QObject::tr ("Exponent factor")));
Props.append (new Property ("kavl", "0.0", false,
QObject::tr ("Prefactor")));
Props.append (new Property ("kf", "0.0", false,
QObject::tr ("flicker noise coefficient")
+" ("+QObject::tr ("M^(1-AF)")+")"));
Props.append (new Property ("af", "2.0", false,
QObject::tr ("flicker noise exponent factor")));
Props.append (new Property ("vgb", "1.2", false,
QObject::tr ("Bandgap-voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("vge", "1.17", false,
QObject::tr ("Effective emitter bandgap-voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("vgc", "1.17", false,
QObject::tr ("Effective collector bandgap-voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("vgs", "1.17", false,
QObject::tr ("Effective substrate bandgap-voltage")
+" ("+QObject::tr ("V")+")"));
Props.append (new Property ("f1vg", "-1.02377e-4", false,
QObject::tr ("Coefficient K1 in T-dependent bandgap equation")
+" ("+QObject::tr ("V/K")+")"));
Props.append (new Property ("f2vg", "4.3215e-4", false,
QObject::tr ("Coefficient K2 in T-dependent bandgap equation")
+" ("+QObject::tr ("V/K")+")"));
Props.append (new Property ("alt0", "0.0", false,
QObject::tr ("Frist-order TC of tf0")
+" ("+QObject::tr ("1/K")+")"));
Props.append (new Property ("kt0", "0.0", false,
QObject::tr ("Second-order TC of tf0")
+" ("+QObject::tr ("1/K^2")+")"));
Props.append (new Property ("zetact", "3.0", false,
QObject::tr ("Exponent coefficient in transfer current temperature dependence")));
Props.append (new Property ("zetabet", "3.5", false,
QObject::tr ("Exponent coefficient in BE junction current temperature dependence")));
Props.append (new Property ("zetaci", "0.0", false,
QObject::tr ("TC of epi-collector diffusivity")));
Props.append (new Property ("alvs", "0.0", false,
QObject::tr ("Relative TC of satur.drift velocity")
+" ("+QObject::tr ("1/K")+")"));
Props.append (new Property ("alces", "0.0", false,
QObject::tr ("Relative TC of vces")
+" ("+QObject::tr ("1/K")+")"));
Props.append (new Property ("zetarbi", "0.0", false,
QObject::tr ("TC of internal base resistance")));
Props.append (new Property ("zetarbx", "0.0", false,
QObject::tr ("TC of external base resistance")));
Props.append (new Property ("zetarcx", "0.0", false,
QObject::tr ("TC of external collector resistance")));
Props.append (new Property ("zetare", "0.0", false,
QObject::tr ("TC of emitter resistances")));
Props.append (new Property ("zetaiqf", "0.0", false,
QObject::tr ("TC of iqf")));
Props.append (new Property ("alkav", "0.0", false,
QObject::tr ("TC of avalanche prefactor")
+" ("+QObject::tr ("1/K")+")"));
Props.append (new Property ("aleav", "0.0", false,
QObject::tr ("TC of avalanche exponential factor")
+" ("+QObject::tr ("1/K")+")"));
Props.append (new Property ("zetarth", "0.0", false,
QObject::tr ("Exponent factor for temperature dependent thermal resistance")));
Props.append (new Property ("tef_temp", "1", false,
QObject::tr ("Flag for turning temperature dependence of tef0 on and off")));
Props.append (new Property ("zetaver", "-1.0", false,
QObject::tr ("TC of Reverse Early voltage")));
Props.append (new Property ("zetavgbe", "1.0", false,
QObject::tr ("TC of AVER")));
Props.append (new Property ("dvgbe", "0.0", false,
QObject::tr ("Bandgap difference between base and BE-junction")));
Props.append (new Property ("aliqfh", "0", false,
QObject::tr ("Frist-order TC of iqfh")
+" ("+QObject::tr ("1/K")+")"));
Props.append (new Property ("kiqfh", "0", false,
QObject::tr ("Second-order TC of iqfh")
+" ("+QObject::tr ("1/K^2")+")"));
Props.append (new Property ("flsh", "0", false,
QObject::tr ("Flag for self-heating calculation")));
Props.append (new Property ("rth", "0.0", false,
QObject::tr ("Thermal resistance")
+" ("+QObject::tr ("K/W")+")"));
Props.append (new Property ("cth", "0.0", false,
QObject::tr ("Thermal capacitance")
+" ("+QObject::tr ("Ws/K")+")"));
Props.append (new Property ("tnom", "27", false,
QObject::tr ("Temperature for which parameters are valid")
+" ("+QObject::tr ("C")+")"));
Props.append (new Property ("dt", "0.0", false,
QObject::tr ("Temperature change for particular transistor")
+" ("+QObject::tr ("K")+")"));
Props.append (new Property ("Temp", "27", false,
QObject::tr ("simulation temperature")));
createSymbol ();
tx = x2 + 4;
ty = y1 + 4;
Model = "hicumL0V1p3";
Name = "T";
}
Component * hicumL0V1p3::newOne()
{
hicumL0V1p3 * p = new hicumL0V1p3();
p->Props.getFirst()->Value = Props.getFirst()->Value;
p->recreate(0);
return p;
}
Element * hicumL0V1p3::info(QString& Name, char * &BitmapFile, bool getNewOne)
{
Name = QObject::tr("npn HICUM L0 v1.3");
BitmapFile = (char *) "pnpsub_therm";
if(getNewOne) return new hicumL0V1p3();
return 0;
}
Element * hicumL0V1p3::info_pnp(QString& Name, char * &BitmapFile, bool getNewOne)
{
Name = QObject::tr("pnp HICUM L0 v1.3");
BitmapFile = (char *) "pnpsub_therm";
if(getNewOne)
{
hicumL0V1p3* p = new hicumL0V1p3();
p->Props.getFirst()->Value = "pnp";
p->recreate(0);
return p;
}
return 0;
}
void hicumL0V1p3::createSymbol()
{
// normal bipolar
Lines.append(new Line(-10,-15,-10, 15,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, 0,-10, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, -5, 0,-15,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0,-15, 0,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 5, 0, 15,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 15, 0, 30,QPen(QPen::darkBlue,2)));
// substrate node
Lines.append(new Line( 9, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 9, -7, 9, 7,QPen(QPen::darkBlue,3)));
// thermal node
Lines.append(new Line(-30, 20,-20, 20,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20, 17,-20, 23,QPen(QPen::darkBlue,2)));
// arrow
if(Props.getFirst()->Value == "npn") {
Lines.append(new Line( -6, 15, 0, 15,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 9, 0, 15,QPen(QPen::darkBlue,2)));
} else {
Lines.append(new Line( -5, 10, -5, 16,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -5, 10, 1, 10,QPen(QPen::darkBlue,2)));
}
// H
Lines.append(new Line(-30,-30,-30,-24,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-30,-27,-26,-27,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-26,-30,-26,-24,QPen(QPen::darkBlue,1)));
// I
Lines.append(new Line(-24,-30,-24,-24,QPen(QPen::darkBlue,1)));
// C
Lines.append(new Line(-22,-30,-22,-24,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-22,-30,-19,-30,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-22,-24,-19,-24,QPen(QPen::darkBlue,1)));
// U
Lines.append(new Line(-17,-30,-17,-24,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-14,-30,-14,-24,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-17,-24,-14,-24,QPen(QPen::darkBlue,1)));
// M
Lines.append(new Line(-12,-30,-12,-24,QPen(QPen::darkBlue,1)));
Lines.append(new Line( -8,-30, -8,-24,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-12,-30,-10,-28,QPen(QPen::darkBlue,1)));
Lines.append(new Line( -8,-30,-10,-28,QPen(QPen::darkBlue,1)));
// terminal definitions
Ports.append(new Port( 0,-30)); // collector
Ports.append(new Port(-30, 0)); // base
Ports.append(new Port( 0, 30)); // emitter
Ports.append(new Port( 30, 0)); // substrate
Ports.append(new Port(-30, 20)); // thermal node
// relative boundings
x1 = -30; y1 = -30;
x2 = 30; y2 = 30;
}
QString hicumL0V1p3::netlist()
{
QString s = "hicumL0V1p3:"+Name;
// output all node names
for(Port *p1 = Ports.first(); p1 != 0; p1 = Ports.next())
s += " "+p1->Connection->Name; // node names
// output type npn/pnp property
Property *p2 = Props.first();
if(p2->Value == "npn")
s += " npn=\"1\"";
else
s += " pnp=\"1\"";
// output all remaining properties
for(p2 = Props.next(); p2 != 0; p2 = Props.next())
s += " "+p2->Name+"=\""+p2->Value+"\"";
return s + '\n';
}

View File

@ -0,0 +1,29 @@
/*
* hicumL0V1p3.h - device definitions for hicumL0V1p3 module
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
*/
#ifndef hicumL0V1p3_H
#define hicumL0V1p3_H
#include "component.h"
class hicumL0V1p3 : public MultiViewComponent
{
public:
hicumL0V1p3();
~hicumL0V1p3() { };
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
static Element* info_pnp(QString&, char* &, bool getNewOne=false);
protected:
void createSymbol();
QString netlist();
};
#endif /* hicumL0V1p3_H */

View File

@ -0,0 +1,74 @@
/***************************************************************************
copyright : (C) 2010 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "hybrid.h"
Hybrid::Hybrid()
{
Description = QObject::tr("hybrid (unsymmetrical 3dB coupler)");
Lines.append(new Line(-14,-14, 14,-14,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-14, 14, 14, 14,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-14,-14,-14, 14,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 14,-14, 14, 14,QPen(Qt::darkBlue,2)));
Arcs.append(new Arc(-28,-28, 28, 28, 16*270, 16*90,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc( 0,-28, 28, 28, 16*180, 16*90,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc(-28, 0, 28, 28, 0, 16*90,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc( 0, 0, 28, 28, 16*90, 16*90,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc(-11,-11, 4, 6, 0, 16*360,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc(-11, 5, 4, 6, 0, 16*360,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc( 6,-11, 4, 6, 0, 16*360,QPen(Qt::darkBlue,1)));
Arcs.append(new Arc( 6, 5, 4, 6, 0, 16*360,QPen(Qt::darkBlue,1)));
Lines.append(new Line( 8, -12, 8, -4,QPen(Qt::darkBlue,1)));
Lines.append(new Line(-30, 0,-14, 0,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 14, 0, 30, 0,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 0,-30, 0,-14,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 0, 14, 0, 30,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
Ports.append(new Port( 0, 30));
Ports.append(new Port( 0,-30));
x1 = -30; y1 = -30;
x2 = 30; y2 = 30;
tx = x1+4;
ty = y2+4;
Model = "Hybrid";
Name = "X";
Props.append(new Property("phi", "90", true,
QObject::tr("phase shift in degree")));
Props.append(new Property("Zref", "50 Ohm", false,
QObject::tr("reference impedance")));
}
// -------------------------------------------------------------------
Component* Hybrid::newOne()
{
return new Hybrid();
}
Element* Hybrid::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Hybrid");
BitmapFile = (char *) "hybrid";
if(getNewOne) return new Hybrid();
return 0;
}

27
qucs/components/hybrid.h Normal file
View File

@ -0,0 +1,27 @@
/***************************************************************************
copyright : (C) 2010 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef HYBRID_H
#define HYBRID_H
#include "component.h"
class Hybrid : public Component {
public:
Hybrid();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -1,7 +1,11 @@
#
# qucs/components/libcomponents.ap - Autodsp input file.
#
<<<<<<< HEAD
# Copyright (C) 2005-2010 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2005-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -54,7 +58,11 @@ SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
pad2bit.cpp pad3bit.cpp pad4bit.cpp binarytogrey4bit.cpp vafile.cpp \
greytobinary4bit.cpp comp_1bit.cpp comp_2bit.cpp comp_4bit.cpp \
hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \
<<<<<<< HEAD
hicumL0V1p2g.cpp
=======
hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
# List of special Qt files.
MOCHEADERS = componentdialog.h spicedialog.h optimizedialog.h spicefile.h

View File

@ -20,7 +20,11 @@
MSlange::MSlange()
{
<<<<<<< HEAD
Description = QObject::tr("microchip lange coupler");
=======
Description = QObject::tr("microstrip lange coupler");
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Lines.append(new Line(-30,-30,-30, 10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 20,QPen(QPen::darkBlue,2)));

View File

@ -0,0 +1,89 @@
/***************************************************************************
copyright : (C) 2008 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "tunneldiode.h"
TunnelDiode::TunnelDiode()
{
Description = QObject::tr("resonance tunnel diode");
Props.append(new Property("Ip", "4 mA", true,
QObject::tr("peak current")));
Props.append(new Property("Iv", "0.6 mA", true,
QObject::tr("valley current")));
Props.append(new Property("Vv", "0.8 V", true,
QObject::tr("valley voltage")));
Props.append(new Property("Wr", "2.7e-20", false,
QObject::tr("resonance energy in Ws")));
Props.append(new Property("eta", "1e-20", false,
QObject::tr("Fermi energy in Ws")));
Props.append(new Property("dW", "4.5e-21", false,
QObject::tr("resonance width in Ws")));
Props.append(new Property("Tmax", "0.95", false,
QObject::tr("maximum of transmission")));
Props.append(new Property("de", "0.9", false,
QObject::tr("fitting factor for electron density")));
Props.append(new Property("dv", "2.0", false,
QObject::tr("fitting factor for voltage drop")));
Props.append(new Property("nv", "16", false,
QObject::tr("fitting factor for diode current")));
Props.append(new Property("Cj0", "80 fF", false,
QObject::tr("zero-bias depletion capacitance")));
Props.append(new Property("M", "0.5", false,
QObject::tr("grading coefficient")));
Props.append(new Property("Vj", "0.5 V", false,
QObject::tr("junction potential")));
Props.append(new Property("te", "0.6 ps", false,
QObject::tr("life-time of electrons")));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("simulation temperature in degree Celsius")));
Props.append(new Property("Area", "1.0", false,
QObject::tr("default area for diode")));
Lines.append(new Line(-30, 0,-12, 0,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 12, 0, 30, 0,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-12, -9,-12, 9,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 0, -9, 0, 9,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 12, -9, 12, 9,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-12, -9, 12, 9,QPen(Qt::darkBlue,2)));
Lines.append(new Line(-12, 9, 12, -9,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
x1 = -30; y1 = -11;
x2 = 30; y2 = 11;
tx = x1+4;
ty = y2+4;
Model = "RTD";
Name = "D";
}
// -------------------------------------------------------------------
Component* TunnelDiode::newOne()
{
return new TunnelDiode();
}
Element* TunnelDiode::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Tunnel Diode");
BitmapFile = (char *) "tunneldiode";
if(getNewOne) return new TunnelDiode();
return 0;
}

View File

@ -0,0 +1,27 @@
/***************************************************************************
copyright : (C) 2008 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef TUNNELDIODE_H
#define TUNNELDIODE_H
#include "component.h"
class TunnelDiode : public Component {
public:
TunnelDiode();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -159,13 +159,20 @@ int Graph::getSelected(int x, int y)
if(*pp <= BRANCHEND) z++;
pp++;
if(*pp <= BRANCHEND) {
<<<<<<< HEAD
=======
if(*pp <= GRAPHEND) return -1; // not even one point ?
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
z++;
pp++;
if(*pp < BRANCHEND) return -1; // not even one point ?
}
}
<<<<<<< HEAD
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Style >= GRAPHSTYLE_STAR) {
// for graph symbols
while(*pp > GRAPHEND) {
@ -184,12 +191,18 @@ int Graph::getSelected(int x, int y)
pp++;
}
}
<<<<<<< HEAD
return -1;
}
=======
return -1;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// for graph lines
while(*pp > GRAPHEND) {
while(*pp >= STROKEEND) {

View File

@ -48,6 +48,7 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
// ...........................................................
QWidget *Tab1 = new QWidget(t);
<<<<<<< HEAD
QGridLayout *gp = new QGridLayout(Tab1,4,2,5,5);
QLabel *l1 = new QLabel(tr("Data Display:"), Tab1);
@ -59,11 +60,36 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
gp->addWidget(l2,1,0);
Input_DataSet = new QLineEdit(Tab1);
gp->addWidget(Input_DataSet,1,1);
=======
QGridLayout *gp = new QGridLayout(Tab1,6,2,5,5);
QLabel *l1 = new QLabel(tr("Data Display:"), Tab1);
gp->addWidget(l1,1,0);
Input_DataDisplay = new QLineEdit(Tab1);
gp->addWidget(Input_DataDisplay,1,1);
QLabel *l2 = new QLabel(tr("Data Set:"), Tab1);
gp->addWidget(l2,0,0);
Input_DataSet = new QLineEdit(Tab1);
gp->addWidget(Input_DataSet,0,1);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Check_OpenDpl = new QCheckBox(tr("open data display after simulation"),
Tab1);
gp->addMultiCellWidget(Check_OpenDpl,2,2,0,1);
<<<<<<< HEAD
=======
QLabel *l20 = new QLabel(tr("Octave Script:"), Tab1);
gp->addWidget(l20,3,0);
Input_Script = new QLineEdit(Tab1);
gp->addWidget(Input_Script,3,1);
Check_RunScript = new QCheckBox(tr("run script after simulation"),
Tab1);
gp->addMultiCellWidget(Check_RunScript,4,4,0,1);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
t->addTab(Tab1, tr("Simulation"));
// ...........................................................
@ -139,7 +165,13 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
Input_DataSet->setText(Doc->DataSet);
Input_DataDisplay->setText(Doc->DataDisplay);
<<<<<<< HEAD
Check_OpenDpl->setChecked(Doc->SimOpenDpl);
=======
Input_Script->setText(Doc->Script);
Check_OpenDpl->setChecked(Doc->SimOpenDpl);
Check_RunScript->setChecked(Doc->SimRunScript);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Check_GridOn->setChecked(Doc->GridOn);
Input_GridX->setText(QString::number(Doc->GridX));
Input_GridY->setText(QString::number(Doc->GridY));
@ -186,11 +218,27 @@ void SettingsDialog::slotApply()
changed = true;
}
<<<<<<< HEAD
=======
if(Doc->Script != Input_Script->text()) {
Doc->Script = Input_Script->text();
changed = true;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Doc->SimOpenDpl != Check_OpenDpl->isChecked()) {
Doc->SimOpenDpl = Check_OpenDpl->isChecked();
changed = true;
}
<<<<<<< HEAD
=======
if(Doc->SimRunScript != Check_RunScript->isChecked()) {
Doc->SimRunScript = Check_RunScript->isChecked();
changed = true;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Doc->GridOn != Check_GridOn->isChecked()) {
Doc->GridOn = Check_GridOn->isChecked();
changed = true;

View File

@ -45,9 +45,15 @@ public:
QComboBox *Combo_Frame;
QTextEdit *Input_Frame0;
QLineEdit *Input_Frame1, *Input_Frame2, *Input_Frame3;
<<<<<<< HEAD
QLineEdit *Input_DataSet, *Input_DataDisplay;
QLineEdit *Input_GridX, *Input_GridY;
QCheckBox *Check_OpenDpl, *Check_GridOn;
=======
QLineEdit *Input_DataSet, *Input_DataDisplay, *Input_Script;
QLineEdit *Input_GridX, *Input_GridY;
QCheckBox *Check_OpenDpl, *Check_GridOn, *Check_RunScript;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QVBoxLayout *all;
QRegExpValidator *valExpr;

View File

@ -51,11 +51,19 @@ SimMessage::SimMessage(QWidget *w, QWidget *parent)
DocName = Doc->DocName;
DataDisplay = Doc->DataDisplay;
<<<<<<< HEAD
=======
Script = Doc->Script;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QFileInfo Info(DocName);
DataSet = QDir::convertSeparators(Info.dirPath()) +
QDir::separator() + Doc->DataSet;
showBias = Doc->showBias; // save some settings as the document...
SimOpenDpl = Doc->SimOpenDpl; // ...could be closed during the simulation.
<<<<<<< HEAD
=======
SimRunScript = Doc->SimRunScript;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
all = new QVBoxLayout(this);
all->setSpacing(5);
@ -370,7 +378,14 @@ void SimMessage::startSimulator()
for(QStringList::Iterator it = Collect.begin();
it != Collect.end(); ++it) {
// don't put library includes into netlist...
<<<<<<< HEAD
if ((*it).right(4) != ".lst") {
=======
if ((*it).right(4) != ".lst" &&
(*it).right(5) != ".vhdl" &&
(*it).right(4) != ".vhd" &&
(*it).right(2) != ".v") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Stream << *it << '\n';
}
}

View File

@ -77,7 +77,12 @@ public:
QWidget *DocWidget;
int showBias;
bool SimOpenDpl;
<<<<<<< HEAD
QString DocName, DataSet, DataDisplay;
=======
bool SimRunScript;
QString DocName, DataSet, DataDisplay, Script;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QProcess SimProcess;
QTextEdit *ProgText, *ErrText;

View File

@ -560,11 +560,20 @@ int main(int argc, char *argv[])
QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
QucsSettings.LibDir =
QDir::convertSeparators (QucsDirStr + "/share/qucs/library/");
<<<<<<< HEAD
=======
QucsSettings.OctaveDir =
QDir::convertSeparators (QucsDirStr + "/share/qucs/octave/");
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
} else {
QucsSettings.BinDir = BINARYDIR;
QucsSettings.BitmapDir = BITMAPDIR;
QucsSettings.LangDir = LANGUAGEDIR;
QucsSettings.LibDir = LIBRARYDIR;
<<<<<<< HEAD
=======
QucsSettings.OctaveDir = OCTAVEDIR;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
QucsSettings.Editor = QucsSettings.BinDir + "qucsedit";

View File

@ -54,6 +54,10 @@ struct tQucsSettings {
QString LangDir;
QString LibDir;
QString AscoDir;
<<<<<<< HEAD
=======
QString OctaveDir;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
unsigned int NodeWiring;

View File

@ -184,6 +184,10 @@ void Module::registerModules (void) {
REGISTER_LUMPED_1 (Gyrator);
REGISTER_LUMPED_1 (Phaseshifter);
REGISTER_LUMPED_1 (Coupler);
<<<<<<< HEAD
=======
REGISTER_LUMPED_1 (Hybrid);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REGISTER_LUMPED_1 (iProbe);
REGISTER_LUMPED_1 (vProbe);
REGISTER_LUMPED_1 (Mutual);
@ -226,6 +230,10 @@ void Module::registerModules (void) {
// transmission lines
REGISTER_TRANS_1 (TLine);
REGISTER_TRANS_1 (TLine_4Port);
<<<<<<< HEAD
=======
REGISTER_TRANS_1 (CoupledTLine);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REGISTER_TRANS_1 (TwistedPair);
REGISTER_TRANS_1 (CoaxialLine);
REGISTER_TRANS_1 (RectLine);
@ -262,6 +270,10 @@ void Module::registerModules (void) {
REGISTER_NONLINEAR_1 (Diac);
REGISTER_NONLINEAR_1 (Triac);
REGISTER_NONLINEAR_1 (Thyristor);
<<<<<<< HEAD
=======
REGISTER_NONLINEAR_1 (TunnelDiode);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// verilog-a devices
REGISTER_VERILOGA_1 (hicumL2V2p1);
@ -275,6 +287,10 @@ void Module::registerModules (void) {
REGISTER_VERILOGA_2 (EKV26MOS, info, info_pmos);
REGISTER_VERILOGA_2 (hicumL0V1p2, info, info_pnp);
REGISTER_VERILOGA_2 (hicumL0V1p2g, info, info_pnp);
<<<<<<< HEAD
=======
REGISTER_VERILOGA_2 (hicumL0V1p3, info, info_pnp);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REGISTER_VERILOGA_1 (hicumL2V2p23);
REGISTER_VERILOGA_1 (hicumL2V2p24);
REGISTER_VERILOGA_1 (photodiode);

36
qucs/octave/Makefile.am Normal file
View File

@ -0,0 +1,36 @@
## Process this file with automake to produce Makefile.in
#
# qucs/octave/Makefile.am
#
# Automake input file.
#
# Copyright (C) 2011 Stefan Jahn <stefan@lkcc.org>
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this package; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# basic scripts
BASICS = getQucsVariable.m loadQucsDataSet.m showQucsDataSet.m \
loadQucsVariable.m
EXTRA_DIST = $(BASICS)
# installation of pictures
picdatadir = ${prefix}/share/qucs/octave
picdata_DATA = $(BASICS)
CLEANFILES = *~
MAINTAINERCLEANFILES = Makefile.in

View File

@ -0,0 +1,30 @@
% -*- texinfo -*-
% @deftypefn {Function File} {[@var{x}] =} getQucsVariable (@var{dataset}, @var{varname})
% Load the vector @var{x} from a Qucs dataset @var{dataset} with the variable name @var{varname}.
%
% Example
% @example
% [x] = getQucsVariable (data, "out.v")
% x =
% 1 + 0.5i
% 2 + 1.5i
% @end example
% @end deftypefn
% Copyright 2010 (C) 2010 by Eberhard Gamm <eberhard.gamm@gmx.de>
% Published under GNU General Public License (GPL V2). No warranty at all.
function data = getQucsVariable(dataSet,name)
% Get variable from data set
data = [];
if isempty(dataSet)
error('Data set is empty');
end
for i=1:numel(dataSet)
if strcmp(dataSet(i).name,name)
data = dataSet(i).data;
return;
end
end
error(['Variable ' name ' not found in data set']);

View File

@ -0,0 +1,82 @@
% -*- texinfo -*-
% @deftypefn {Function File} {[@var{data}] =} loadQucsDataSet (@var{filename})
% Loads the Qucs dataset from the Qucs dataset file @var{filename}.
% @end deftypefn
% Copyright 2010 (C) 2010 by Eberhard Gamm <eberhard.gamm@gmx.de>
% Published under GNU General Public License (GPL V2). No warranty at all.
function dataSet = loadQucsDataSet(dataSetFile)
% Load Qucs data set
dataSet = [];
fid = fopen(dataSetFile,'r');
if fid < 0
fprintf(1,'Data set %s not found\n',dataSetFile);
return;
end
error = 0;
idata = 0;
idx = 0;
while ~feof(fid) && ~error
line = fgetl(fid);
if ~ischar(line)
break;
end
if isempty(line)
break;
end
ll = length(line);
if line(1) == '<'
if strcmp(line(1:min(7,ll)),'<indep ')
[name,len,cnt] = sscanf(line(8:end-1),'%s %d','C');
if cnt ~= 2
fprintf(1,'Invalid independent variable in data set %s\n',dataSetFile);
error = 1;
break;
error
end
idx = idx + 1;
dataSet(idx).name = name;
dataSet(idx).nameDep = '-';
dataSet(idx).dep = 0;
dataSet(idx).data = zeros(1,10000);
idata = 1;
end
if strcmp(line(1:min(5,ll)),'<dep ')
[name,nameDep,cnt] = sscanf(line(6:end-1),'%s %s','C');
if cnt ~= 2
fprintf(1,'Invalid dependent variable in data set %s\n',dataSetFile);
error = 1;
break;
end
idx = idx + 1;
dataSet(idx).name = name;
dataSet(idx).nameDep = nameDep;
dataSet(idx).dep = 1;
dataSet(idx).data = zeros(1,10000);
idata = 1;
end
if strcmp(line(1:min(8,ll)),'</indep>') || strcmp(line(1:min(6,ll)),'</dep>')
dataSet(idx).data = dataSet(idx).data(1:idata-1);
dataSet(idx).len = idata - 1;
idata = 0;
end
else
if idata > 0
[val,cnt] = sscanf(line,'%f');
if cnt ~= 1
fprintf(1,'Invalid data in data set %s\n',dataSetFile);
error = 1;
break;
end
if idata > length(dataSet(idx).data)
dataSet(idx).data = [dataSet(idx).data zeros(1,10000)];
end
dataSet(idx).data(idata) = val;
idata = idata + 1;
end
end
end
fclose(fid);

View File

@ -0,0 +1,23 @@
% -*- texinfo -*-
% @deftypefn {Function File} {[@var{x}] =} loadQucsVariable (@var{filename}, @var{varname})
% Read the vector @var{x} from a Qucs dataset file @var{filename}.
% The variable name in the Qucs dataset must be named @var{varname}.
%
% Example
% @example
% [x] = loadQucsVariable ("actest.dat", "out.v")
% x =
% 1 + 0.5i
% 2 + 1.5i
% @end example
%
% @end deftypefn
% Script written with Octave 3.2.4
% Copyright 2010 by Michael Margraf (michael.margraf@alumni.tu-berlin.de)
% Published under GNU General Public License (GPL V2). No warranty at all.
function [x] = loadQucsVariable(filename, varName)
x = [];
data = loadQucsDataSet(filename);
x = getQucsVariable(data, varName);

View File

@ -0,0 +1,24 @@
% -*- texinfo -*-
% @deftypefn {Function File} showQucsDataSet (@var{dataset})
% Shows the content of the Qucs dataset @var{dataset}.
% @end deftypefn
% Copyright 2010 (C) 2010 by Eberhard Gamm <eberhard.gamm@gmx.de>
% Published under GNU General Public License (GPL V2). No warranty at all.
function showQucsDataSet(dataSet)
% Show contents of data set
if isempty(dataSet)
fprintf(1,'\nData set is empty.\n\n');
else
fprintf(1,'\nContents of data set:\n');
fprintf(1,'------------------------------------------------------------\n');
fprintf(1,'Variable Dependency Length\n');
fprintf(1,'------------------------------------------------------------\n');
for i = 1:length(dataSet)
fprintf(1,'%-24s %-24s %10d\n',dataSet(i).name,...
dataSet(i).nameDep,dataSet(i).len);
end
fprintf(1,'------------------------------------------------------------\n\n');
end

180
qucs/octave_window.cpp Normal file
View File

@ -0,0 +1,180 @@
/***************************************************************************
copyright : (C) 2010 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
#include "octave_window.h"
#include "main.h"
#include <qsize.h>
#include <qvbox.h>
#include <qcolor.h>
#include <qaccel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qtextedit.h>
#include <qdockwindow.h>
extern QDir QucsWorkDir; // current project path
OctaveWindow::OctaveWindow(QDockWindow *parent_): QWidget(parent_, 0)
{
QFont font;
font = QFont("Courier New");
font.setPointSize(QucsSettings.font.pointSize()-1);
font.setStyleHint(QFont::Courier);
font.setFixedPitch(true);
setFont(font);
vBox = new QVBoxLayout(this);
output = new QTextEdit(this);
output->setReadOnly(true);
output->setUndoRedoEnabled(false);
output->setTextFormat(Qt::LogText);
output->setMaxLogLines(2000);
output->setWordWrap(QTextEdit::NoWrap);
output->setPaletteBackgroundColor(QucsSettings.BGColor);
vBox->addWidget(output, 10);
input = new QLineEdit(this);
connect(input, SIGNAL(returnPressed()), SLOT(slotSendCommand()));
vBox->addWidget(input);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
parent_->setWidget(this);
parent_->setResizeEnabled(true);
parent_->setHorizontallyStretchable(true);
histIterator = cmdHistory.end();
}
// -----------------------------------------------------------------
OctaveWindow::~OctaveWindow()
{
if(octProcess.isRunning())
octProcess.kill();
}
// -----------------------------------------------------------------
QSize OctaveWindow::sizeHint()
{
QSize Size;
int w=0, h=0;
Size = output->sizeHint();
w = Size.width();
h = Size.height() + input->sizeHint().height();
return QSize(w, h);
}
// ------------------------------------------------------------------------
bool OctaveWindow::startOctave()
{
if(octProcess.isRunning())
return true;
QStringList CommandLine;
CommandLine << "octave" << "--no-history" << "-i" << "-f" << "-p"
<< QDir::convertSeparators(QucsSettings.OctaveDir);
octProcess.setArguments(CommandLine);
disconnect(&octProcess, 0, 0, 0);
connect(&octProcess, SIGNAL(readyReadStderr()), SLOT(slotDisplayErr()));
connect(&octProcess, SIGNAL(readyReadStdout()), SLOT(slotDisplayMsg()));
connect(&octProcess, SIGNAL(processExited()), SLOT(slotOctaveEnded()));
output->clear();
if(!octProcess.start()) {
output->setText(tr("ERROR: Cannot start Octave!"));
return false;
}
adjustDirectory();
return true;
}
// ------------------------------------------------------------------------
void OctaveWindow::adjustDirectory()
{
sendCommand("cd \"" + QucsWorkDir.absPath() + "\"");
}
// ------------------------------------------------------------------------
void OctaveWindow::sendCommand(const QString& cmd)
{
int par = output->paragraphs() - 1;
int idx = output->paragraphLength(par);
QString cmdstr = cmd + "\n";
output->insertAt(cmdstr, par, idx);
output->scrollToBottom();
octProcess.writeToStdin(cmdstr);
}
// ------------------------------------------------------------------------
void OctaveWindow::runOctaveScript(const QString& name)
{
QFileInfo info(name);
sendCommand(info.baseName(true));
}
// ------------------------------------------------------------------------
void OctaveWindow::slotSendCommand()
{
sendCommand(input->text());
if(!input->text().stripWhiteSpace().isEmpty())
cmdHistory.append(input->text());
histIterator = cmdHistory.end();
input->clear();
}
// ------------------------------------------------------------------------
void OctaveWindow::keyPressEvent(QKeyEvent *event)
{
if(event->key() == Qt::Key_Up) {
if(histIterator == cmdHistory.begin())
return;
histIterator--;
input->setText(*histIterator);
return;
}
if(event->key() == Qt::Key_Down) {
if(histIterator == cmdHistory.end())
return;
histIterator++;
input->setText(*histIterator);
return;
}
}
// ------------------------------------------------------------------------
// Is called when the process sends an output to stdout.
void OctaveWindow::slotDisplayMsg()
{
int par = output->paragraphs() - 1;
int idx = output->paragraphLength(par);
output->insertAt(QString(octProcess.readStdout()), par, idx);
output->scrollToBottom();
}
// ------------------------------------------------------------------------
// Is called when the process sends an output to stderr.
void OctaveWindow::slotDisplayErr()
{
if(!isVisible())
((QDockWindow*)parent())->show(); // always show an error
int par = output->paragraphs() - 1;
int idx = output->paragraphLength(par);
output->insertAt(QString(octProcess.readStderr()), par, idx);
output->scrollToBottom();
}
// ------------------------------------------------------------------------
// Is called when the simulation process terminates.
void OctaveWindow::slotOctaveEnded()
{
output->clear();
}

51
qucs/octave_window.h Normal file
View File

@ -0,0 +1,51 @@
/***************************************************************************
copyright : (C) 2010 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
#ifndef OCTAVE_WINDOW_H
#define OCTAVE_WINDOW_H
#include <qwidget.h>
#include <qprocess.h>
#include <qstringlist.h>
class QLineEdit;
class QTextEdit;
class QVBoxLayout;
class QDockWindow;
class OctaveWindow : public QWidget {
Q_OBJECT
public:
OctaveWindow(QDockWindow*);
~OctaveWindow();
QSize sizeHint();
bool startOctave();
void runOctaveScript(const QString&);
void sendCommand(const QString&);
void adjustDirectory();
private slots:
void slotDisplayMsg();
void slotDisplayErr();
void slotOctaveEnded();
void slotSendCommand();
protected:
void keyPressEvent(QKeyEvent*);
private:
QVBoxLayout *vBox;
QTextEdit *output;
QLineEdit *input;
QProcess octProcess;
QStringList cmdHistory;
QStringList::Iterator histIterator;
};
#endif

View File

@ -189,7 +189,11 @@ QString GraphicText::saveCpp()
QString ("new Text (%1, %2, \"%3\", QColor (\"%4\"), %5, %6, %7)").
arg(cx).arg(cy).arg(t).
arg(Color.name()).arg(Font.pointSize()).
<<<<<<< HEAD
arg(sin(M_PI * Angle / 180.0)).arg(cos(M_PI * Angle / 180.0));
=======
arg(cos(M_PI * Angle / 180.0)).arg(sin(M_PI * Angle / 180.0));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
s = "Texts.append (" + s + ");";
return s;
}

View File

@ -1,7 +1,11 @@
#
# qucs/qucs.ap - Autodsp input file.
#
<<<<<<< HEAD
# Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -27,10 +31,17 @@ NAME = qucs
SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \
qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \
viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \
<<<<<<< HEAD
schematic_file.cpp syntax.cpp module.cpp
# List of special Qt files.
MOCHEADERS = qucs.h schematic.h textdoc.h
=======
schematic_file.cpp syntax.cpp module.cpp octave_window.cpp
# List of special Qt files.
MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
# Additional libraries.
LIBS = -lcomponents -ldiagrams -lpaintings -ldialogs \

View File

@ -83,6 +83,10 @@
#include "dialogs/simmessage.h"
#include "dialogs/vtabwidget.h"
#include "dialogs/vtabbeddockwidget.h"
<<<<<<< HEAD
=======
#include "octave_window.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
extern const char *empty_xpm[];
@ -129,6 +133,10 @@ QucsApp::QucsApp()
tr("VHDL Sources")+" (*.vhdl *.vhd);;"+
tr("Verilog Sources")+" (*.v);;"+
tr("Verilog-A Sources")+" (*.va);;"+
<<<<<<< HEAD
=======
tr("Octave Scripts")+" (*.m *.oct);;"+
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
tr("Any File")+" (*)";
QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
QucsHomeDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
@ -136,6 +144,14 @@ QucsApp::QucsApp()
move (QucsSettings.x, QucsSettings.y);
resize(QucsSettings.dx, QucsSettings.dy);
<<<<<<< HEAD
=======
MouseMoveAction = 0;
MousePressAction = 0;
MouseReleaseAction = 0;
MouseDoubleClickAction = 0;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
initView();
initActions();
initMenuBar();
@ -144,6 +160,10 @@ QucsApp::QucsApp()
viewToolBar->setOn(true);
viewStatusBar->setOn(true);
viewBrowseDock->setOn(true);
<<<<<<< HEAD
=======
slotViewOctaveDock(false);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
initCursorMenu();
HierarchyHistory.setAutoDelete(true);
Module::registerModules ();
@ -171,9 +191,19 @@ QucsApp::QucsApp()
QString arg = qApp->argv()[z];
if(*(arg) != '-') {
// allow uri's: file:/home/linuxuser/Desktop/example.sch
<<<<<<< HEAD
QString f = QDir::convertSeparators(QUriDrag::uriToLocalFile(arg));
if(f.isEmpty()) f = arg;
gotoPage(f);
=======
if(arg.contains(":/")) {
QString f = QDir::convertSeparators(QUriDrag::uriToLocalFile(arg));
if(f.isEmpty()) f = arg;
gotoPage(f);
} else {
gotoPage(arg);
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
}
}
@ -196,6 +226,10 @@ void QucsApp::initContentListView()
ConOthers = new QListViewItem(Content, tr("Others"));
ConDatasets = new QListViewItem(Content, tr("Datasets"));
ConDisplays = new QListViewItem(Content, tr("Data Displays"));
<<<<<<< HEAD
=======
ConOctave = new QListViewItem(Content, tr("Octave"));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
ConVerilog = new QListViewItem(Content, tr("Verilog"));
ConVerilogA = new QListViewItem(Content, tr("Verilog-A"));
ConSources = new QListViewItem(Content, tr("VHDL"));
@ -288,6 +322,17 @@ void QucsApp::initView()
moveDockWindow(dock,DockLeft);
TabView->setCurrentPage(0);
<<<<<<< HEAD
=======
// ----------------------------------------------------------
// Octave docking window
octDock = new QDockWindow(QDockWindow::InDock, this);
octDock->setCloseMode(QDockWindow::Always);
connect(octDock, SIGNAL(visibilityChanged(bool)), SLOT(slotToggleOctave(bool)));
octave = new OctaveWindow(octDock);
moveDockWindow(octDock, Qt::DockBottom);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// ............................................
readProjects(); // reads all projects and inserts them into the ListBox
}
@ -751,6 +796,11 @@ void QucsApp::readProjectFiles()
delete ConVerilogA->firstChild();
while(ConOthers->firstChild())
delete ConOthers->firstChild();
<<<<<<< HEAD
=======
while(ConOctave->firstChild())
delete ConOctave->firstChild();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
int n;
// put all files into "Content"-ListView
@ -778,6 +828,11 @@ void QucsApp::readProjectFiles()
new QListViewItem(ConVerilog, (*it).ascii());
else if(Str == "va")
new QListViewItem(ConVerilogA, (*it).ascii());
<<<<<<< HEAD
=======
else if((Str == "m") || (Str == "oct"))
new QListViewItem(ConOctave, (*it).ascii());
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else
new QListViewItem(ConOthers, (*it).ascii());
}
@ -802,6 +857,10 @@ void QucsApp::openProject(const QString& Path, const QString& Name)
return;
}
QucsWorkDir.setPath(ProjDir.path());
<<<<<<< HEAD
=======
octave->adjustDirectory();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Content->setColumnText(0,tr("Content of '")+Name+tr("'")); // column text
ConSchematics->setOpen(false); // get sure to have it closed
@ -866,6 +925,10 @@ void QucsApp::slotMenuCloseProject()
slotResetWarnings();
setCaption("Qucs " PACKAGE_VERSION + tr(" - Project: "));
QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
<<<<<<< HEAD
=======
octave->adjustDirectory();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Content->setColumnText(0,tr("Content of")); // column text
initContentListView();
@ -1120,13 +1183,21 @@ bool QucsApp::saveAs()
}
// list of known file extensions
<<<<<<< HEAD
QString ext = "vhdl;vhd;v;va;sch;dpl";
=======
QString ext = "vhdl;vhd;v;va;sch;dpl;m;oct";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QStringList extlist = QStringList::split (';', ext);
if(isTextDocument (w))
Filter = tr("VHDL Sources")+" (*.vhdl *.vhd);;" +
tr("Verilog Sources")+" (*.v);;"+
tr("Verilog-A Sources")+" (*.va);;"+
<<<<<<< HEAD
=======
tr("Octave Scripts")+" (*.m *.oct);;"+
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
tr("Any File")+" (*)";
else
Filter = QucsFileFilter;
@ -1184,6 +1255,11 @@ bool QucsApp::saveAs()
Content->setSelected(new QListViewItem(ConVerilog, s), true);
else if(ext == "va")
Content->setSelected(new QListViewItem(ConVerilogA, s), true);
<<<<<<< HEAD
=======
else if(ext == "m" || ext == "oct")
Content->setSelected(new QListViewItem(ConOctave, s), true);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else
Content->setSelected(new QListViewItem(ConOthers, s), true);
}
@ -1352,8 +1428,17 @@ void QucsApp::slotFileSettings ()
QWidget * w = DocumentTab->currentPage ();
if (isTextDocument (w)) {
QucsDoc * Doc = (QucsDoc *) ((TextDoc *) w);
<<<<<<< HEAD
// Verilog-A properties
if (Doc->fileSuffix () == "va") {
=======
QString ext = Doc->fileSuffix ();
// Octave properties
if (ext == "m" || ext == "oct") {
}
// Verilog-A properties
else if (ext == "va") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
VASettingsDialog * d = new VASettingsDialog ((TextDoc *) w);
d->exec ();
}
@ -1658,8 +1743,13 @@ void QucsApp::slotSimulate()
if(!saveAs()) return; // ... save schematic before
// Perhaps the document was modified from another program ?
<<<<<<< HEAD
if(Doc->lastSaved.isValid()) {
QFileInfo Info(Doc->DocName);
=======
QFileInfo Info(Doc->DocName);
if(Doc->lastSaved.isValid()) {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Doc->lastSaved < Info.lastModified()) {
int No = QMessageBox::warning(this, tr("Warning"),
tr("The document was modified by another program !") + '\n' +
@ -1671,6 +1761,19 @@ void QucsApp::slotSimulate()
}
slotResetWarnings();
<<<<<<< HEAD
=======
if(Info.extension(false) == "m" || Info.extension(false) == "oct") {
// It is an Octave script.
if(Doc->DocChanged)
Doc->save();
slotViewOctaveDock(true);
octave->runOctaveScript(Doc->DocName);
return;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
SimMessage *sim = new SimMessage(w, this);
// disconnect is automatically performed, if one of the involved objects
// is destroyed !
@ -1708,6 +1811,7 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim)
Dia->show();
}
}
<<<<<<< HEAD
else if(sim->SimOpenDpl) {
// switch to data display
slotChangePage(sim->DocName, sim->DataDisplay);
@ -1717,6 +1821,30 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim)
if(w) if(!isTextDocument (sim->DocWidget))
// load recent simulation data (if document is still open)
((Schematic*)sim->DocWidget)->reloadGraphs();
=======
else {
if(sim->SimRunScript) {
// run script
octave->startOctave();
octave->runOctaveScript(sim->Script);
}
if(sim->SimOpenDpl) {
// switch to data display
if(sim->DataDisplay.right(2) == ".m" ||
sim->DataDisplay.right(4) == ".oct") { // Is it an Octave script?
octave->startOctave();
octave->runOctaveScript(sim->DataDisplay);
}
else
slotChangePage(sim->DocName, sim->DataDisplay);
sim->slotClose(); // close and delete simulation window
}
else
if(w) if(!isTextDocument (sim->DocWidget))
// load recent simulation data (if document is still open)
((Schematic*)sim->DocWidget)->reloadGraphs();
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(!isTextDocument (sim->DocWidget))
((Schematic*)sim->DocWidget)->viewport()->update();
@ -1752,7 +1880,12 @@ void QucsApp::slotChangePage(QString& DocName, QString& DataDisplay)
DocumentTab->setCurrentPage(z);
else { // no open page found ?
QString ext = QucsDoc::fileSuffix (DataDisplay);
<<<<<<< HEAD
if (ext != "vhd" && ext != "vhdl" && ext != "v" && ext != "va")
=======
if (ext != "vhd" && ext != "vhdl" && ext != "v" && ext != "va" &&
ext != "oct" && ext != "m")
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
d = new Schematic (this, Name);
else
d = new TextDoc (this, Name);
@ -1804,7 +1937,15 @@ void QucsApp::slotToPage()
return;
}
<<<<<<< HEAD
slotChangePage(d->DocName, d->DataDisplay);
=======
if(d->DocName.right(2) == ".m" ||
d->DocName.right(4) == ".oct")
slotViewOctaveDock(true);
else
slotChangePage(d->DocName, d->DataDisplay);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
// -------------------------------------------------------------------
@ -1830,7 +1971,12 @@ void QucsApp::slotOpenContent(QListViewItem *item)
QString Suffix = Info.extension(false);
if (Suffix == "sch" || Suffix == "dpl" || Suffix == "vhdl" ||
<<<<<<< HEAD
Suffix == "v" || Suffix == "va") {
=======
Suffix == "vhd" || Suffix == "v" || Suffix == "va" ||
Suffix == "m" || Suffix == "oct") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
gotoPage(Info.absFilePath());
if(item->text(1).isEmpty()) // is subcircuit ?

View File

@ -43,6 +43,10 @@ class QIconView;
class QIconViewItem;
class VTabbedDockWidget;
class VTabWidget;
<<<<<<< HEAD
=======
class OctaveWindow;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
typedef bool (Schematic::*pToggleFunc) ();
typedef void (MouseActions::*pMouseFunc) (Schematic*, QMouseEvent*);
@ -162,11 +166,20 @@ private:
// ********* Widgets on the main area **********************************
VTabbedDockWidget *dock;
VTabWidget *TabView;
<<<<<<< HEAD
=======
QDockWindow *octDock;
OctaveWindow *octave;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QListBox *Projects;
QListView *Content;
QListViewItem *ConSchematics, *ConSources, *ConDisplays, *ConDatasets,
<<<<<<< HEAD
*ConOthers, *ConVerilog, *ConVerilogA;
=======
*ConOthers, *ConVerilog, *ConVerilogA, *ConOctave;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QComboBox *CompChoose;
@ -209,6 +222,11 @@ private slots:
void slotViewToolBar(bool toggle); // toggle the toolbar
void slotViewStatusBar(bool toggle); // toggle the statusbar
void slotViewBrowseDock(bool toggle); // toggle the dock window
<<<<<<< HEAD
=======
void slotViewOctaveDock(bool); // toggle the dock window
void slotToggleOctave(bool);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
void slotToggleDock(bool);
void slotHelpAbout(); // shows an about dialog
void slotHelpAboutQt(); // shows the standard about dialog for Qt
@ -220,7 +238,11 @@ private:
void initStatusBar(); // setup the statusbar
QAction *helpAboutApp, *helpAboutQt, *viewToolBar, *viewStatusBar,
<<<<<<< HEAD
*viewBrowseDock;
=======
*viewBrowseDock, *viewOctaveDock;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// menus contain the items of their menubar
QPopupMenu *fileMenu, *editMenu, *insMenu, *projMenu, *simMenu, *viewMenu,

View File

@ -1391,6 +1391,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -6918,7 +6928,11 @@ qucsedit [-r] file :إستعمال
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">أجهزة فيريلوج v2.23 0 HICUM {1.3?}</translation>
=======
<translation type="unfinished">أجهزة فيريلوج v2.23 0 HICUM {1.3?}</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -6942,11 +6956,19 @@ qucsedit [-r] file :إستعمال
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -6977,7 +6999,139 @@ qucsedit [-r] file :إستعمال
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9115,6 +9269,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -10513,6 +10692,17 @@ are included in the search.</source>
<source>Cancel</source>
<translation>إلغاء</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -10789,11 +10979,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1527,6 +1527,16 @@ pero es %1!</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7209,7 +7219,151 @@ Use: qucsedit [-r] fitxer
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9785,6 +9939,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12566,6 +12745,17 @@ en la búsqueda.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12928,11 +13118,32 @@ Inserta esqueleto de la entidad VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1626,6 +1626,16 @@ je ale %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7431,7 +7441,151 @@ Použití: qucsedit [-r] soubor
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -10196,6 +10350,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -14663,6 +14842,17 @@ jméně je hledaný řetězec. Do hledání budou zahrnuty všechny knihovny.</t
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -15039,11 +15229,32 @@ Vloží konstrukci VHDL entity</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

File diff suppressed because it is too large Load Diff

View File

@ -1528,6 +1528,16 @@ pero es %1!</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7186,7 +7196,11 @@ Use: qucsedit [-r] archivo
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">Componente verilog HICUM Level 0 v1.3</translation>
=======
<translation type="unfinished">Componente verilog HICUM Level 0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7210,11 +7224,19 @@ Use: qucsedit [-r] archivo
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7245,7 +7267,139 @@ Use: qucsedit [-r] archivo
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9837,6 +9991,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12620,6 +12799,17 @@ en la búsqueda.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12984,11 +13174,32 @@ Inserta esqueleto de la entidad VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1522,6 +1522,16 @@ or elle vaut %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7190,7 +7200,11 @@ Invocation : qucsedit [-r] fichier
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">Composant Verilog Hicum niveau 0 v1.3</translation>
=======
<translation type="unfinished">Composant Verilog Hicum niveau 0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7214,11 +7228,19 @@ Invocation : qucsedit [-r] fichier
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">NPN Hicum L0 v 1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">PNP Hicum L0 v 1.3</translation>
=======
<translation type="unfinished">NPN Hicum L0 v 1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">PNP Hicum L0 v 1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7249,7 +7271,139 @@ Invocation : qucsedit [-r] fichier
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9897,6 +10051,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12835,6 +13014,17 @@ le nom inclut le texte recherchée. La recherche est
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13194,11 +13384,32 @@ Insère un prototype d&apos;entité VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1473,6 +1473,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7064,7 +7074,151 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9506,6 +9660,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12094,6 +12273,17 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12434,11 +12624,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1536,6 +1536,16 @@ de %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7207,7 +7217,151 @@ Digitális szimuláció</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9875,6 +10029,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12732,6 +12911,17 @@ Rács megjelenítése</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13098,11 +13288,32 @@ Váz illesztés a VHDL entitáshoz</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -32,6 +32,10 @@
#include "main.h"
#include "qucs.h"
#include "dialogs/vtabbeddockwidget.h"
<<<<<<< HEAD
=======
#include "octave_window.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// ----------------------------------------------------------
// initializes all QActions of the application
@ -609,6 +613,16 @@ void QucsApp::initActions()
tr("Browse Window\n\nEnables/disables the browse dock window"));
connect(viewBrowseDock, SIGNAL(toggled(bool)), SLOT(slotViewBrowseDock(bool)));
<<<<<<< HEAD
=======
viewOctaveDock = new QAction(tr("&Octave Window"), 0, this, 0);
viewOctaveDock->setToggleAction(true);
viewOctaveDock->setStatusTip(tr("Shows/hides the Octave dock window"));
viewOctaveDock->setWhatsThis(
tr("Octave Window\n\nShows/hides the Octave dock window"));
connect(viewOctaveDock, SIGNAL(toggled(bool)), SLOT(slotViewOctaveDock(bool)));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
helpIndex = new QAction("Help Index...", tr("Help Index..."), Key_F1, this);
helpIndex->setStatusTip(tr("Index of Qucs Help"));
helpIndex->setWhatsThis(tr("Help Index\n\nIndex of intern Qucs help"));
@ -740,6 +754,10 @@ void QucsApp::initMenuBar()
viewToolBar->addTo(viewMenu);
viewStatusBar->addTo(viewMenu);
viewBrowseDock->addTo(viewMenu);
<<<<<<< HEAD
=======
viewOctaveDock->addTo(viewMenu);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
helpMenu = new QPopupMenu(); // menuBar entry helpMenu
helpIndex->addTo(helpMenu);
@ -910,6 +928,29 @@ void QucsApp::slotToggleDock(bool on)
}
// ----------------------------------------------------------
<<<<<<< HEAD
=======
// turn Octave Dock Window on or off
void QucsApp::slotViewOctaveDock(bool toggle)
{
if(toggle) {
octDock->show();
octave->startOctave();
}
else
octDock->hide();
}
// ----------------------------------------------------------
void QucsApp::slotToggleOctave(bool on)
{
viewOctaveDock->blockSignals(true);
viewOctaveDock->setOn(on);
viewOctaveDock->blockSignals(false);
}
// ----------------------------------------------------------
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
void QucsApp::slotHelpAbout()
{
QMessageBox::about(this, tr("About..."),

View File

@ -1651,6 +1651,16 @@ ma è %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7335,7 +7345,11 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">Dispositivo verilog HICUM Level 0 v1.3</translation>
=======
<translation type="unfinished">Dispositivo verilog HICUM Level 0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7386,7 +7400,147 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -10247,6 +10401,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -13195,6 +13374,17 @@ sono incluse nella ricerca.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13557,11 +13747,32 @@ Inserisce scheletro entità VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1518,6 +1518,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7163,7 +7173,151 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9728,6 +9882,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12444,6 +12623,17 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation>Letter </translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12810,11 +13000,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1370,6 +1370,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -6868,7 +6878,11 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Level 0 v1.3 Verilog-моделі</translation>
=======
<translation type="unfinished">HICUM Level 0 v1.3 Verilog-моделі</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -6892,11 +6906,19 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn типті HICUM L0 1.3 нұсқасы {0?}</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp типті HICUM L0 1.3 нұсқасы {0?}</translation>
=======
<translation type="unfinished">npn типті HICUM L0 1.3 нұсқасы {0?}</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp типті HICUM L0 1.3 нұсқасы {0?}</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -6927,7 +6949,139 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9051,6 +9205,31 @@ Trolltech Qt жайлы</translation>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -10440,6 +10619,17 @@ are included in the search.</source>
<source>Cancel</source>
<translation>Артқа қайтару</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -10716,11 +10906,32 @@ VHDL объектісінің негізін қояды</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1525,6 +1525,16 @@ a jest %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7222,7 +7232,11 @@ Stosowanie: qucsedit [-r] plik
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">komponent HICUM Level 0 v1.3 veriloga</translation>
=======
<translation type="unfinished">komponent HICUM Level 0 v1.3 veriloga</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7246,11 +7260,19 @@ Stosowanie: qucsedit [-r] plik
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7281,7 +7303,139 @@ Stosowanie: qucsedit [-r] plik
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9880,6 +10034,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12337,6 +12516,7 @@ otworzyć ten plik odpowiednim programem.</translation>
<source>power matching</source>
<translation type="obsolete">dopasowanie mocy</translation>
</message>
<<<<<<< HEAD
<message>
<source>Error</source>
<translation type="obsolete">Błąd</translation>
@ -12369,11 +12549,14 @@ otworzyć ten plik odpowiednim programem.</translation>
<source>Wrong dependency!</source>
<translation type="obsolete">Zła zależność!</translation>
</message>
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SaveDialog</name>
<message>
<source>Modified Files</source>
<<<<<<< HEAD
<translation>Zmienione pliki</translation>
</message>
<message>
@ -12399,12 +12582,40 @@ otworzyć ten plik odpowiednim programem.</translation>
<message>
<source>Don&apos;t Save</source>
<translation>Nie zapisuj</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save the modified files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select files to be saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Abort Closing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Don&apos;t Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save Selected</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>Schematic</name>
<message>
<source>Title</source>
<<<<<<< HEAD
<translation>Tytuł</translation>
</message>
<message>
@ -12425,6 +12636,20 @@ otworzyć ten plik odpowiednim programem.</translation>
</message>
<message>
<source>generic</source>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Drawn By:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Date:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Revision:</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -12471,6 +12696,7 @@ Edytuj schemat</translation>
Edits the symbol for this schematic</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
</context>
<context>
<name>SearchDialog</name>
@ -12557,12 +12783,107 @@ uwzględniono wszystkie biblioteki.</translation>
<message>
<source>Replaced %1 occurrences!</source>
<translation>Zamieniono %1 wystąpień!</translation>
=======
<message>
<source>generic</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot create library file &quot;%s&quot;.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SearchDialog</name>
<message>
<source>Text to search for</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Text to replace with</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ask before replacing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>From cursor position</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Case sensitive</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Whole words only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search backwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Porzuć</translation>
</message>
<message>
<source>Replace Text</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Text</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Replace...</source>
<translation type="unfinished">Zamień...</translation>
</message>
<message>
<source>Replace occurrence ?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search...</source>
<translation type="unfinished">Szukaj...</translation>
</message>
<message>
<source>Search string not found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Replaced %1 occurrences!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The search result contains all components whose
name contains the search string. All libraries
are included in the search.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search string:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished">Zamknij</translation>
</message>
<message>
<source>Search result</source>
<translation type="unfinished">Wyniki szukania</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<source>Edit File Properties</source>
<<<<<<< HEAD
<translation>Edytuj właściwości pliku</translation>
</message>
<message>
@ -12640,6 +12961,77 @@ uwzględniono wszystkie biblioteki.</translation>
<message>
<source>DIN A3 portrait</source>
<translation>DIN A3 pionowo</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Data Display:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Data Set:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>open data display after simulation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simulation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>show Grid</source>
<translation type="unfinished">pokaż siatkę</translation>
</message>
<message>
<source>horizontal Grid:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>vertical Grid:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Grid</source>
<translation type="unfinished">Siatka</translation>
</message>
<message>
<source>no Frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DIN A5 landscape</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DIN A5 portrait</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DIN A4 landscape</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DIN A4 portrait</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DIN A3 landscape</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DIN A3 portrait</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Letter landscape</source>
@ -12649,11 +13041,31 @@ uwzględniono wszystkie biblioteki.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished">OK</translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished">Zastosuj</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Porzuć</translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
<message>
<source>Qucs Simulation Messages</source>
<<<<<<< HEAD
<translation>Komunikaty z symulacji Qucs</translation>
</message>
<message>
@ -12791,18 +13203,52 @@ Błędy:
<message>
<source>Aborted.</source>
<translation>Przerwano.</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Output:
-------</source>
<translation>Wynik:
------</translation>
<source>Progress:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Errors:
-------</source>
<translation>Błędy:
-------</translation>
<source>Errors and Warnings:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Goto display page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Abort simulation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Starting new simulation on %1 at %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Simulator is still running!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>creating netlist... </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot write netlist file!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot open SPICE file &quot;%1&quot;.</source>
<translation type="unfinished">BŁĄD: Nie można otworzyć pliku SPICE &quot;%1&quot;.</translation>
</message>
<message>
<source>ERROR: Cannot start QucsConv!</source>
<translation type="unfinished">BŁĄD: Nie można uruchomić QucsConv!</translation>
</message>
<message>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot create VHDL directory &quot;%1&quot;!</source>
@ -12812,11 +13258,64 @@ Błędy:
<source>ERROR: Cannot create &quot;%1&quot;!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot start simulator!</source>
<translation type="unfinished">BŁĄD: Nie mogę uruchomić symulatora!</translation>
</message>
<message>
<source>Close window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simulation ended on %1 at %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ready.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Errors occurred during simulation on %1 at %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Aborted.</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Output:
-------</source>
<<<<<<< HEAD
<translation>Wynik:
------</translation>
=======
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Errors:
-------</source>
<<<<<<< HEAD
<translation>Błędy:
-------</translation>
</message>
<message>
<source>ERROR: Cannot create VHDL directory &quot;%1&quot;!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot create &quot;%1&quot;!</source>
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SpiceDialog</name>
<message>
<source>Edit SPICE Component Properties</source>
<<<<<<< HEAD
<translation>Edytuj właściwości elementu SPICE</translation>
</message>
<message>
@ -12926,33 +13425,153 @@ Błędy:
<message>
<source>Cannot execute &quot;%1&quot;.</source>
<translation>Nie mozna wykonać &quot;%1&quot;.</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Name:</source>
<translation type="unfinished">Nazwa:</translation>
</message>
<message>
<source>File:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browse</source>
<translation type="unfinished">Pokaż</translation>
</message>
<message>
<source>Edit</source>
<translation type="unfinished">Edycja</translation>
</message>
<message>
<source>show file name in schematic</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>include SPICE simulations</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>preprocessor</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SPICE net nodes:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add &gt;&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;&lt; Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Component ports:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished">OK</translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished">Zastosuj</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Porzuć</translation>
</message>
<message>
<source>SPICE netlist</source>
<translation type="unfinished">netlista w formacie SPICE</translation>
</message>
<message>
<source>All Files</source>
<translation type="unfinished">Wszystkie pliki</translation>
</message>
<message>
<source>Select a file</source>
<translation type="unfinished">Wybierz plik</translation>
</message>
<message>
<source>Info</source>
<translation type="unfinished">Informacja</translation>
</message>
<message>
<source>Preprocessing SPICE file &quot;%1&quot;.</source>
<translation type="unfinished">Preprocessing SPICE file &quot;%1&quot;.</translation>
</message>
<message>
<source>Error</source>
<translation type="unfinished">Błąd</translation>
</message>
<message>
<source>Cannot save preprocessed SPICE file &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot execute &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>SPICE Preprocessor Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Converting SPICE file &quot;%1&quot;.</source>
<translation type="unfinished">Konwersja pliku SPICE &quot;%1&quot;.</translation>
</message>
<message>
<source>QucsConv Error</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>SweepDialog</name>
<message>
<source>Bias Points</source>
<<<<<<< HEAD
<translation>Punkty pracy</translation>
</message>
<message>
<source>Close</source>
<translation>Zamknij</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished">Zamknij</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>SymbolWidget</name>
<message>
<source>Symbol:</source>
<<<<<<< HEAD
<translation>Symbol:</translation>
</message>
<message>
<source>! Drag n&apos;Drop me !</source>
<translation>!Przeciągnij mnie i upuść!</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>! Drag n&apos;Drop me !</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>TextDoc</name>
<message>
<<<<<<< HEAD
<source>Error</source>
<translation>Błąd</translation>
</message>
@ -12965,6 +13584,8 @@ Błędy:
<translation>Strona %1 z %2</translation>
</message>
<message>
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<source>Edit Text Symbol</source>
<translation type="unfinished"></translation>
</message>
@ -13003,11 +13624,16 @@ wstawia szkielet VHDL entity</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
</context>
<context>
<name>VASettingsDialog</name>
@ -13038,6 +13664,40 @@ Inserts the skeleton of a Verilog module</source>
<message>
<source>Error</source>
<translation type="obsolete">Błąd</translation>
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error</source>
<translation type="unfinished">Błąd</translation>
</message>
<message>
<source>There is no selection!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page %1 of %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VASettingsDialog</name>
<message>
<source>Document Settings</source>
<translation type="unfinished">Ustawienia dokumentu</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Code Creation Settings</source>
@ -13088,6 +13748,17 @@ Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
=======
<source>Ok</source>
<translation type="unfinished">OK</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Porzuć</translation>
</message>
<message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<source>PNG files</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1458,6 +1458,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Name:</source>
@ -7075,7 +7085,151 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9008,6 +9162,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -10396,6 +10575,17 @@ are included in the search.</source>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -10670,11 +10860,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1464,6 +1464,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7148,7 +7158,151 @@ Folosire: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9596,6 +9750,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12190,6 +12369,17 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12538,11 +12728,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1633,6 +1633,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7431,7 +7441,11 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Level 0 v1.3 Verilog-модель</translation>
=======
<translation type="unfinished">HICUM Level 0 v1.3 Verilog-модель</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7455,11 +7469,19 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7490,7 +7512,139 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -10251,6 +10405,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -14729,6 +14908,17 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation>Letter портрет</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -15109,11 +15299,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1423,6 +1423,16 @@ men är nu %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7029,7 +7039,151 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9484,6 +9638,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12294,6 +12473,17 @@ ingår i sökningen.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12647,11 +12837,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1438,6 +1438,16 @@ olmalı fakat şu anda %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7025,7 +7035,11 @@ Kullanım: qucsedit [-r] kütük
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Seviyesi 0 v1.3 verilog devre elemanı</translation>
=======
<translation type="unfinished">HICUM Seviyesi 0 v1.3 verilog devre elemanı</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7049,11 +7063,19 @@ Kullanım: qucsedit [-r] kütük
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7084,7 +7106,139 @@ Kullanım: qucsedit [-r] kütük
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9590,6 +9744,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -12385,6 +12564,17 @@ Bütün kütüphaneler aranır.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12739,11 +12929,32 @@ Bir VHDL varlığı iskeleti koyar</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -1430,6 +1430,16 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7020,7 +7030,11 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Level 0 v1.3 Verilog-модель</translation>
=======
<translation type="unfinished">HICUM Level 0 v1.3 Verilog-модель</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7071,7 +7085,147 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hybrid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupled transmission lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>characteristic impedance of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relative dielectric constant of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of even mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length of odd mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Coupled Transmission Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance tunnel diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>peak current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>valley voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fermi energy in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resonance width in Ws</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>maximum of transmission</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for electron density</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for voltage drop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>fitting factor for diode current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>zero-bias depletion capacitance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>life-time of electrons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tunnel Diode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for using third order solution for transfer current</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bias dependence for reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Flag for turning temperature dependence of tef0 on and off</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of Reverse Early voltage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TC of AVER</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bandgap difference between base and BE-junction</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frist-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Second-order TC of iqfh</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9699,6 +9853,31 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Octave Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave Window
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>QucsAttenuator</name>
@ -11157,6 +11336,17 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -11499,11 +11689,32 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Inserts skeleton of Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Octave function
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

View File

@ -3,7 +3,11 @@
REM
REM qucsdigi.bat - wrapper script for digital simulation
REM
<<<<<<< HEAD
REM Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
=======
REM Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REM
REM This is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
@ -21,7 +25,11 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
REM Boston, MA 02110-1301, USA.
REM
<<<<<<< HEAD
if not exist "%6" goto usage
=======
if "X%6"=="X" goto usage
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
set NAME=%1
set NAMEOUT=%2

View File

@ -3,7 +3,11 @@
REM
REM qucsdigilib.bat - wrapper script for digital modules and libraries
REM
<<<<<<< HEAD
REM Copyright (C) 2009 Stefan Jahn <stefan@lkcc.org>
=======
REM Copyright (C) 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REM
REM This is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
@ -21,7 +25,11 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
REM Boston, MA 02110-1301, USA.
REM
<<<<<<< HEAD
if not exist "%4" goto usage
=======
if "X%4"=="X" goto usage
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
set NAME=%1
set DIR=%2
@ -51,7 +59,11 @@ echo compiling functions...
%CXX% %CXXFLAGS% -c %NAME%.cc
echo copying modules to VHDL directory...
<<<<<<< HEAD
copy %NAME%.o vhdl/%LIBRARY%
=======
copy %NAME%.o vhdl\%LIBRARY% > NUL
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
echo updating VHDL library...
%AR% cru vhdl/lib%LIBRARY%.a vhdl/%LIBRARY%/*.o

View File

@ -79,7 +79,15 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_)
QString base = Info.baseName(true);
QString ext = Info.extension(false);
<<<<<<< HEAD
DataSet = base + ".dat"; // name of the default dataset
=======
if(ext == "m" || ext == "oct")
SimTime = "1";
DataSet = base + ".dat"; // name of the default dataset
Script = base + ".m"; // name of the default script
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(ext != "dpl")
DataDisplay = base + ".dpl"; // name of default data display
else {
@ -88,6 +96,10 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_)
}
}
SimOpenDpl = true;
<<<<<<< HEAD
=======
SimRunScript = false;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
DocChanged = false;
showBias = -1; // don't show DC bias (currently for "Schematic" only)

View File

@ -51,14 +51,24 @@ public:
QString DocName;
QString DataSet; // name of the default dataset
QString DataDisplay; // name of the default data display
<<<<<<< HEAD
=======
QString Script;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QString SimTime; // used for VHDL simulation, but stored in datadisplay
QDateTime lastSaved;
float Scale;
QucsApp *App;
bool DocChanged;
<<<<<<< HEAD
bool SimOpenDpl; // open data display after simulation ?
int showBias; // -1=no, 0=calculation running, >0=show DC bias points
=======
bool SimOpenDpl; // open data display after simulation ?
bool SimRunScript; // run script after simulation ?
int showBias; // -1=no, 0=calculation running, >0=show DC bias points
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
bool GridOn;
int tmpPosX, tmpPosY;
};

View File

@ -252,9 +252,15 @@ void Schematic::setName (const QString& Name_)
if (App) App->DocumentTab->setTabLabel (this, Info.fileName ());
QString base = Info.baseName (true);
<<<<<<< HEAD
qDebug (base);
QString ext = Info.extension (false);
DataSet = base + ".dat";
=======
QString ext = Info.extension (false);
DataSet = base + ".dat";
Script = base + ".m";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if (ext != "dpl")
DataDisplay = base + ".dpl";
else

View File

@ -207,6 +207,7 @@ int Schematic::saveSymbolCpp (void)
stream << " // symbol drawing code\n";
for (pp = SymbolPaints.first (); pp != 0; pp = SymbolPaints.next ()) {
if (pp->Name == ".ID ") continue;
<<<<<<< HEAD
pp->Bounding (x1, y1, x2, y2);
if (x1 < xmin) xmin = x1;
if (x2 > xmax) xmax = x2;
@ -217,6 +218,24 @@ int Schematic::saveSymbolCpp (void)
maxNum = ((PortSymbol*)pp)->numberStr.toInt();
continue;
}
=======
if (pp->Name == ".PortSym ") {
if (((PortSymbol*)pp)->numberStr.toInt() > maxNum)
maxNum = ((PortSymbol*)pp)->numberStr.toInt();
x1 = ((PortSymbol*)pp)->cx;
y1 = ((PortSymbol*)pp)->cy;
if (x1 < xmin) xmin = x1;
if (x1 > xmax) xmax = x1;
if (y1 < ymin) ymin = y1;
if (y1 > ymax) ymax = y1;
continue;
}
pp->Bounding (x1, y1, x2, y2);
if (x1 < xmin) xmin = x1;
if (x2 > xmax) xmax = x2;
if (y1 < ymin) ymin = y1;
if (y2 > ymax) ymax = y2;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
stream << " " << pp->saveCpp () << "\n";
}
@ -273,6 +292,11 @@ int Schematic::saveDocument()
stream << " <DataSet=" << DataSet << ">\n";
stream << " <DataDisplay=" << DataDisplay << ">\n";
stream << " <OpenDisplay=" << SimOpenDpl << ">\n";
<<<<<<< HEAD
=======
stream << " <Script=" << Script << ">\n";
stream << " <RunScript=" << SimRunScript << ">\n";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
stream << " <showFrame=" << showFrame << ">\n";
QString t;
@ -372,6 +396,13 @@ bool Schematic::loadProperties(QTextStream *stream)
else if(cstr == "OpenDisplay")
if(nstr.toInt(&ok) == 0) SimOpenDpl = false;
else SimOpenDpl = true;
<<<<<<< HEAD
=======
else if(cstr == "Script") Script = nstr;
else if(cstr == "RunScript")
if(nstr.toInt(&ok) == 0) SimRunScript = false;
else SimRunScript = true;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else if(cstr == "showFrame")
showFrame = nstr.at(0).latin1() - '0';
else if(cstr == "FrameText0") convert2Unicode(Frame_Text0 = nstr);

View File

@ -73,6 +73,12 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state)
// ----- current text is a string ----------------------------
else if(iString >= 0) {
setFormat(iString, i-iString+1, QucsSettings.String);
<<<<<<< HEAD
=======
if (language == LANG_OCTAVE)
if(c == '\'')
iString = -1;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(c == '"')
iString = -1;
continue;
@ -148,6 +154,14 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state)
}
continue;
}
<<<<<<< HEAD
=======
// ----- maybe a Octave comment -------------------------------
else if((language == LANG_OCTAVE) && (c == '%' || c == '#')) {
setFormat(i, text.length()-i+1, QucsSettings.Comment);
return state;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// ----- no special syntax yet (or anymore) --------------
else {
if((language == LANG_VERILOG || language == LANG_VERILOGA)
@ -169,12 +183,20 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state)
}
if (state < STATE_COMMENT) {
<<<<<<< HEAD
if(c == '\'') {
=======
if(c == '\'' && language != LANG_OCTAVE) {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(i > 1)
if(text.at(i-2) == '\'')
setFormat(i-2, 3, QucsSettings.Character);
}
<<<<<<< HEAD
else if(c == '"')
=======
else if(c == '"' || (c == '\'' && language == LANG_OCTAVE))
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
iString = i;
}
if ((language == LANG_VERILOG || language == LANG_VERILOGA)
@ -343,6 +365,40 @@ pChar VA_List_Functions[] =
{"realtime", "temperature", "vt", "display", "strobe", 0};
// ---------------------------------------------------
<<<<<<< HEAD
=======
// reserved Octave words in alphabetical order
pChar OCT_List_C[] = {"case", "catch", 0};
pChar OCT_List_E[] = {"else", "elseif", "end", "endfor", "endfunction",
"endif", "endswitch", "end_try_catch", "endwhile",
"end_unwind_protect", 0};
pChar OCT_List_F[] = {"for", "function", 0};
pChar OCT_List_I[] = {"if", 0};
pChar OCT_List_O[] = {"otherwise", 0};
pChar OCT_List_S[] = {"switch", 0};
pChar OCT_List_T[] = {"try", 0};
pChar OCT_List_U[] = {"unwind_protect", "unwind_protect_cleanup", 0};
pChar OCT_List_W[] = {"while", 0};
ppChar OCT_WordList[] =
{0, 0, (ppChar)&OCT_List_C,
0, (ppChar)&OCT_List_E, (ppChar)&OCT_List_F,
0, 0, (ppChar)&OCT_List_I,
0, 0, 0,
0, 0, (ppChar)&OCT_List_O,
0, 0, 0,
(ppChar)&OCT_List_S, (ppChar)&OCT_List_T, (ppChar)&OCT_List_U,
0, (ppChar)&OCT_List_W, 0,
0, 0};
pChar OCT_List_DataTypes[] = {
"inf", "nan", "pi", 0};
pChar OCT_List_Functions[] =
{"plot", 0};
// ---------------------------------------------------
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
void SyntaxHighlighter::markWord(const QString& text, int start, int len)
{
pChar *List;
@ -374,6 +430,12 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
case LANG_VERILOG:
List = V_WordList[idx];
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
List = OCT_WordList[idx];
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
List = VA_WordList[idx];;
break;
@ -397,6 +459,12 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
case LANG_VERILOG:
List = V_List_DataTypes;
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
List = OCT_List_DataTypes;
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
List = VA_List_DataTypes;
break;
@ -459,6 +527,12 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
case LANG_VERILOGA:
List = VA_List_Functions;
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
List = OCT_List_Functions;
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
List = 0;
break;

View File

@ -23,6 +23,10 @@ enum language_type {
LANG_VHDL,
LANG_VERILOG,
LANG_VERILOGA,
<<<<<<< HEAD
=======
LANG_OCTAVE,
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
};
enum textstate_type {

View File

@ -94,12 +94,24 @@ TextDoc::~TextDoc()
void TextDoc::setLanguage (const QString& FileName)
{
QFileInfo Info (FileName);
<<<<<<< HEAD
if (Info.extension (false) == "vhd" || Info.extension (false) == "vhdl")
setLanguage (LANG_VHDL);
else if (Info.extension (false) == "v")
setLanguage (LANG_VERILOG);
else if (Info.extension (false) == "va")
setLanguage (LANG_VERILOGA);
=======
QString ext = Info.extension (false);
if (ext == "vhd" || ext == "vhdl")
setLanguage (LANG_VHDL);
else if (ext == "v")
setLanguage (LANG_VERILOG);
else if (ext == "va")
setLanguage (LANG_VERILOGA);
else if (ext == "m" || ext == "oct")
setLanguage (LANG_OCTAVE);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else
setLanguage (LANG_NONE);
}
@ -188,6 +200,11 @@ void TextDoc::setName (const QString& Name_)
DataSet = Info.baseName (true) + ".dat";
DataDisplay = Info.baseName (true) + ".dpl";
<<<<<<< HEAD
=======
if(Info.extension(false) == "m" || Info.extension(false) == "oct")
SimTime = "1";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
// ---------------------------------------------------
@ -223,7 +240,17 @@ void TextDoc::becomeCurrent (bool)
App->insEntity->setMenuText (tr("Verilog module"));
App->insEntity->setStatusTip (tr("Inserts skeleton of Verilog module"));
App->insEntity->setWhatsThis (
<<<<<<< HEAD
tr("Verilog entity\n\nInserts the skeleton of a Verilog module"));
=======
tr("Verilog module\n\nInserts the skeleton of a Verilog module"));
}
else if (language == LANG_OCTAVE) {
App->insEntity->setMenuText (tr("Octave function"));
App->insEntity->setStatusTip (tr("Inserts skeleton of Octave function"));
App->insEntity->setWhatsThis (
tr("Octave function\n\nInserts the skeleton of a Octave function"));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
App->simulate->setEnabled (true);
App->editActivate->setEnabled (true);
@ -264,7 +291,13 @@ void TextDoc::slotSetChanged()
QPopupMenu *TextDoc::createPopupMenu( const QPoint &pos )
{
QPopupMenu *popup = QTextEdit::createPopupMenu( pos );
<<<<<<< HEAD
App->fileSettings->addTo(popup);
=======
if (language != LANG_OCTAVE) {
App->fileSettings->addTo(popup);
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return popup;
}
@ -418,6 +451,12 @@ void TextDoc::commentSelected ()
case LANG_VERILOGA:
co = "//"; cl = 2;
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
co = "%"; cl = 1;
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
co = ""; cl = 0;
break;
@ -447,6 +486,12 @@ void TextDoc::insertSkeleton ()
else if (language == LANG_VERILOG)
insert ("module ( );\ninput ;\noutput ;\nbegin\n\nend\n"
"endmodule\n\n");
<<<<<<< HEAD
=======
else if (language == LANG_OCTAVE)
insert ("function = ( )\n"
"endfunction\n\n");
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
// ---------------------------------------------------
@ -468,6 +513,14 @@ QString TextDoc::getModuleName (void)
VerilogA_File_Info VInfo (text ());
return VInfo.ModuleName;
}
<<<<<<< HEAD
=======
case LANG_OCTAVE:
{
QFileInfo Info (DocName);
return Info.baseName (true);
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
return "";
}