[hamradio-commits] [xnec2c] 02/06: New upstream version 3.5
Dave Hibberd
hibby-guest at moszumanska.debian.org
Thu Sep 8 23:11:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository xnec2c.
commit 45dc279200dd019b26f4e0b6429b62a36990c970
Author: Hibby <d at vehibberd.com>
Date: Thu Sep 8 20:55:06 2016 +0100
New upstream version 3.5
---
aclocal.m4 | 224 +++++----
configure | 20 +-
configure.ac | 2 +-
doc/aspell.sh | 5 -
doc/xnec2c.html | 132 +++---
examples/10-20m-moxon.nec | 25 +
examples/10-20m_horizomni.nec | 3 +-
examples/10-30m-box.nec | 14 +
examples/10-30m_MultiBand_Vertical.nec | 2 +-
examples/10-30m_Vertical.nec | 2 +-
examples/10-30m_bipyramid.nec | 2 +-
examples/10-30m_inv_cone.nec | 2 +-
examples/10-30m_sphere.nec | 2 +-
examples/10-30m_vert.nec | 20 -
examples/10-80m_G5RV.nec | 2 +-
examples/10-80m_Inverted-L.nec | 2 +-
examples/10-80m_windom.nec | 5 +-
examples/137MHz_turnstile-sloped.nec | 2 +-
examples/137MHz_turnstile.nec | 2 +-
examples/137Mhz-QFHA1.nec | 19 +
examples/137Mhz-QFHA2.nec | 19 +
examples/13cm_Yagi.nec | 2 +-
examples/13cm_corner_reflector.nec | 2 +-
examples/13cm_helix+screen.nec | 2 +-
.../{35-55MHz_logper.nec => 14-30MHz_logper.nec} | 2 +-
examples/15m_delta-loop.nec | 2 +-
examples/1MHz_3x_helicone.nec | 2 +-
examples/1MHz_3x_helisphere.nec | 2 +-
examples/1MHz_4x_helisphere.nec | 4 +-
examples/1MHz_helivert.nec | 2 +-
examples/1MHz_tower.nec | 2 +-
examples/20-40m_ground_plane.nec | 2 +-
examples/20-40m_vert_circ_cliff.nec | 2 +-
examples/20-40m_vert_linear_cliff.nec | 2 +-
examples/20-40m_vert_sommerfeld_cliff.nec | 2 +-
examples/20m_car_ant.nec | 2 +-
examples/20m_quad.nec | 2 +-
examples/23cm_helix+radials.nec | 2 +-
examples/23cm_helix+screen.nec | 2 +-
examples/2m_1:4l-gp_on_pole.nec | 2 +-
...gp_on_pole.nec => 2m_1:4l-horiz_gp_on_pole.nec} | 4 +-
examples/2m_5:8l-gp_on_pole.nec | 2 +-
examples/2m_EME_ant.nec | 2 +-
examples/2m_Lindenblad.nec | 17 +
examples/2m_bigwheel.nec | 2 +-
examples/2m_extended_Xpol_yagi.nec | 2 +-
examples/2m_extended_yagi.nec | 2 +-
examples/2m_halo_stack.nec | 2 +-
examples/2m_sqr_halo.nec | 2 +-
examples/2m_sqr_halo_stack.nec | 2 +-
examples/2m_xpol_omni.nec | 2 +-
examples/2m_xpol_omni_stack.nec | 2 +-
examples/2m_yagi.nec | 2 +-
examples/30-80m_inv_L.nec | 2 +-
examples/35-55MHz_logper.nec | 32 +-
examples/40-80m_Inv_L.nec | 5 +-
examples/40m-moxon.nec | 2 +-
examples/6-17m_bipyramid.nec | 2 +-
examples/6-20m_inv_cone.nec | 2 +-
examples/6m_big-square_stack.nec | 2 +-
examples/6m_bigwheel-stack.nec | 2 +-
examples/6m_horizomni.nec | 5 +-
examples/70cm_collinear.nec | 2 +-
examples/80m_zepp.nec | 2 +-
examples/T12m-H24m.nec | 2 +-
examples/T20m-H18m.nec | 2 +-
examples/airplane.nec | 2 +-
examples/buoy.nec | 2 +-
examples/gray_hoverman.nec | 2 +-
examples/k9ay_5b4az.nec | 2 +-
examples/k9ay_orig.nec | 2 +-
examples/satellite.nec | 2 +-
src/Makefile.am | 2 +-
src/Makefile.in | 3 +-
src/calculations.c | 14 +-
src/callback_func.c | 4 +-
src/callbacks.c | 81 +++-
src/cmnd_edit.c | 132 +++++-
src/common.h | 11 +-
src/draw_radiation.c | 18 +-
src/draw_structure.c | 8 +-
src/editors.h | 3 +-
src/fields.c | 50 +-
src/geom_edit.c | 350 ++++++++------
src/geom_edit.h | 4 +
src/geometry.c | 6 +-
src/gnuplot.c | 8 +-
src/ground.c | 6 +-
src/input.c | 10 +-
src/interface.c | 293 ++++++------
src/matrix.c | 28 +-
src/network.c | 4 +-
src/radiation.c | 20 +-
src/somnec.c | 2 +-
src/xnec2c.c | 10 +-
xnec2c.glade | 520 ++++++++++-----------
96 files changed, 1329 insertions(+), 921 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index d445a26..e8cab04 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -335,7 +335,7 @@ msgstr ""
# on various variables needed by the Makefile.in.in installed by
# glib-gettextize.
dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_CC])dnl
GLIB_LC_MESSAGES
@@ -405,7 +405,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
rm -f po/POTFILES
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
- ])
+ ],
+ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
# -------------------------------
@@ -647,19 +648,19 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
dnl Authors:
@@ -679,32 +680,63 @@ AC_DEFUN([AM_NLS],
AC_SUBST([USE_NLS])
])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-#
-# 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.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -726,18 +758,19 @@ if test -n "$PKG_CONFIG"; then
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -747,8 +780,10 @@ m4_ifvaln([$3], [else
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -760,10 +795,11 @@ m4_define([_PKG_CONFIG],
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -771,19 +807,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -837,16 +871,40 @@ else
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -857,16 +915,18 @@ AC_ARG_WITH([pkgconfigdir],
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -877,13 +937,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -892,7 +954,7 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
diff --git a/configure b/configure
index a7abe7d..033167e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xnec2c 3.4.
+# Generated by GNU Autoconf 2.69 for xnec2c 3.5.
#
# Report bugs to <nkcyham at yahoo.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xnec2c'
PACKAGE_TARNAME='xnec2c'
-PACKAGE_VERSION='3.4'
-PACKAGE_STRING='xnec2c 3.4'
+PACKAGE_VERSION='3.5'
+PACKAGE_STRING='xnec2c 3.5'
PACKAGE_BUGREPORT='nkcyham at yahoo.com'
PACKAGE_URL=''
@@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xnec2c 3.4 to adapt to many kinds of systems.
+\`configure' configures xnec2c 3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1405,7 +1405,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xnec2c 3.4:";;
+ short | recursive ) echo "Configuration of xnec2c 3.5:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xnec2c configure 3.4
+xnec2c configure 3.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1972,7 +1972,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xnec2c $as_me 3.4, which was
+It was created by xnec2c $as_me 3.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2835,7 +2835,7 @@ fi
# Define the identity of the package.
PACKAGE='xnec2c'
- VERSION='3.4'
+ VERSION='3.5'
cat >>confdefs.h <<_ACEOF
@@ -8018,7 +8018,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xnec2c $as_me 3.4, which was
+This file was extended by xnec2c $as_me 3.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8084,7 +8084,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xnec2c config.status 3.4
+xnec2c config.status 3.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 56a874b..a30453a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([xnec2c], [3.4], [nkcyham at yahoo.com])
+AC_INIT([xnec2c], [3.5], [nkcyham at yahoo.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/common.h])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/aspell.sh b/doc/aspell.sh
deleted file mode 100755
index a3bc566..0000000
--- a/doc/aspell.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-for file in *.html
-do
- aspell -c "$file"
-done
diff --git a/doc/xnec2c.html b/doc/xnec2c.html
index 686d053..9b531ad 100644
--- a/doc/xnec2c.html
+++ b/doc/xnec2c.html
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta name="generator" content="Bluefish 2.2.4" >
+<meta name="generator" content="Bluefish 2.2.9" >
<title>Xnec2c User Manual</title>
<meta name="author" content="Neoklis Kyriazis" >
<meta name="copyright" content="GPL v2.0 or higher">
@@ -22,7 +22,7 @@ translation of NEC2</h4>
</div>
<ol>
<li><a href="#Introduction">Introduction</a></li>
-<li><a href="#Features">Features</a></b>
+<li><a href="#Features">Features</a>
<ul>
<li><a href="#Interactive">Interactive Operation</a></li>
<li><a href="#NoOutFile">No Output File</a></li>
@@ -31,14 +31,12 @@ translation of NEC2</h4>
<li><a href="#OnDemand">On-demand Calculation</a></li>
<li><a href="#Multithread">Multi-threaded operation on SMP
machines</a></li>
-<li><a href="#Nec2Edit">Built-in NEC2 input file
-editor</a></li>
+<li><a href="#Nec2Edit">Built-in NEC2 input file editor</a></li>
</ul>
</li>
<li><a href="#Limitations">Limitations</a></li>
-<li><a href="#Compilation">Compilation and
-Installation</a></li>
-<li><a href="#Operation">Operation</a></b>
+<li><a href="#Compilation">Compilation and Installation</a></li>
+<li><a href="#Operation">Operation</a>
<ul>
<li><a href="#CommandLine">Command Line Options</a></li>
<li><a href="#MainWindow">The Main Window</a></li>
@@ -49,8 +47,7 @@ Window</a></li>
</ul>
</li>
<li><a href="#InputFile">Input File Considerations</a></li>
-<li><a href="#OutputFile">Output File
-Considerations</a></li>
+<li><a href="#OutputFile">Output File Considerations</a></li>
<li><a href="#Version">Version History</a></li>
<li><a href="#Bugs">Bugs and Inadequacies</a></li>
<li><a href="#Acknowledgement">Acknowledgment</a></li>
@@ -277,8 +274,8 @@ shown in two spin button widgets which can also be used to change
the viewing angle.</p>
<p>Starting with version 2.1, the structure display can be zoomed
in or out by using the mouse wheel or the Zoom controls (Zoom %
-spin wheel and the +/-/1 buttons) and it can also be moved around by
-dragging with the right mouse button 2.</p>
+spin wheel and the +/-/1 buttons) and it can also be moved around
+by dragging with the right mouse button 2.</p>
<p>The current distribution or charge density in the structure can
be displayed by clicking the <b>Cur</b> or <b>Chg</b> toggle
buttons at the top right of the Main window. The distribution of
@@ -307,12 +304,12 @@ is possible to save the structure drawing to a PNG file by using
the <b>Save</b> or <b>Save As</b> items in the File menu.</p>
<p>Starting with version 2.1, xnec2c can save the structure display
as a data file for the "gnuplot" plotting program. This is done by
-using the <b>File->Save As gnuplot</b> menu item, to open a
-file chooser dialog. If only the stem of the file name is given,
-xnec2c will automatically add the .gplot extension. Plotting in
-gnuplot is done with the "splot <filename> with lines"
-command, although the plot can be enhanced with some of the style
-etc commands available in gnuplot.</p>
+using the <b>File->Save As gnuplot</b> menu item, to open a file
+chooser dialog. If only the stem of the file name is given, xnec2c
+will automatically add the .gplot extension. Plotting in gnuplot is
+done with the "splot <filename> with lines" command, although
+the plot can be enhanced with some of the style etc commands
+available in gnuplot.</p>
<p>The View menu allows opening of other output data display
windows and selection of various options:<br>
<br clear="all">
@@ -885,66 +882,79 @@ changed the case of the signal handler that deals with SIGCHLD so
that it doesn't cause xnec2c to exit when the SIGCHLD signal does
not originate from child processes created by xnec2c. It appears
that in some Linux installations a SIGCHLD signal is sent to xnec2c
-even if it is not running forked, e.g. the -j option is not used
-in the command line.</p>
-<p><b>Version 2.7:</b> After a bug report by Tim, WJ5Q, I fixed
-a bug that was preventing the creation of an LD card of type 5
-(LDTYP=5) when wire conductivity (S/m) was specified in the GW
-card (Wire) editor. The same bug was present in the GH (Helix)
-card editor and it was also fixed. I added code so that the
-wire conductivity for GW, GA and GH cards can be read from the
-relevant LD card and shown in the Conductivity (S/m) spin button.</p>
+even if it is not running forked, e.g. the -j option is not used in
+the command line.</p>
+<p><b>Version 2.7:</b> After a bug report by Tim, WJ5Q, I fixed a
+bug that was preventing the creation of an LD card of type 5
+(LDTYP=5) when wire conductivity (S/m) was specified in the GW card
+(Wire) editor. The same bug was present in the GH (Helix) card
+editor and it was also fixed. I added code so that the wire
+conductivity for GW, GA and GH cards can be read from the relevant
+LD card and shown in the Conductivity (S/m) spin button.</p>
<p>After all these changes I checked the xnec2c source code using
the Coverity Scan service and I fixed an out-of-bounds read error
that was reported by the scanner, in the plot_freqdat.c file.</p>
<p><b>Version 2.8:</b> Fixed a bug in the GN card editor function
which caused xnec2c to save the GN card parameters in the .nec
-antenna description file without clearing the number of radials
-to zero. This resulted in the GN card editor window to open with
-confusing and incorrect defaults for the radial screen, when
-the Reflection Coefficient Approximation method was selected
-for specifying ground parameters.</p>
-<p>Also fixed some bugs (missing variable initializations) in
-the Ground Parameters calculation functions which resulted in
-incorrect Radiation Pattern calculations. This would happen if
-a .nec file, with Perfect Ground (iperf = 1) specified in the
-GN card, was opened after a .nec file, with a Radial Ground
-Screen specified in the GN card, was processed.<p/>
-<p><b>Version 2.9:</b> After a request by the Debian maintainer
-of xnec2c, I added a rudimentary man page he sent me and
-corrected some spelling errors (arbitrary to arbitrary).<p/>
-<p><b>Version 3.0:</b> I have modified the NEC2 file parser so
-that it can read the file with both the '.' and ',' as decimal
-point characters. This is necessary to make xnec2c compatible with
+antenna description file without clearing the number of radials to
+zero. This resulted in the GN card editor window to open with
+confusing and incorrect defaults for the radial screen, when the
+Reflection Coefficient Approximation method was selected for
+specifying ground parameters.</p>
+<p>Also fixed some bugs (missing variable initializations) in the
+Ground Parameters calculation functions which resulted in incorrect
+Radiation Pattern calculations. This would happen if a .nec file,
+with Perfect Ground (iperf = 1) specified in the GN card, was
+opened after a .nec file, with a Radial Ground Screen specified in
+the GN card, was processed.</p>
+<p><b>Version 2.9:</b> After a request by the Debian maintainer of
+xnec2c, I added a rudimentary man page he sent me and corrected
+some spelling errors (arbitrary to arbitrary).</p>
+<p><b>Version 3.0:</b> I have modified the NEC2 file parser so that
+it can read the file with both the '.' and ',' as decimal point
+characters. This is necessary to make xnec2c compatible with
different locales. I also fixed a resource (memory) leak, reported
-by valgrind, in the xyz axes drawing routine.<p/>
-<p><b>Version 3.1:</b> I have made several changes to the code
-that renders wire frame drawings and displays some data, like the
+by valgrind, in the xyz axes drawing routine.</p>
+<p><b>Version 3.1:</b> I have made several changes to the code that
+renders wire frame drawings and displays some data, like the
projection parameters (azimuth and elevation of the structure and
the radiation pattern) and gain values. This has resulted in a
faster and smoother animation of these drawings and reduced
workload on the processor during dragging of these images.<br>
I have also reduced the default minimum size of xnec2c's windows,
as I had reports that they would not fit in the displays of some
-laptops or monitors, with resolutions on the lower side.<p/>
+laptops or monitors, with resolutions on the lower side.</p>
<p><b>Version 3.2:</b> I made some changes to the Strlcat()
-function and its usage in the xnec2c code, to improve safe
-handling of string concatenation operations. Hopefully this has
-not broken the handling of various strings in xnec2c! ;-)</p>
+function and its usage in the xnec2c code, to improve safe handling
+of string concatenation operations. Hopefully this has not broken
+the handling of various strings in xnec2c! ;-)</p>
<p><b>Version 3.3:</b> I fixed a bug that was in the code that
reads the commands from the NEC2 input file, where xnec2c would
-crash with a segmentation fault when the FR card was after the
-RP card. Also modified the Strtod() function to avoid freeing the
-end pointer before it was used, causing problems.</p>
+crash with a segmentation fault when the FR card was after the RP
+card. Also modified the Strtod() function to avoid freeing the end
+pointer before it was used, causing problems.</p>
<p><b>Version 3.4:</b> I fixed a bug in the code that implements
-the modified GS (scaling) card. In NEC2 the GS card scales all
-of the structure, but in Xnec2c I modified the code so that it
-is possible to specify a range of tag numbers to apply scaling
-to only. When a GS card follows a GX card, selective scaling
-doesn't work correctly because a symmetric structure is created.
-If you are using a GS card, it may be better to avoid specifying
-a tag number range, just in case the bug fix is not complete.</p>
-<p><b><a name="Bugs" id="Bugs">9. Bugs and Inadequacies:</a></b><br>
+the modified GS (scaling) card. In NEC2 the GS card scales all of
+the structure, but in Xnec2c I modified the code so that it is
+possible to specify a range of tag numbers to apply scaling to
+only. When a GS card follows a GX card, selective scaling doesn't
+work correctly because a symmetric structure is created. If you are
+using a GS card, it may be better to avoid specifying a tag number
+range, just in case the bug fix is not complete.</p>
+<p><b>Version 3.5:</b> I modified the NEC2 Editor code so that when
+a Geometry or Command editor window is opened, activating Apply or
+OK will save data in the editor window to the treeview, even if the
+default data is not edited.<br>
+I modified the NEC2 Editor code so that if a treeview row is
+removed while the relevant editor window is open, then activating
+Apply or OK will not attempt to save data to the treeview, since
+this will cause an illegal memory access and will crash xnec2c.<br>
+Fixed a bug in the Helix editor which caused incorrect calculation
+of the segment length as a percentage of wavelength or of the
+number of segments/turn that correspond to a given segment length
+as a percentage of wavelength</p>
+<p><b><a name="Bugs" id="Bugs">9. Bugs and
+Inadequacies:</a></b><br>
Xnec2c is based on nec2c, my translation to C of the original
FORTRAN NEC2 code. Any bugs discovered in nec2c will affect xnec2c
as well and they will have to be fixed. In addition, changing the
diff --git a/examples/10-20m-moxon.nec b/examples/10-20m-moxon.nec
new file mode 100644
index 0000000..e7e0f90
--- /dev/null
+++ b/examples/10-20m-moxon.nec
@@ -0,0 +1,25 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM Moxon-type 2-element beam for 10-20m
+CM Optimized for maximum front-to-back ratio
+CM Input impedance matching requires a 4:1 balun
+CE --- End Comments ---
+GW 1 13 -2.69000E+00 -2.54000E+00 0.00000E+00 2.69000E+00 -2.54000E+00 0.00000E+00 1.50000E-03
+GW 1 6 2.69000E+00 -2.54000E+00 0.00000E+00 2.69000E+00 -5.00000E-02 0.00000E+00 1.50000E-03
+GW 1 6 -2.69000E+00 -2.54000E+00 0.00000E+00 -2.69000E+00 -5.00000E-02 0.00000E+00 1.50000E-03
+GW 2 13 -2.69000E+00 2.69000E+00 0.00000E+00 2.69000E+00 2.69000E+00 0.00000E+00 1.50000E-03
+GW 2 6 2.69000E+00 2.69000E+00 0.00000E+00 2.69000E+00 5.00000E-02 0.00000E+00 1.50000E-03
+GW 2 6 -2.69000E+00 2.69000E+00 0.00000E+00 -2.69000E+00 5.00000E-02 0.00000E+00 1.50000E-03
+GM 2 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.00000E+00
+GS 3 4 7.75000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GS 5 6 6.63000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GS 7 8 5.63000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GS 9 10 4.97000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 1 7 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 1 7 3 7 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 3 7 5 7 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 5 7 7 7 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 7 7 9 7 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 161 0 0 1.40000E+01 1.00000E-01 3.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 1.00000E+01 1.00000E+01 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/10-20m_horizomni.nec b/examples/10-20m_horizomni.nec
index 97957d9..f6fc6e1 100644
--- a/examples/10-20m_horizomni.nec
+++ b/examples/10-20m_horizomni.nec
@@ -1,4 +1,5 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM A generally Omnidirectional Horzontally Polarized Antenna
CE --- End Comments ---
GW 1 15 -1.27000E+00 -1.27000E+00 0.00000E+00 1.27000E+00 -1.27000E+00 0.00000E+00 1.50000E-03
GW 1 15 1.27000E+00 -1.27000E+00 0.00000E+00 1.27000E+00 1.27000E+00 0.00000E+00 1.50000E-03
diff --git a/examples/10-30m-box.nec b/examples/10-30m-box.nec
new file mode 100644
index 0000000..05a5586
--- /dev/null
+++ b/examples/10-30m-box.nec
@@ -0,0 +1,14 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM A Skeleton Box type Broadband Vertical for 10-30m
+CE --- End Comments ---
+GW 2 24 1.50000E+00 0.00000E+00 2.00000E-01 1.50000E+00 0.00000E+00 4.80000E+00 1.50000E-03
+GW 3 8 0.00000E+00 0.00000E+00 4.80000E+00 1.50000E+00 0.00000E+00 4.80000E+00 1.50000E-03
+GW 4 8 0.00000E+00 0.00000E+00 2.00000E-01 1.50000E+00 0.00000E+00 2.00000E-01 1.50000E-03
+GR 0 6 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 1 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 2.00000E-01 5.00000E-03
+GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 1 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GN 0 16 0 0 1.20000E+01 1.00000E-02 5.00000E+00 5.00000E-03 0.00000E+00 0.00000E+00
+FR 0 41 0 0 1.00000E+01 5.00000E-01 3.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/10-30m_MultiBand_Vertical.nec b/examples/10-30m_MultiBand_Vertical.nec
index fac8fd0..c410a98 100644
--- a/examples/10-30m_MultiBand_Vertical.nec
+++ b/examples/10-30m_MultiBand_Vertical.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Multiband Vertical covering all bands from 10m-30m
CM No traps are used and only one element (30m) is
CM fed power. A vertical element for each band is needed
diff --git a/examples/10-30m_Vertical.nec b/examples/10-30m_Vertical.nec
index 98d7a50..8683d91 100644
--- a/examples/10-30m_Vertical.nec
+++ b/examples/10-30m_Vertical.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Multiband Vertical covering all bands from 10m-30m
CM No traps are used and only one element (30m) is
CM fed power. A vertical element for each band is needed
diff --git a/examples/10-30m_bipyramid.nec b/examples/10-30m_bipyramid.nec
index ef548a3..801d77d 100644
--- a/examples/10-30m_bipyramid.nec
+++ b/examples/10-30m_bipyramid.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Skeleton bi-pyramid antenna for 10-30 MHz
CE --- End Comments ---
GW 1 18 2.40000E+00 0.00000E+00 2.90000E+00 0.00000E+00 0.00000E+00 2.00000E-01 3.00000E-03
diff --git a/examples/10-30m_inv_cone.nec b/examples/10-30m_inv_cone.nec
index b4c52e7..9fb5e69 100644
--- a/examples/10-30m_inv_cone.nec
+++ b/examples/10-30m_inv_cone.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Skeleton bi-pyramid antenna for 14-52 MHz
CE --- End Comments ---
GW 1 25 0.00000E+00 0.00000E+00 1.90400E-01 1.80200E+00 0.00000E+00 5.10000E+00 1.00000E-03
diff --git a/examples/10-30m_sphere.nec b/examples/10-30m_sphere.nec
index 386270f..1865e20 100644
--- a/examples/10-30m_sphere.nec
+++ b/examples/10-30m_sphere.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Skeleton spherical broadband vertical for 10-30 MHz
CM Average ground with radial wire screen
CE --- End Comments ---
diff --git a/examples/10-30m_vert.nec b/examples/10-30m_vert.nec
deleted file mode 100644
index c98b2ce..0000000
--- a/examples/10-30m_vert.nec
+++ /dev/null
@@ -1,20 +0,0 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
-CM Skeleton Cage broad-band vertical 10-30 MHz
-CM Average ground with radial wire screen and cliff
-CE --- End Comments ---
-GW 1 5 1.20000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 7.50000E-03
-GM 0 2 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 2.40000E+00 0.00000E+00
-GW 2 20 1.20000E+00 0.00000E+00 0.00000E+00 1.20000E+00 0.00000E+00 4.80000E+00 3.00000E-03
-GR 0 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GW 3 20 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 4.80000E+00 1.25000E-02
-GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 5.00000E-01 0.00000E+00
-GW 4 2 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 5.00000E-01 1.25000E-02
-GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-EX 0 4 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 21 0 0 1.00000E+01 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GN 0 32 0 0 1.30000E+01 5.00000E-03 7.00000E+00 3.00000E-03 0.00000E+00 0.00000E+00
-GD 0 0 0 0 1.20000E+01 5.00000E-03 1.00000E+01 4.00000E+00 0.00000E+00 0.00000E+00
-NE 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-NH 0 1 20 15 0.00000E+00 -4.75000E+00 5.00000E-01 0.00000E+00 5.00000E-01 5.00000E-01
-RP 6 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
-EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/10-80m_G5RV.nec b/examples/10-80m_G5RV.nec
index 74ed695..92c2650 100644
--- a/examples/10-80m_G5RV.nec
+++ b/examples/10-80m_G5RV.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM G5RV antenna for 10 - 80m
CE --- End Comments ---
GW 1 61 1.55500E+01 0.00000E+00 9.65000E+00 -1.55500E+01 0.00000E+00 9.65000E+00 2.00000E-03
diff --git a/examples/10-80m_Inverted-L.nec b/examples/10-80m_Inverted-L.nec
index d530fbf..b302842 100644
--- a/examples/10-80m_Inverted-L.nec
+++ b/examples/10-80m_Inverted-L.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Inverted L antenna for 10 - 80m
CE --- End Comments ---
GW 1 21 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 9.00000E+00 2.00000E-03
diff --git a/examples/10-80m_windom.nec b/examples/10-80m_windom.nec
index c5b6b89..a94eaec 100644
--- a/examples/10-80m_windom.nec
+++ b/examples/10-80m_windom.nec
@@ -1,7 +1,8 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM A classical Windom Antenna for 10-80m
CE --- End Comments ---
GW 1 60 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.20000E+01 1.25000E-03
-GW 2 65 0.00000E+00 0.00000E+00 1.20000E+01 -1.45000E+01 0.00000E+00 1.20000E+01 1.25000E-03
+GW 2 65 0.00000E+00 0.00000E+00 1.20000E+01 -1.45000E+01 0.00000E+00 1.20000E+01 1.25000E-03
GW 3 130 0.00000E+00 0.00000E+00 1.20000E+01 2.70000E+01 0.00000E+00 1.20000E+01 1.25000E-03
GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 1 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/137MHz_turnstile-sloped.nec b/examples/137MHz_turnstile-sloped.nec
index f942a1e..182a108 100644
--- a/examples/137MHz_turnstile-sloped.nec
+++ b/examples/137MHz_turnstile-sloped.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM R.H. cicular polarized turnstile for 137 MHz
CE --- End Comments ---
GW 1 24 0.00000E+00 -4.90000E-01 1.00000E-01 0.00000E+00 4.90000E-01 1.00000E-01 6.00000E-03
diff --git a/examples/137MHz_turnstile.nec b/examples/137MHz_turnstile.nec
index e9f3379..0833b5d 100644
--- a/examples/137MHz_turnstile.nec
+++ b/examples/137MHz_turnstile.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Turnstile antenna RH elliptical polarization for 137 MHz
CE --- End Comments ---
GW 1 24 0.00000E+00 5.20000E-01 1.05450E-01 0.00000E+00 -5.20000E-01 1.05450E-01 6.00000E-03
diff --git a/examples/137Mhz-QFHA1.nec b/examples/137Mhz-QFHA1.nec
new file mode 100644
index 0000000..ef16a4b
--- /dev/null
+++ b/examples/137Mhz-QFHA1.nec
@@ -0,0 +1,19 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM Quadrifilar 1/2 turn Helix Antenna for 137MHz
+CE --- End Comments ---
+GH 1 15 1.58000E+00 -7.90000E-01 1.50000E-01 1.50000E-01 1.50000E-01 1.50000E-01 2.50000E-03
+GW 2 7 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.50000E-01 0.00000E+00 2.50000E-03
+GW 3 7 -7.50000E-03 7.50000E-03 7.90000E-01 -1.50000E-01 0.00000E+00 7.90000E-01 2.50000E-03
+GH 4 15 1.40000E+00 -7.00000E-01 1.50000E-01 1.50000E-01 1.50000E-01 1.50000E-01 2.50000E-03
+GW 5 7 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.50000E-01 0.00000E+00 2.50000E-03
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 9.00000E-02 4.00000E+00
+GW 6 7 -7.50000E-03 -7.50000E-03 7.90000E-01 -1.50000E-01 0.00000E+00 7.90000E-01 2.50000E-03
+GM 0 0 0.00000E+00 0.00000E+00 -9.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 4.00000E+00
+GR 0 2 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 7 1 7.50000E-03 -7.50000E-03 7.90000E-01 -7.50000E-03 7.50000E-03 7.90000E-01 5.00000E-03
+GM 0 0 1.80000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 3.50000E-01 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 7 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 51 0 0 1.30000E+02 2.00000E-01 1.40000E+02 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 1.00000E+01 1.00000E+01 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/137Mhz-QFHA2.nec b/examples/137Mhz-QFHA2.nec
new file mode 100644
index 0000000..5d51264
--- /dev/null
+++ b/examples/137Mhz-QFHA2.nec
@@ -0,0 +1,19 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM Quadrifilar 1/4 turn Helix Antenna for 137MHz
+CE --- End Comments ---
+GH 1 45 3.73600E+00 -9.34000E-01 1.22000E-01 1.22000E-01 1.22000E-01 1.22000E-01 2.50000E-03
+GW 2 6 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.22000E-01 0.00000E+00 2.50000E-03
+GW 3 5 -6.10000E-03 -6.10000E-03 9.34000E-01 0.00000E+00 -1.22000E-01 9.34000E-01 2.50000E-03
+GM 0 0 0.00000E+00 0.00000E+00 9.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 1.00000E+00
+GH 4 43 3.50000E+00 -8.75000E-01 1.22000E-01 1.22000E-01 1.22000E-01 1.22000E-01 2.50000E-03
+GW 5 6 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.22000E-01 0.00000E+00 2.50000E-03
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 5.90000E-02 4.00000E+00
+GW 6 5 -6.10000E-03 6.10000E-03 9.34000E-01 0.00000E+00 1.22000E-01 9.34000E-01 2.50000E-03
+GR 0 2 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 7 1 -6.10000E-03 6.10000E-03 9.34000E-01 6.10000E-03 -6.10000E-03 9.34000E-01 5.00000E-03
+GM 0 0 1.80000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 4.70000E-01 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 7 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 51 0 0 1.30000E+02 2.00000E-01 1.40000E+02 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 1.00000E+01 1.00000E+01 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/13cm_Yagi.nec b/examples/13cm_Yagi.nec
index 06f1a96..7767993 100644
--- a/examples/13cm_Yagi.nec
+++ b/examples/13cm_Yagi.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Yagi antenna for 2.4 GHz
CE --- End Comments ---
GW 1 23 0.00000E+00 0.00000E+00 -2.62500E-02 0.00000E+00 0.00000E+00 2.62500E-02 1.50000E-03
diff --git a/examples/13cm_corner_reflector.nec b/examples/13cm_corner_reflector.nec
index a41d91b..b93d0ac 100644
--- a/examples/13cm_corner_reflector.nec
+++ b/examples/13cm_corner_reflector.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Corner reflector for 2.4 GHz
CE --- End Comments ---
GW 1 13 1.00000E-02 0.00000E+00 2.25000E-02 1.00000E-02 0.00000E+00 -2.25000E-02 1.50000E-03
diff --git a/examples/13cm_helix+screen.nec b/examples/13cm_helix+screen.nec
index 996b333..8c3df11 100644
--- a/examples/13cm_helix+screen.nec
+++ b/examples/13cm_helix+screen.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Helix and screen reflector for 2400 MHz
CE --- End Comments ---
GH 1 507 3.34700E-02 5.30000E-01 2.15900E-02 2.15900E-02 2.15900E-02 2.15900E-02 1.50000E-03
diff --git a/examples/35-55MHz_logper.nec b/examples/14-30MHz_logper.nec
similarity index 98%
copy from examples/35-55MHz_logper.nec
copy to examples/14-30MHz_logper.nec
index 99d8759..4ce402b 100644
--- a/examples/35-55MHz_logper.nec
+++ b/examples/14-30MHz_logper.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 12 ELEMENT LOG PERIODIC ANTENNA IN FREE SPACE.
CM 78 SEGMENTS. SIGMA=D/L RECEIVING AND TRANS. PATTERNS.
CM DIPOLE LENGTH TO DIAMETER RATIO=150.
diff --git a/examples/15m_delta-loop.nec b/examples/15m_delta-loop.nec
index b814014..91a4979 100644
--- a/examples/15m_delta-loop.nec
+++ b/examples/15m_delta-loop.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 3 Element Delta Loop beam for 15m
CM NOTE: This input file uses the modified GS command available
CM in xnec2c, where scaling is specified for a range of tag
diff --git a/examples/1MHz_3x_helicone.nec b/examples/1MHz_3x_helicone.nec
index b0537d4..b5d4e8f 100644
--- a/examples/1MHz_3x_helicone.nec
+++ b/examples/1MHz_3x_helicone.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Top-loaded helical vertical for 1.0 MHz, over perfect ground.
CM Three helices are used in parallel to raise the input impedance
CM to near 50 Ohms. The top hat is conical to add to radiation.
diff --git a/examples/1MHz_3x_helisphere.nec b/examples/1MHz_3x_helisphere.nec
index 559ad91..8464562 100644
--- a/examples/1MHz_3x_helisphere.nec
+++ b/examples/1MHz_3x_helisphere.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Top-loaded helical vertical for 1.0 MHz, over perfect ground.
CM Three helices are used in parallel to raise the input impedance
CM to near 50 Ohms. The top hat is spherical to add to radiation.
diff --git a/examples/1MHz_4x_helisphere.nec b/examples/1MHz_4x_helisphere.nec
index fd13be2..e2042d2 100644
--- a/examples/1MHz_4x_helisphere.nec
+++ b/examples/1MHz_4x_helisphere.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Top-loaded helical vertical for 1.0 MHz, over perfect ground. Four
CM co-axial helices are used in parallel to raise the input impedance
CM to near 50 Ohms. The top hat is spherical to add to radiation.
@@ -13,6 +13,6 @@ GW 4 1 0.00000E+00 0.00000E+00 8.20000E+00 0.00000E+00 0.00000E+00
GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 2 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
FR 0 21 0 0 9.80000E-01 2.00000E-03 1.02000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-RP 0 4 4 0 0.00000E+00 0.00000E+00 5.00000E+00 5.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 0 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
GN 1 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/1MHz_helivert.nec b/examples/1MHz_helivert.nec
index 437647b..0efd20e 100644
--- a/examples/1MHz_helivert.nec
+++ b/examples/1MHz_helivert.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Top-loaded helical vertical for 1.0 MHz, over perfect ground.
CM The input impedance is such that a 16:1 quadrifilar toroid
CM transformer should raise it to 50 Ohms.
diff --git a/examples/1MHz_tower.nec b/examples/1MHz_tower.nec
index ed60658..f17d3e8 100644
--- a/examples/1MHz_tower.nec
+++ b/examples/1MHz_tower.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Top-loaded tower for 1.0 MHz, over perfect ground.
CM Each leg is loaded by an inductance to ground.
CM Tower is fed at one of the loaded legs.
diff --git a/examples/20-40m_ground_plane.nec b/examples/20-40m_ground_plane.nec
index 9488c96..23f20c9 100644
--- a/examples/20-40m_ground_plane.nec
+++ b/examples/20-40m_ground_plane.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Dual band base-loaded 7 & 14 MHz Ground Plane.
CM Infinite perfect ground
CE --- End Comments ---
diff --git a/examples/20-40m_vert_circ_cliff.nec b/examples/20-40m_vert_circ_cliff.nec
index 7a258e6..34322d9 100644
--- a/examples/20-40m_vert_circ_cliff.nec
+++ b/examples/20-40m_vert_circ_cliff.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Dual band base loaded 7 & 14 MHz Ground Plane.
CM Finite ground with radials, circular cliff.
CE --- End Comments ---
diff --git a/examples/20-40m_vert_linear_cliff.nec b/examples/20-40m_vert_linear_cliff.nec
index 260b58a..4cb6189 100644
--- a/examples/20-40m_vert_linear_cliff.nec
+++ b/examples/20-40m_vert_linear_cliff.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Dual band base-loaded 7 & 14 MHz Ground Plane.
CM Finite ground with radials, linear cliff.
CE --- End Comments ---
diff --git a/examples/20-40m_vert_sommerfeld_cliff.nec b/examples/20-40m_vert_sommerfeld_cliff.nec
index 74d1687..31e4ebb 100644
--- a/examples/20-40m_vert_sommerfeld_cliff.nec
+++ b/examples/20-40m_vert_sommerfeld_cliff.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Dual band base loaded 7 & 14 MHz Ground Plane.
CM Finite ground, no radials, linear cliff, Sommerfeld method.
CE --- End Comments ---
diff --git a/examples/20m_car_ant.nec b/examples/20m_car_ant.nec
index 55430bc..d52fcd2 100644
--- a/examples/20m_car_ant.nec
+++ b/examples/20m_car_ant.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 14 MHz vertical whip on a car roof
CE --- End Comments ---
GW 1 9 0.00000E+00 0.00000E+00 0.00000E+00 2.69000E+00 0.00000E+00 0.00000E+00 4.80000E-02
diff --git a/examples/20m_quad.nec b/examples/20m_quad.nec
index 1d662c2..d6589d0 100644
--- a/examples/20m_quad.nec
+++ b/examples/20m_quad.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 3 Element Quad for 14 MHz
CM NOTE: This input file uses the modified GS command available
CM in xnec2c, where scaling is specified for a range of tag numbers.
diff --git a/examples/23cm_helix+radials.nec b/examples/23cm_helix+radials.nec
index c8cdc75..f615265 100644
--- a/examples/23cm_helix+radials.nec
+++ b/examples/23cm_helix+radials.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Helix and radial reflector for 1296 MHz
CE --- End Comments ---
GW 2 10 0.00000E+00 0.00000E+00 0.00000E+00 4.50000E-02 0.00000E+00 0.00000E+00 3.00000E-03
diff --git a/examples/23cm_helix+screen.nec b/examples/23cm_helix+screen.nec
index 7361d5e..a23bdb5 100644
--- a/examples/23cm_helix+screen.nec
+++ b/examples/23cm_helix+screen.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Helix and screen reflector for 1296 MHz
CE --- End Comments ---
GH 1 478 6.70000E-02 1.00000E+00 4.30000E-02 4.30000E-02 4.30000E-02 4.30000E-02 3.00000E-03
diff --git a/examples/2m_1:4l-gp_on_pole.nec b/examples/2m_1:4l-gp_on_pole.nec
index 091b535..8b68e5d 100644
--- a/examples/2m_1:4l-gp_on_pole.nec
+++ b/examples/2m_1:4l-gp_on_pole.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Ground Plane for 2m mounted on a 3m pole
CM It just shows where your RF goes with such a setup ;-)
CE --- End Comments ---
diff --git a/examples/2m_1:4l-gp_on_pole.nec b/examples/2m_1:4l-horiz_gp_on_pole.nec
similarity index 86%
copy from examples/2m_1:4l-gp_on_pole.nec
copy to examples/2m_1:4l-horiz_gp_on_pole.nec
index 091b535..a55e477 100644
--- a/examples/2m_1:4l-gp_on_pole.nec
+++ b/examples/2m_1:4l-horiz_gp_on_pole.nec
@@ -1,8 +1,8 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Ground Plane for 2m mounted on a 3m pole
CM It just shows where your RF goes with such a setup ;-)
CE --- End Comments ---
-GW 1 13 0.00000E+00 0.00000E+00 0.00000E+00 -3.40000E-01 0.00000E+00 -3.40000E-01 7.50000E-03
+GW 1 13 0.00000E+00 0.00000E+00 0.00000E+00 4.80000E-01 0.00000E+00 0.00000E+00 7.50000E-03
GR 0 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
GW 2 13 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 4.80000E-01 7.50000E-03
GW 3 75 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 -3.00000E+00 2.50000E-02
diff --git a/examples/2m_5:8l-gp_on_pole.nec b/examples/2m_5:8l-gp_on_pole.nec
index f7e9e29..9304a63 100644
--- a/examples/2m_5:8l-gp_on_pole.nec
+++ b/examples/2m_5:8l-gp_on_pole.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 5/8 lambda Ground Plane for 2m mounted on a 3m pole
CM It just shows where your RF goes with such a setup ;-)
CE --- End Comments ---
diff --git a/examples/2m_EME_ant.nec b/examples/2m_EME_ant.nec
index 77354a9..b9dda39 100644
--- a/examples/2m_EME_ant.nec
+++ b/examples/2m_EME_ant.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM EME antenna for 2m, with extended double Zeppelin driven element
CM and reflector. Director is traditional Yagi sized in length.
CM Feeding is done with a balanced line harness, not shown here.
diff --git a/examples/2m_Lindenblad.nec b/examples/2m_Lindenblad.nec
new file mode 100644
index 0000000..ad057d2
--- /dev/null
+++ b/examples/2m_Lindenblad.nec
@@ -0,0 +1,17 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM A Lindnblad omnidirectional RHCP antenna for 2m
+CE --- End Comments ---
+GW 1 31 2.53000E-01 0.00000E+00 4.88000E-01 2.53000E-01 0.00000E+00 -4.88000E-01 6.00000E-03
+GM 0 0 -6.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GR 1 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 5 1 0.00000E+00 0.00000E+00 -1.00000E-02 0.00000E+00 0.00000E+00 1.00000E-02 1.50000E-02
+GM 0 0 -4.50000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 5.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 5 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 5 1 1 16 -3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 5 1 2 16 -3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 5 1 3 16 -3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 5 1 4 16 -3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 81 0 0 1.20000E+02 5.00000E-01 1.60000E+02 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 1.00000E+01 1.00000E+01 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/2m_bigwheel.nec b/examples/2m_bigwheel.nec
index 94291ef..877a3b9 100644
--- a/examples/2m_bigwheel.nec
+++ b/examples/2m_bigwheel.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Big Wheel horizontally polarized omni antenna for 2m
CE --- End Comments ---
GA 1 21 6.65000E-01 0.00000E+00 7.00000E+01 3.00000E-03 2.06474E+00 0.00000E+00 0.00000E+00
diff --git a/examples/2m_extended_Xpol_yagi.nec b/examples/2m_extended_Xpol_yagi.nec
index e0308da..eb78e34 100644
--- a/examples/2m_extended_Xpol_yagi.nec
+++ b/examples/2m_extended_Xpol_yagi.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM X-polarized extended Yagi - RHCP
CE --- End Comments ---
GW 1 61 1.39500E+00 0.00000E+00 0.00000E+00 -1.39500E+00 0.00000E+00 0.00000E+00 7.50000E-03
diff --git a/examples/2m_extended_yagi.nec b/examples/2m_extended_yagi.nec
index f1f69eb..b7fdf8f 100644
--- a/examples/2m_extended_yagi.nec
+++ b/examples/2m_extended_yagi.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 2m Extended Yagi
CE --- End Comments ---
GW 1 61 1.39500E+00 0.00000E+00 0.00000E+00 -1.39500E+00 0.00000E+00 0.00000E+00 7.50000E-03
diff --git a/examples/2m_halo_stack.nec b/examples/2m_halo_stack.nec
index 7444cb4..d0874dc 100644
--- a/examples/2m_halo_stack.nec
+++ b/examples/2m_halo_stack.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM A stack of two halo antennas for 2m. Note that the
CM circumference of the halos is .625l, not 0.5l
CE --- End Comments ---
diff --git a/examples/2m_sqr_halo.nec b/examples/2m_sqr_halo.nec
index 3d97958..908deeb 100644
--- a/examples/2m_sqr_halo.nec
+++ b/examples/2m_sqr_halo.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM A square halo antenna for 2m. Circumference is 0.625l
CE --- End Comments ---
GW 1 7 -1.62000E-01 1.62000E-01 0.00000E+00 1.62000E-01 1.62000E-01 0.00000E+00 6.00000E-03
diff --git a/examples/2m_sqr_halo_stack.nec b/examples/2m_sqr_halo_stack.nec
index 17d2ef7..6ee7661 100644
--- a/examples/2m_sqr_halo_stack.nec
+++ b/examples/2m_sqr_halo_stack.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM A stack of two square halos for 2m. Circumference is 0.625l
CE --- End Comments ---
GW 1 7 -1.62000E-01 1.62000E-01 0.00000E+00 1.62000E-01 1.62000E-01 0.00000E+00 6.00000E-03
diff --git a/examples/2m_xpol_omni.nec b/examples/2m_xpol_omni.nec
index e55e41c..997db11 100644
--- a/examples/2m_xpol_omni.nec
+++ b/examples/2m_xpol_omni.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Cross-polarized omni-directional antenna for 144 MHz
CE --- End Comments ---
GW 1 20 0.00000E+00 0.00000E+00 2.00000E-02 6.92700E-01 2.51900E-01 2.61800E-01 3.00000E-03
diff --git a/examples/2m_xpol_omni_stack.nec b/examples/2m_xpol_omni_stack.nec
index 21227f4..96da025 100644
--- a/examples/2m_xpol_omni_stack.nec
+++ b/examples/2m_xpol_omni_stack.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Vertically-stacked omni-directional RH-polarized anrtenna for 2m
CE --- End Comments ---
GW 1 20 0.00000E+00 0.00000E+00 2.00000E-02 6.92700E-01 2.51900E-01 2.61800E-01 3.00000E-03
diff --git a/examples/2m_yagi.nec b/examples/2m_yagi.nec
index 61900ba..43aba4c 100644
--- a/examples/2m_yagi.nec
+++ b/examples/2m_yagi.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Yagi for 145 MHz
CE --- End Comments ---
GW 1 25 0.00000E+00 5.09000E-01 0.00000E+00 0.00000E+00 -5.09000E-01 0.00000E+00 5.00000E-03
diff --git a/examples/30-80m_inv_L.nec b/examples/30-80m_inv_L.nec
index 70f4ac5..2994969 100644
--- a/examples/30-80m_inv_L.nec
+++ b/examples/30-80m_inv_L.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 30-80m Inverted L antenna
CE --- End Comments ---
GW 1 31 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.68000E+01 1.50000E-03
diff --git a/examples/35-55MHz_logper.nec b/examples/35-55MHz_logper.nec
index 99d8759..818445d 100644
--- a/examples/35-55MHz_logper.nec
+++ b/examples/35-55MHz_logper.nec
@@ -1,26 +1,26 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 12 ELEMENT LOG PERIODIC ANTENNA IN FREE SPACE.
CM 78 SEGMENTS. SIGMA=D/L RECEIVING AND TRANS. PATTERNS.
CM DIPOLE LENGTH TO DIAMETER RATIO=150.
CM TAU=0.93, SIGMA=0.70, BOOM IMPEDANCE=50. OHMS.
CE --- End Comments ---
-GW 1 9 0.00000E+00 -1.00000E+00 0.00000E+00 0.00000E+00 1.00000E+00 0.00000E+00 7.00000E-03
-GW 2 9 -7.53000E-01 -1.07500E+00 0.00000E+00 -7.53000E-01 1.07500E+00 0.00000E+00 7.00000E-03
-GW 3 9 -1.56200E+00 -1.15600E+00 0.00000E+00 -1.56200E+00 1.15600E+00 0.00000E+00 8.00000E-03
-GW 4 11 -2.43200E+00 -1.24300E+00 0.00000E+00 -2.43200E+00 1.24300E+00 0.00000E+00 8.00000E-03
-GW 5 11 -3.36800E+00 -1.33700E+00 0.00000E+00 -3.36800E+00 1.33700E+00 0.00000E+00 9.00000E-03
-GW 6 11 -4.37400E+00 -1.43700E+00 0.00000E+00 -4.37400E+00 1.43700E+00 0.00000E+00 1.00000E-02
-GW 7 13 -5.45600E+00 -1.54600E+00 0.00000E+00 -5.45600E+00 1.54600E+00 0.00000E+00 1.00000E-02
-GW 8 13 -6.62000E+00 -1.66200E+00 0.00000E+00 -6.62000E+00 1.66200E+00 0.00000E+00 1.10000E-02
-GW 9 15 -7.87000E+00 -1.78700E+00 0.00000E+00 -7.87000E+00 1.78700E+00 0.00000E+00 1.20000E-02
-GW 10 15 -9.21600E+00 -1.92100E+00 0.00000E+00 -9.21600E+00 1.92100E+00 0.00000E+00 1.30000E-02
-GW 11 17 -1.06600E+01 -2.06600E+00 0.00000E+00 -1.06600E+01 2.06600E+00 0.00000E+00 1.40000E-02
-GW 12 17 -1.22200E+01 -2.22200E+00 0.00000E+00 -1.22200E+01 2.22200E+00 0.00000E+00 1.50000E-02
-GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 6.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 9 0.00000E+00 -1.00000E+00 0.00000E+00 0.00000E+00 1.00000E+00 0.00000E+00 7.00000E-03
+GW 2 9 -7.53000E-01 -1.07500E+00 0.00000E+00 -7.53000E-01 1.07500E+00 0.00000E+00 7.00000E-03
+GW 3 9 -1.56200E+00 -1.15600E+00 0.00000E+00 -1.56200E+00 1.15600E+00 0.00000E+00 8.00000E-03
+GW 4 11 -2.43200E+00 -1.24300E+00 0.00000E+00 -2.43200E+00 1.24300E+00 0.00000E+00 8.00000E-03
+GW 5 11 -3.36800E+00 -1.33700E+00 0.00000E+00 -3.36800E+00 1.33700E+00 0.00000E+00 9.00000E-03
+GW 6 11 -4.37400E+00 -1.43700E+00 0.00000E+00 -4.37400E+00 1.43700E+00 0.00000E+00 1.00000E-02
+GW 7 13 -5.45600E+00 -1.54600E+00 0.00000E+00 -5.45600E+00 1.54600E+00 0.00000E+00 1.00000E-02
+GW 8 13 -6.62000E+00 -1.66200E+00 0.00000E+00 -6.62000E+00 1.66200E+00 0.00000E+00 1.10000E-02
+GW 9 15 -7.87000E+00 -1.78700E+00 0.00000E+00 -7.87000E+00 1.78700E+00 0.00000E+00 1.20000E-02
+GW 10 15 -9.21600E+00 -1.92100E+00 0.00000E+00 -9.21600E+00 1.92100E+00 0.00000E+00 1.30000E-02
+GW 11 17 -1.06600E+01 -2.06600E+00 0.00000E+00 -1.06600E+01 2.06600E+00 0.00000E+00 1.40000E-02
+GW 12 17 -1.22200E+01 -2.22200E+00 0.00000E+00 -1.22200E+01 2.22200E+00 0.00000E+00 1.50000E-02
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 6.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
FR 0 21 0 0 3.50000E+01 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
LD 5 0 0 0 3.70000E+07 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-TL 1 5 2 5 -5.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 1 5 2 5 -5.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
TL 2 5 3 5 -5.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
TL 3 5 4 6 -5.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
TL 4 6 5 6 -5.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/40-80m_Inv_L.nec b/examples/40-80m_Inv_L.nec
index 15de37c..17e35f1 100644
--- a/examples/40-80m_Inv_L.nec
+++ b/examples/40-80m_Inv_L.nec
@@ -1,10 +1,11 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM An Inverted-L antenna for 40-80m bands
CE --- End Comments ---
GW 1 20 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.20000E+01 1.25000E-03
GW 2 26 0.00000E+00 0.00000E+00 1.20000E+01 1.60000E+01 0.00000E+00 1.20000E+01 1.25000E-03
GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 1 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 101 0 0 3.00000E+00 5.00000E-02 8.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 101 0 0 3.00000E+00 5.00000E-02 8.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
GN 0 16 0 0 1.20000E+01 1.00000E-02 1.00000E+01 5.00000E-03 0.00000E+00 0.00000E+00
LD 0 1 1 1 1.00000E-01 1.50000E-05 6.00000E-11 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/40m-moxon.nec b/examples/40m-moxon.nec
index 5859236..735f65b 100644
--- a/examples/40m-moxon.nec
+++ b/examples/40m-moxon.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Moxon antenna for 40m
CE --- End Comments ---
GW 1 19 2.56000E+00 0.00000E+00 2.00000E+00 2.56000E+00 0.00000E+00 1.74000E+01 1.50000E-03
diff --git a/examples/6-17m_bipyramid.nec b/examples/6-17m_bipyramid.nec
index 56206c8..ae82ce9 100644
--- a/examples/6-17m_bipyramid.nec
+++ b/examples/6-17m_bipyramid.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Skeleton bi-pyramid antenna for 14-52 MHz
CE --- End Comments ---
GW 1 18 1.34400E+00 0.00000E+00 1.62400E+00 0.00000E+00 0.00000E+00 1.12000E-01 3.00000E-03
diff --git a/examples/6-20m_inv_cone.nec b/examples/6-20m_inv_cone.nec
index e18668c..c6e5b4c 100644
--- a/examples/6-20m_inv_cone.nec
+++ b/examples/6-20m_inv_cone.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Skeleton bi-pyramid antenna for 14-52 MHz
CE --- End Comments ---
GW 1 25 0.00000E+00 0.00000E+00 1.12000E-01 1.06000E+00 0.00000E+00 3.00000E+00 3.00000E-03
diff --git a/examples/6m_big-square_stack.nec b/examples/6m_big-square_stack.nec
index 43c3344..f55c8f3 100644
--- a/examples/6m_big-square_stack.nec
+++ b/examples/6m_big-square_stack.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Big Square horizontally polarized omni antenna for 2m
CE --- End Comments ---
GW 1 16 0.00000E+00 0.00000E+00 5.00000E-02 1.75800E+00 0.00000E+00 0.00000E+00 6.00000E-03
diff --git a/examples/6m_bigwheel-stack.nec b/examples/6m_bigwheel-stack.nec
index bd8fc01..8392d35 100644
--- a/examples/6m_bigwheel-stack.nec
+++ b/examples/6m_bigwheel-stack.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Big Wheel horizontally polarized omni antenna for 2m
CE --- End Comments ---
GA 1 21 1.85000E+00 0.00000E+00 7.00000E+01 6.00000E-03 1.97451E+00 0.00000E+00 0.00000E+00
diff --git a/examples/6m_horizomni.nec b/examples/6m_horizomni.nec
index c2c45d2..a247656 100644
--- a/examples/6m_horizomni.nec
+++ b/examples/6m_horizomni.nec
@@ -1,11 +1,12 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM An Omnidirectional Horizontally Polarized antenna for 6m
CE --- End Comments ---
GW 1 15 -5.00000E-01 -4.90000E-01 0.00000E+00 5.00000E-01 -4.90000E-01 0.00000E+00 1.50000E-03
GW 1 15 -5.00000E-01 -4.90000E-01 0.00000E+00 -5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
GW 1 15 5.00000E-01 -4.90000E-01 0.00000E+00 5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
GW 1 7 2.00000E-02 4.90000E-01 0.00000E+00 5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
GW 1 7 -2.00000E-02 4.90000E-01 0.00000E+00 -5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
-GW 2 1 -3.00000E-02 -4.90000E-01 -2.26000E+00 3.00000E-02 -4.90000E-01 -2.26000E+00 5.00000E-03
+GW 2 1 -3.00000E-02 -4.90000E-01 -2.26000E+00 3.00000E-02 -4.90000E-01 -2.26000E+00 5.00000E-03
GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 2 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
TL 1 8 2 1 4.50000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/70cm_collinear.nec b/examples/70cm_collinear.nec
index a32ec0c..b0dace4 100644
--- a/examples/70cm_collinear.nec
+++ b/examples/70cm_collinear.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM 432 MHz stacked Extended Double Zeppelin with two
CM reflectors and directors mounted on driven elements
CE --- End Comments ---
diff --git a/examples/80m_zepp.nec b/examples/80m_zepp.nec
index bebafa4..4227b79 100644
--- a/examples/80m_zepp.nec
+++ b/examples/80m_zepp.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Balloon Vertical for 80m. 1/2 wave fed with 1/4 wave feeder.
CE --- End Comments ---
GW 1 27 0.00000E+00 0.00000E+00 2.00000E+01 0.00000E+00 0.00000E+00 6.05000E+01 1.50000E-03
diff --git a/examples/T12m-H24m.nec b/examples/T12m-H24m.nec
index 45f5781..aa36237 100644
--- a/examples/T12m-H24m.nec
+++ b/examples/T12m-H24m.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM T Antenna for Medium Wave band
CE --- End Comments ---
GW 2 1 0.00000E+00 6.00000E+00 2.40000E+01 1.50000E+00 6.00000E+00 2.40000E+01 2.50000E-03
diff --git a/examples/T20m-H18m.nec b/examples/T20m-H18m.nec
index 6eb40a8..78756ff 100644
--- a/examples/T20m-H18m.nec
+++ b/examples/T20m-H18m.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM T antenna for the high end of the MW band
CE --- End Comments ---
GW 2 1 0.00000E+00 1.00000E+01 1.80000E+01 1.50000E+00 1.00000E+01 1.80000E+01 2.50000E-03
diff --git a/examples/airplane.nec b/examples/airplane.nec
index 68f2aaa..e4c024e 100644
--- a/examples/airplane.nec
+++ b/examples/airplane.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Jet plane with trailing wire antenna
CE --- End Comments ---
GW 1 1 7.69703E+00 -3.05237E-01 1.51819E+00 7.69703E+00 7.00000E-06 1.51819E+00 1.00000E-02
diff --git a/examples/buoy.nec b/examples/buoy.nec
index 6f21b23..cd58933 100644
--- a/examples/buoy.nec
+++ b/examples/buoy.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Short vertical antenna over sea as ground (buoy)
CM Base loaded for resonance around 13.75 MHz
CE --- End Comments ---
diff --git a/examples/gray_hoverman.nec b/examples/gray_hoverman.nec
index 3cf0372..1d14791 100644
--- a/examples/gray_hoverman.nec
+++ b/examples/gray_hoverman.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Gray-Hoverman - Patch Reflector
CE --- End Comments ---
GW 1 15 2.76500E-01 0.00000E+00 4.03500E-01 1.34500E-01 0.00000E+00 4.03500E-01 2.50000E-03
diff --git a/examples/k9ay_5b4az.nec b/examples/k9ay_5b4az.nec
index 367e27a..0dc9fff 100644
--- a/examples/k9ay_5b4az.nec
+++ b/examples/k9ay_5b4az.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM K9AY directional small receiving loop 1.8-4.0 MHz.
CM By connecting two adjacent feed points in parallel,
CM the radiation pattern can be rotated 45 degrees so
diff --git a/examples/k9ay_orig.nec b/examples/k9ay_orig.nec
index 5a43e39..8b5513e 100644
--- a/examples/k9ay_orig.nec
+++ b/examples/k9ay_orig.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM K9AY directional small receiving loop 1.8-4.0 MHz
CE --- End Comments ---
GW 1 8 0.00000E+00 0.00000E+00 8.50000E+00 5.00000E+00 0.00000E+00 1.50000E+00 1.50000E-03
diff --git a/examples/satellite.nec b/examples/satellite.nec
index d9afde6..fdfdcfa 100644
--- a/examples/satellite.nec
+++ b/examples/satellite.nec
@@ -1,4 +1,4 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM CYLINDER WITH ATTACHED WIRES
CE --- End Comments ---
SP 0 0 1.00000E-01 0.00000E+00 7.33300E-02 0.00000E+00 0.00000E+00 3.84000E-03 0.00000E+00
diff --git a/src/Makefile.am b/src/Makefile.am
index 9886e76..0652ba4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-#AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
+AM_LDFLAGS = -Wl,--as-needed
AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
-fstack-protector -Wformat -Werror=format-security -fpie
diff --git a/src/Makefile.in b/src/Makefile.in
index b397556..5b598f8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,8 +14,6 @@
@SET_MAKE@
-#AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
-
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -297,6 +295,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+AM_LDFLAGS = -Wl,--as-needed
AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
-fstack-protector -Wformat -Werror=format-security -fpie
diff --git a/src/calculations.c b/src/calculations.c
index 6824327..759694e 100644
--- a/src/calculations.c
+++ b/src/calculations.c
@@ -60,8 +60,8 @@ void qdsrc( int is, complex double v, complex double *e )
data.icon1[is]= i;
dataj.s= data.si[is]*.5;
curd= CCJ* v/(( log(2.0 * dataj.s/ data.bi[is])-1.0) *
- ( segj.bx[segj.jsno-1] * cos( TP* dataj.s) +
- segj.cx[segj.jsno-1] * sin( TP* dataj.s))* data.wlam);
+ ( segj.bx[segj.jsno-1] * cos( TWOPI* dataj.s) +
+ segj.cx[segj.jsno-1] * sin( TWOPI* dataj.s))* data.wlam);
vsorc.vqds[vsorc.nqds]= v;
vsorc.iqds[vsorc.nqds]= is+1;
vsorc.nqds++;
@@ -290,8 +290,8 @@ void cabc( complex double *curx)
data.icon1[i]= jx;
sh= data.si[i]*.5;
curd= CCJ* vsorc.vqds[is]/( (log(2.0* sh/ data.bi[i])-1.0) *
- (segj.bx[segj.jsno-1]* cos(TP* sh)+ segj.cx[segj.jsno-1] *
- sin(TP* sh))* data.wlam );
+ (segj.bx[segj.jsno-1]* cos(TWOPI* sh)+ segj.cx[segj.jsno-1] *
+ sin(TWOPI* sh))* data.wlam );
ar= creal( curd);
ai= cimag( curd);
@@ -1323,7 +1323,7 @@ trio( int j )
/* cang returns the phase angle of a complex number in degrees. */
double cang( complex double z )
{
- return( carg(z)*TD );
+ return( carg(z)*TODEG );
}
/*-----------------------------------------------------------------------*/
@@ -1350,8 +1350,8 @@ zint( double sigl, double rolam, complex double *zint )
#define th(d) ( (((((cc1*(d)+cc2)*(d)+cc3)*(d)+cc4)*(d)+cc5)*(d)+cc6)*(d) + cc7 )
#define ph(d) ( (((((cc8*(d)+cc9)*(d)+cc10)*(d)+cc11)*(d)+cc12)*(d)+cc13)*(d)+cc14 )
-#define f(d) ( csqrt(POT/(d))*cexp(-cn*(d)+th(-8.0/x)) )
-#define g(d) ( cexp(cn*(d)+th(8.0/x))/csqrt(TP*(d)) )
+#define f(d) ( csqrt(PITWO/(d))*cexp(-cn*(d)+th(-8.0/x)) )
+#define g(d) ( cexp(cn*(d)+th(8.0/x))/csqrt(TWOPI*(d)) )
double x;
double tpcmu = 2.368705e+3;
diff --git a/src/callback_func.c b/src/callback_func.c
index 0619f94..2dbd0bd 100644
--- a/src/callback_func.c
+++ b/src/callback_func.c
@@ -328,7 +328,7 @@ Close_Windows( void )
/* Open_Editor()
*
- * Pops up a Editor window on user
+ * Pops up an Editor window on user
* right-click on a NEC2 Editor treeview
*/
gboolean
@@ -347,7 +347,7 @@ Open_Editor( GtkTreeView *view )
/* Get the "card" name from first column */
gtk_tree_model_get( model, &iter, 0, &card, -1);
- size_t s = strlen( card );
+ size_t s = strlen( card ) + 1;
/* Some "cards" have common editors */
if( strcmp(card, "GC") == 0 )
diff --git a/src/callbacks.c b/src/callbacks.c
index 3dcd572..4b82f1b 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1535,7 +1535,7 @@ on_animation_applybutton_clicked (GtkButton *button,
"animate_steps_spinbutton") );
steps = gtk_spin_button_get_value( spinbutton );
intval = (guint)(1000.0 / steps / freq);
- near_field.anim_step = (double)TP / steps;
+ near_field.anim_step = (double)TWOPI / steps;
SetFlag( NEAREH_ANIMATE );
if( anim_tag > 0 )
@@ -1569,7 +1569,7 @@ on_animation_okbutton_clicked (GtkButton *button,
"animate_steps_spinbutton") );
steps = gtk_spin_button_get_value( spinbutton );
intval = (guint)(1000.0 / steps / freq);
- near_field.anim_step = (double)TP / steps;
+ near_field.anim_step = (double)TWOPI / steps;
SetFlag( NEAREH_ANIMATE );
if( anim_tag > 0 )
@@ -1770,28 +1770,33 @@ on_nec2_row_remv_clicked (GtkButton *button,
gtk_tree_selection_get_selected( selection, &model, &iter);
gtk_list_store_remove( GTK_LIST_STORE(model), &iter );
selected_treeview = NULL;
+ SetFlag( EDITOR_QUIT );
}
-void
+ void
on_nec2_treeview_clear_clicked (GtkButton *button,
- gpointer user_data)
+ gpointer user_data)
{
if( selected_treeview != NULL )
+ {
+
gtk_list_store_clear( GTK_LIST_STORE(
gtk_tree_view_get_model(selected_treeview)) );
+ SetFlag( EDITOR_QUIT );
+ }
}
gboolean
-on_nec2_cmnt_treeview_button_press_event
- (GtkWidget *widget,
+ on_nec2_cmnt_treeview_button_press_event
+ (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
selected_treeview = GTK_TREE_VIEW(widget);
if( event->button == 3 )
- Open_Editor(selected_treeview);
+ Open_Editor( selected_treeview );
return FALSE;
}
@@ -1806,7 +1811,7 @@ on_nec2_geom_treeview_button_press_event
if( event->button == 3 )
{
action = EDITOR_EDIT;
- Open_Editor(selected_treeview);
+ Open_Editor( selected_treeview );
action = EDITOR_NEW;
}
return FALSE;
@@ -1993,7 +1998,10 @@ on_gw_clicked (GtkButton *button,
wire_editor = create_wire_editor();
gtk_widget_hide( lookup_widget(wire_editor, "wire_taperframe") );
gtk_widget_show( wire_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Wire_Editor( EDITOR_APPLY );
+
Wire_Editor( action );
action = EDITOR_NEW;
}
@@ -2007,7 +2015,10 @@ on_ga_clicked (GtkButton *button,
{
arc_editor = create_arc_editor();
gtk_widget_show( arc_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Arc_Editor( EDITOR_APPLY );
+
Arc_Editor( action );
action = EDITOR_NEW;
}
@@ -2021,7 +2032,10 @@ on_gh_clicked (GtkButton *button,
{
helix_editor = create_helix_editor();
gtk_widget_show( helix_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Helix_Editor( EDITOR_APPLY );
+
Helix_Editor( action );
action = EDITOR_NEW;
}
@@ -2035,7 +2049,10 @@ on_sp_clicked (GtkButton *button,
{
patch_editor = create_patch_editor();
gtk_widget_show( patch_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Patch_Editor( EDITOR_APPLY );
+
Patch_Editor( action );
action = EDITOR_NEW;
}
@@ -2049,7 +2066,10 @@ on_gr_clicked (GtkButton *button,
{
cylinder_editor = create_cylinder_editor();
gtk_widget_show( cylinder_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Cylinder_Editor( EDITOR_APPLY );
+
Cylinder_Editor( action );
action = EDITOR_NEW;
}
@@ -2063,7 +2083,10 @@ on_gm_clicked (GtkButton *button,
{
transform_editor = create_transform_editor();
gtk_widget_show( transform_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Transform_Editor( EDITOR_APPLY );
+
Transform_Editor( action );
action = EDITOR_NEW;
}
@@ -2077,7 +2100,10 @@ on_gx_clicked (GtkButton *button,
{
reflect_editor = create_reflect_editor();
gtk_widget_show( reflect_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Reflect_Editor( EDITOR_APPLY );
+
Reflect_Editor( action );
action = EDITOR_NEW;
}
@@ -2091,7 +2117,10 @@ on_gs_clicked (GtkButton *button,
{
scale_editor = create_scale_editor();
gtk_widget_show( scale_editor );
+ ClearFlag( EDITOR_QUIT );
}
+ else Scale_Editor( EDITOR_APPLY );
+
Scale_Editor( action );
action = EDITOR_NEW;
}
@@ -2105,7 +2134,10 @@ on_ex_clicked (GtkButton *button,
{
excitation_command = create_excitation_command();
gtk_widget_show( excitation_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Excitation_Command( EDITOR_APPLY );
+
Excitation_Command( action );
action = EDITOR_NEW;
}
@@ -2119,7 +2151,10 @@ on_fr_clicked (GtkButton *button,
{
frequency_command = create_frequency_command();
gtk_widget_show( frequency_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Frequency_Command( EDITOR_APPLY );
+
Frequency_Command( action );
action = EDITOR_NEW;
}
@@ -2133,7 +2168,10 @@ on_gn_clicked (GtkButton *button,
{
ground_command = create_ground_command();
gtk_widget_show( ground_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Ground_Command( EDITOR_APPLY );
+
Ground_Command( action );
action = EDITOR_NEW;
}
@@ -2147,7 +2185,10 @@ on_gd_clicked (GtkButton *button,
{
ground2_command = create_ground2_command();
gtk_widget_show( ground2_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Ground2_Command( EDITOR_APPLY );
+
Ground2_Command( action );
action = EDITOR_NEW;
}
@@ -2161,7 +2202,10 @@ on_rp_clicked (GtkButton *button,
{
radiation_command = create_radiation_command();
gtk_widget_show( radiation_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Radiation_Command( EDITOR_APPLY );
+
Radiation_Command( action );
action = EDITOR_NEW;
}
@@ -2175,7 +2219,10 @@ on_ld_clicked (GtkButton *button,
{
loading_command = create_loading_command();
gtk_widget_show( loading_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Loading_Command( EDITOR_APPLY );
+
Loading_Command( action );
action = EDITOR_NEW;
}
@@ -2189,7 +2236,10 @@ on_nt_clicked (GtkButton *button,
{
network_command = create_network_command();
gtk_widget_show( network_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Network_Command( EDITOR_APPLY );
+
Network_Command( action );
action = EDITOR_NEW;
}
@@ -2203,7 +2253,10 @@ on_tl_clicked (GtkButton *button,
{
txline_command = create_txline_command();
gtk_widget_show( txline_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Txline_Command( EDITOR_APPLY );
+
Txline_Command( action );
action = EDITOR_NEW;
}
@@ -2217,7 +2270,10 @@ on_ne_clicked (GtkButton *button,
{
nearfield_command = create_nearfield_command();
gtk_widget_show( nearfield_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Nearfield_Command( EDITOR_APPLY );
+
Nearfield_Command( action );
action = EDITOR_NEW;
}
@@ -2231,7 +2287,10 @@ on_ek_clicked (GtkButton *button,
{
kernel_command = create_kernel_command();
gtk_widget_show( kernel_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Kernel_Command( EDITOR_APPLY );
+
Kernel_Command( action );
action = EDITOR_NEW;
}
@@ -2245,7 +2304,10 @@ on_kh_clicked (GtkButton *button,
{
intrange_command = create_intrange_command();
gtk_widget_show( intrange_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Intrange_Command( EDITOR_APPLY );
+
Intrange_Command( action );
action = EDITOR_NEW;
}
@@ -2259,7 +2321,10 @@ on_xq_clicked (GtkButton *button,
{
execute_command = create_execute_command();
gtk_widget_show( execute_command );
+ ClearFlag( EDITOR_QUIT );
}
+ else Execute_Command( EDITOR_APPLY );
+
Execute_Command( action );
action = EDITOR_NEW;
}
diff --git a/src/cmnd_edit.c b/src/cmnd_edit.c
index 877004d..5b48bbd 100644
--- a/src/cmnd_edit.c
+++ b/src/cmnd_edit.c
@@ -105,8 +105,17 @@ Excitation_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, excitation_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( excitation_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_ex, iv, fv );
save = FALSE;
@@ -367,8 +376,17 @@ Frequency_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, frequency_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( frequency_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_fr, iv, fv );
save = FALSE;
@@ -578,8 +596,17 @@ Ground_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, ground_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( ground_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_gn, iv, fv );
if( both )
@@ -999,8 +1026,17 @@ Ground2_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, ground2_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( ground2_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_gd, iv, fv );
save = FALSE;
@@ -1175,8 +1211,17 @@ Radiation_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, radiation_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( radiation_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_rp, iv, fv );
save = FALSE;
@@ -1465,8 +1510,17 @@ Loading_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, loading_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( loading_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_ld, iv, fv );
save = FALSE;
@@ -1726,8 +1780,17 @@ Network_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, network_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( network_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_nt, iv, fv );
save = FALSE;
@@ -1862,8 +1925,17 @@ Txline_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, txline_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( txline_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Command_Data( cmnd_store, &iter_tl, iv, fv );
save = FALSE;
@@ -2045,8 +2117,17 @@ Nearfield_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up(&busy, nearfield_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( nearfield_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
if( nref )
Set_Command_Data( cmnd_store, &iter_ne, iv, fv );
@@ -2303,8 +2384,17 @@ Kernel_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, kernel_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( kernel_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
/* Set EK card data */
if( gtk_list_store_iter_is_valid(cmnd_store, &iter_ek) )
@@ -2423,8 +2513,17 @@ Intrange_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, intrange_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( intrange_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
/* Set KH card data */
if( gtk_list_store_iter_is_valid(cmnd_store, &iter_kh) )
@@ -2544,8 +2643,17 @@ Execute_Command( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, execute_command) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( execute_command );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
/* Set XQ card data */
if( gtk_list_store_iter_is_valid(cmnd_store, &iter_xq) )
diff --git a/src/common.h b/src/common.h
index a8967a4..53ce45a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -46,10 +46,10 @@
/* common constants */
#define PI 3.141592654
-#define POT 1.570796327
-#define TP 6.283185308
-#define TA 1.745329252E-02
-#define TD 57.29577951
+#define PITWO 1.570796327
+#define TWOPI 6.283185308
+#define TORAD 1.745329252E-02
+#define TODEG 57.29577951
#define ETA 376.73
#define CVEL 299.8
#define CONST1 (0.0+I*4.771341189)
@@ -164,6 +164,9 @@
#define ALLOC_RDPAT_BUFF 0x0000200000000000ll
#define ALLOC_PNTING_BUFF 0x0000400000000000ll
+/* Force editors to quit */
+#define EDITOR_QUIT 0x0000800000000000ll
+
#define ALL_FLAGS 0xffffffffffffffffll
/* Type of near field data requested */
diff --git a/src/draw_radiation.c b/src/draw_radiation.c
index 313a2e5..9fac9f1 100644
--- a/src/draw_radiation.c
+++ b/src/draw_radiation.c
@@ -109,8 +109,8 @@ Draw_Radiation_Pattern( void )
double theta, phi, r, r_min, r_range;
/* theta and phi step in rads */
- double dth = (double)fpat.dth * (double)TA;
- double dph = (double)fpat.dph * (double)TA;
+ double dth = (double)fpat.dth * (double)TORAD;
+ double dph = (double)fpat.dph * (double)TORAD;
/* Used to set text in labels */
gchar txt[7];
@@ -156,12 +156,12 @@ Draw_Radiation_Pattern( void )
/*** Convert radiation pattern values
* to points in 3d space in x,y,z axis ***/
pts_idx = 0;
- phi = (double)(fpat.phis * TA); /* In rads */
+ phi = (double)(fpat.phis * TORAD); /* In rads */
/* Step phi angle */
for( nph = 0; nph < fpat.nph; nph++ )
{
- theta = (double)(fpat.thets * TA); /* In rads */
+ theta = (double)(fpat.thets * TORAD); /* In rads */
/* Step theta angle */
for( nth = 0; nth < fpat.nth; nth++ )
@@ -651,7 +651,7 @@ Animate_Near_Field( gpointer udata )
/* Increment excitation phase, keep < 2pi */
wt += near_field.anim_step;
- if( wt >= (double)TP )
+ if( wt >= (double)TWOPI )
wt = 0.0;
Draw_Radiation( rdpattern_drawingarea );
@@ -820,10 +820,10 @@ Set_Gain_Style( int gs )
New_Radiation_Projection_Angle(void)
{
/* sin and cos of rad pattern rotation and inclination angles */
- rdpattern_proj_params.sin_wr = sin(rdpattern_proj_params.Wr/(double)TD);
- rdpattern_proj_params.cos_wr = cos(rdpattern_proj_params.Wr/(double)TD);
- rdpattern_proj_params.sin_wi = sin(rdpattern_proj_params.Wi/(double)TD);
- rdpattern_proj_params.cos_wi = cos(rdpattern_proj_params.Wi/(double)TD);
+ rdpattern_proj_params.sin_wr = sin(rdpattern_proj_params.Wr/(double)TODEG);
+ rdpattern_proj_params.cos_wr = cos(rdpattern_proj_params.Wr/(double)TODEG);
+ rdpattern_proj_params.sin_wi = sin(rdpattern_proj_params.Wi/(double)TODEG);
+ rdpattern_proj_params.cos_wi = cos(rdpattern_proj_params.Wi/(double)TODEG);
/* Trigger a redraw of radiation drawingarea */
if( isFlagSet(DRAW_ENABLED) )
diff --git a/src/draw_structure.c b/src/draw_structure.c
index 72f2557..4a7f29a 100644
--- a/src/draw_structure.c
+++ b/src/draw_structure.c
@@ -673,10 +673,10 @@ Redo_Currents( gpointer udata )
New_Structure_Projection_Angle(void)
{
/* sin and cos of structure rotation and inclination angles */
- structure_proj_params.sin_wr = sin(structure_proj_params.Wr/(double)TD);
- structure_proj_params.cos_wr = cos(structure_proj_params.Wr/(double)TD);
- structure_proj_params.sin_wi = sin(structure_proj_params.Wi/(double)TD);
- structure_proj_params.cos_wi = cos(structure_proj_params.Wi/(double)TD);
+ structure_proj_params.sin_wr = sin(structure_proj_params.Wr/(double)TODEG);
+ structure_proj_params.cos_wr = cos(structure_proj_params.Wr/(double)TODEG);
+ structure_proj_params.sin_wi = sin(structure_proj_params.Wi/(double)TODEG);
+ structure_proj_params.cos_wi = cos(structure_proj_params.Wi/(double)TODEG);
/* Trigger a redraw of structure drawingarea */
if( isFlagClear(INPUT_PENDING) )
diff --git a/src/editors.h b/src/editors.h
index f891a80..6dfcc11 100644
--- a/src/editors.h
+++ b/src/editors.h
@@ -32,8 +32,7 @@
/* Editor actions that imply saving */
enum SAVE_ACTION
{
- EDITOR_SAVE = 64,
- EDITOR_NEW,
+ EDITOR_NEW = 64,
EDITOR_EDIT,
EDITOR_APPLY
};
diff --git a/src/fields.c b/src/fields.c
index 2f843a5..ea02772 100644
--- a/src/fields.c
+++ b/src/fields.c
@@ -113,11 +113,11 @@ void efld( double xi, double yi,
r= sqrt( zp* zp+ rh* rh);
if( r >= dataj.rkh)
{
- rmag= TP* r;
+ rmag= TWOPI* r;
cth= zp/ r;
px= rh/ r;
txk= cmplx( cos( rmag),- sin( rmag));
- py= TP* r* r;
+ py= TWOPI* r* r;
tyk= ETA* cth* txk* cmplx(1.0,-1.0/ rmag)/ py;
tzk= ETA* px* txk* cmplx(1.0, rmag-1.0/ rmag)/(2.0* py);
tezk= tyk* cth- tzk* px;
@@ -137,10 +137,10 @@ void efld( double xi, double yi,
{
/* eksc for thin wire approx. or ekscx for extended t.w. approx. */
if( dataj.iexk != 1)
- eksc( dataj.s, zp, rh, TP, ijx, &tezs, &ters,
+ eksc( dataj.s, zp, rh, TWOPI, ijx, &tezs, &ters,
&tezc, &terc, &tezk, &terk );
else
- ekscx( dataj.b, dataj.s, zp, rh, TP, ijx, dataj.ind1,
+ ekscx( dataj.b, dataj.s, zp, rh, TWOPI, ijx, dataj.ind1,
dataj.ind2, &tezs, &ters, &tezc, &terc, &tezk, &terk);
txs= tezs* dataj.cabj+ ters* rhox;
@@ -889,7 +889,7 @@ void hintg( double xi, double yi, double zi )
continue;
r = sqrt( rsq );
- rk= TP* r;
+ rk= TWOPI* r;
cr= cos( rk);
sr= sin( rk);
gam=-( cmplx(cr,-sr)+rk*cmplx(sr,cr) )/( FPI*rsq*r )* dataj.s;
@@ -1145,10 +1145,10 @@ void hsflx( double s, double rh, double zpx,
else
rhz=1.0;
- dk= TP* dh;
+ dk= TWOPI* dh;
cdk= cos( dk);
sdk= sin( dk);
- hfk(- dk, dk, rh* TP, zp* TP, &hkr, &hki);
+ hfk(- dk, dk, rh* TWOPI, zp* TWOPI, &hkr, &hki);
*hpk= cmplx( hkr, hki);
if( rhz >= 1.0e-3)
@@ -1164,7 +1164,7 @@ void hsflx( double s, double rh, double zpx,
t2= z2a* ekr2/ r2;
*hps=( cdk*( ekr2- ekr1)- CPLX_01* sdk*( t2+ t1))* hss;
*hpc= -sdk*( ekr2+ ekr1)- CPLX_01* cdk*( t2- t1);
- cons= -CPLX_01/(2.0* TP* rh);
+ cons= -CPLX_01/(2.0* TWOPI* rh);
*hps= cons* *hps;
*hpc= cons* *hpc;
return;
@@ -1173,7 +1173,7 @@ void hsflx( double s, double rh, double zpx,
ekr1= cmplx( cdk, sdk)/( z2a* z2a);
ekr2= cmplx( cdk,- sdk)/( z1* z1);
- t1= TP*(1.0/ z1-1.0/ z2a);
+ t1= TWOPI*(1.0/ z1-1.0/ z2a);
t2= cexp( fjk* zp)* rh/PI8;
*hps= t2*( t1+( ekr1+ ekr2)* sdk)* hss;
*hpc= t2*(- CPLX_01* t1+( ekr1- ekr2)* cdk);
@@ -1426,8 +1426,8 @@ void nfpat( int nfeh )
znrt += fpat.dznr;
if( fpat.near != 0)
{
- cth= cos( TA* znrt);
- sth= sin( TA* znrt);
+ cth= cos( TORAD* znrt);
+ sth= sin( TORAD* znrt);
}
ynrt= fpat.ynr- fpat.dynr;
@@ -1436,8 +1436,8 @@ void nfpat( int nfeh )
ynrt += fpat.dynr;
if( fpat.near != 0)
{
- cph= cos( TA* ynrt);
- sph= sin( TA* ynrt);
+ cph= cos( TORAD* ynrt);
+ sph= sin( TORAD* ynrt);
}
xnrt= fpat.xnr- fpat.dxnr;
@@ -1494,18 +1494,18 @@ void nfpat( int nfeh )
near_field.hx[idx] = (double)tmp1;
near_field.hy[idx] = (double)tmp3;
near_field.hz[idx] = (double)tmp5;
- near_field.fhx[idx] = (double)(tmp2 * TA);
- near_field.fhy[idx] = (double)(tmp4 * TA);
- near_field.fhz[idx] = (double)(tmp6 * TA);
+ near_field.fhx[idx] = (double)(tmp2 * TORAD);
+ near_field.fhy[idx] = (double)(tmp4 * TORAD);
+ near_field.fhz[idx] = (double)(tmp6 * TORAD);
}
else /* Electric field */
{
near_field.ex[idx] = (double)tmp1;
near_field.ey[idx] = (double)tmp3;
near_field.ez[idx] = (double)tmp5;
- near_field.fex[idx] = (double)(tmp2 * TA);
- near_field.fey[idx] = (double)(tmp4 * TA);
- near_field.fez[idx] = (double)(tmp6 * TA);
+ near_field.fex[idx] = (double)(tmp2 * TORAD);
+ near_field.fey[idx] = (double)(tmp4 * TORAD);
+ near_field.fez[idx] = (double)(tmp6 * TORAD);
}
idx++;
@@ -1635,7 +1635,7 @@ void pcint( double xi, double yi, double zi,
ds=4.0* d/ (double) nint;
da= ds* ds;
gcon=1.0/ dataj.s;
- fcon=1.0/(2.0* TP* d);
+ fcon=1.0/(2.0* TWOPI* d);
xxj= dataj.xj;
xyj= dataj.yj;
xzj= dataj.zj;
@@ -1683,7 +1683,7 @@ void pcint( double xi, double yi, double zi,
g2=( d- s1)*( d+ s2)* gcon;
g3=( d- s1)*( d- s2)* gcon;
g4=( d+ s1)*( d- s2)* gcon;
- f2=( s1* s1+ s2* s2)* TP;
+ f2=( s1* s1+ s2* s2)* TWOPI;
f1= s1/ f2-( g1- g2- g3+ g4)* fcon;
f2= s2/ f2-( g1+ g2- g3- g4)* fcon;
e1= e1+ dataj.exk* g1;
@@ -1755,7 +1755,7 @@ void unere( double xob, double yob, double zob )
}
r= sqrt( r2);
- tt1= -TP* r;
+ tt1= -TWOPI* r;
tt2= tt1* tt1;
rt= r2* r;
er= cmplx( sin( tt1),- cos( tt1))*( CONST2* dataj.s);
@@ -1878,9 +1878,9 @@ Near_Field_Total(
eym = (double)cabs(ey);
ezm = (double)cabs(ez);
/* Near total electric field vector */
- fx = (double)cang(ex)/(double)TD;
- fy = (double)cang(ey)/(double)TD;
- fz = (double)cang(ez)/(double)TD;
+ fx = (double)cang(ex)/(double)TODEG;
+ fy = (double)cang(ey)/(double)TODEG;
+ fz = (double)cang(ez)/(double)TODEG;
fx2 = fx * 2.0;
fy2 = fy * 2.0;
diff --git a/src/geom_edit.c b/src/geom_edit.c
index f9d2769..22a09f2 100644
--- a/src/geom_edit.c
+++ b/src/geom_edit.c
@@ -96,8 +96,17 @@ Wire_Editor( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, wire_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( wire_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
/* Clear data not used in GC card */
iv[SPIN_COL_I3] = iv[SPIN_COL_I4] = 0;
@@ -496,45 +505,36 @@ Patch_Editor( int action )
static gboolean
save = FALSE, /* Enable saving of editor data */
- busy = FALSE, /* Block callbacks. Must be a better way to do this? */
- ptset = FALSE; /* Set patch type radio buttons */
+ busy = FALSE, /* Block callbacks. Must be a better way to do this? */
+ ptset = FALSE; /* Set patch type radio buttons */
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, patch_editor) ) return;
- /* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
{
- /* Clear data not used in SC card */
- iv[SPIN_COL_I3] = iv[SPIN_COL_I4] = 0;
- fv[UNUSED_F1] = fv[UNUSED_F2] = 0.0;
-
- /* Set SP data to treeview */
- Set_Geometry_Data( geom_store, &iter_sp, iv, fv );
-
- /* Set SC card data to treeview if non arbitrary */
- if( ptype != PATCH_ARBT )
- Set_Geometry_Data(geom_store,
- &iter_sc, &iv[SPIN_COL_I3], &fv[PATCH_X3]);
-
- save = FALSE;
- } /* if( (action & EDITOR_SAVE) && save ) */
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( patch_editor );
+ return;
+ }
/* Set int data from the patch editor (SP card) */
if( ptype != PATCH_SURF )
{
- iv[SPIN_COL_I1] = 0; /* Not used in SP */
+ iv[SPIN_COL_I1] = 0; /* Not used in SP */
iv[SPIN_COL_I2] = ptype; /* Patch type */
}
- /* Read int data from the patch editor (SM card) */
- else for( idi = SPIN_COL_I1; idi <= SPIN_COL_I2; idi++ )
- {
- spin = GTK_SPIN_BUTTON(
- lookup_widget(patch_editor, ispin[idi]) );
- double i = gtk_spin_button_get_value( spin );
- iv[idi] = (gint)i;
- }
+ else /* Set int data from the patch editor (SM card) */
+ for( idi = SPIN_COL_I1; idi <= SPIN_COL_I2; idi++ )
+ {
+ spin = GTK_SPIN_BUTTON(
+ lookup_widget(patch_editor, ispin[idi]) );
+ double i = gtk_spin_button_get_value( spin );
+ iv[idi] = (gint)i;
+ }
/* Read float data from the patch editor */
for( idx = PATCH_X1; idx <= PATCH_Z2; idx++ )
@@ -550,6 +550,24 @@ Patch_Editor( int action )
fv[idx] = gtk_spin_button_get_value( spin );
}
+ /* Save data to nec2 editor if appropriate */
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
+ {
+ /* Clear data not used in SC card */
+ iv[SPIN_COL_I3] = iv[SPIN_COL_I4] = 0;
+ fv[UNUSED_F1] = fv[UNUSED_F2] = 0.0;
+
+ /* Set SP data to treeview */
+ Set_Geometry_Data( geom_store, &iter_sp, iv, fv );
+
+ /* Set SC card data to treeview if non arbitrary */
+ if( ptype != PATCH_ARBT )
+ Set_Geometry_Data(geom_store,
+ &iter_sc, &iv[SPIN_COL_I3], &fv[PATCH_X3]);
+
+ save = FALSE;
+ } /* if( (action & EDITOR_SAVE) && save ) */
+
/* Respond to user action */
switch( action )
{
@@ -611,46 +629,46 @@ Patch_Editor( int action )
else stop( _("No SP or SM card before SC card"), ERR_OK );
}
} /* if( strcmp(name, "SC") == 0 ) */
- /*** Editing an SP|SM card ***/
- else if( strcmp(name, "SP") == 0 )
- {
- /* Get patch data from treeview */
- Get_Geometry_Data( geom_store, &iter_sp, iv, fv );
- ptype = iv[SPIN_COL_I2];
+ else /*** Editing an SP|SM card ***/
+ if( strcmp(name, "SP") == 0 )
+ {
+ /* Get patch data from treeview */
+ Get_Geometry_Data( geom_store, &iter_sp, iv, fv );
+ ptype = iv[SPIN_COL_I2];
- /*** Get SC card data if patch type non-arbitrary ***/
- if( ptype != PATCH_ARBT )
+ /*** Get SC card data if patch type non-arbitrary ***/
+ if( ptype != PATCH_ARBT )
+ {
+ /* If next card is SC, get data */
+ if( Check_Card_Name(geom_store, &iter_sc, NEXT, "SC") )
+ Get_Geometry_Data( geom_store, &iter_sc,
+ &iv[SPIN_COL_I3], &fv[PATCH_X3] );
+ else
+ {
+ ptype = PATCH_ARBT;
+ stop( _("No SC card after an SP card\n"\
+ "with non-arbitrary patch type"), ERR_OK );
+ }
+
+ } /* if( ptype != PATCH_ARBT ) */
+ /* If patch type arbitrary, no SC card should follow */
+ else if( Check_Card_Name(geom_store, &iter_sc, NEXT, "SC") )
+ stop( _("SC card follows an SP card\n"\
+ "with arbitrary patch type"), ERR_OK );
+ } /* if( strcmp(name, "SP") == 0 ) */
+ else /* SM card */
{
+ /* Get patch data from treeview */
+ Get_Geometry_Data( geom_store, &iter_sp, iv, fv );
+ ptype = PATCH_SURF;
+
/* If next card is SC, get data */
if( Check_Card_Name(geom_store, &iter_sc, NEXT, "SC") )
Get_Geometry_Data( geom_store, &iter_sc,
&iv[SPIN_COL_I3], &fv[PATCH_X3] );
- else
- {
- ptype = PATCH_ARBT;
- stop( _("No SC card after an SP card\n"\
- "with non-arbitrary patch type"), ERR_OK );
- }
-
- } /* if( ptype != PATCH_ARBT ) */
- /* If patch type arbitrary, no SC card should follow */
- else if( Check_Card_Name(geom_store, &iter_sc, NEXT, "SC") )
- stop( _("SC card follows an SP card\n"\
- "with arbitrary patch type"), ERR_OK );
- } /* if( strcmp(name, "SP") == 0 ) */
- else /* SM card */
- {
- /* Get patch data from treeview */
- Get_Geometry_Data( geom_store, &iter_sp, iv, fv );
- ptype = PATCH_SURF;
+ else stop( _("No SC card after an SM card"), ERR_OK );
- /* If next card is SC, get data */
- if( Check_Card_Name(geom_store, &iter_sc, NEXT, "SC") )
- Get_Geometry_Data( geom_store, &iter_sc,
- &iv[SPIN_COL_I3], &fv[PATCH_X3] );
- else stop( _("No SC card after an SM card"), ERR_OK );
-
- } /* if( strcmp(name, "SP") == 0 ) */
+ } /* if( strcmp(name, "SP") == 0 ) */
ptset = TRUE;
break;
@@ -880,8 +898,17 @@ Arc_Editor( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, arc_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( arc_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Geometry_Data( geom_store, &iter_ga, iv, fv );
@@ -980,9 +1007,9 @@ Arc_Editor( int action )
if( calc_data.mxfrq != 0.0 )
{
gdouble len = fv[ARC_RAD] *
- (gdouble)fabs( fv[ARC_END1]-fv[ARC_END2] )/(gdouble)TD;
- double i = ceil(100.0 / fv[ARC_PCL] *
- len /((gdouble)CVEL/(gdouble)calc_data.mxfrq));
+ (gdouble)fabs( fv[ARC_END1] - fv[ARC_END2] ) * (gdouble)TORAD;
+ double i = ceil( 100.0 / fv[ARC_PCL] *
+ len / ((gdouble)CVEL / (gdouble)calc_data.mxfrq) );
iv[SPIN_COL_I2] = (gint)i;
}
newpcl = FALSE;
@@ -994,9 +1021,9 @@ Arc_Editor( int action )
if( (calc_data.mxfrq != 0.0) && newpcl )
{
gdouble len = fv[ARC_RAD] *
- (gdouble)fabs( fv[ARC_END1]-fv[ARC_END2] )/(gdouble)TD;
+ (gdouble)fabs( fv[ARC_END1] - fv[ARC_END2] ) * (gdouble)TORAD;
fv[ARC_PCL] = 100.0 * (len/(gdouble)iv[SPIN_COL_I2]) /
- ((gdouble)CVEL/(gdouble)calc_data.mxfrq);
+ ((gdouble)CVEL / (gdouble)calc_data.mxfrq);
}
else newpcl = TRUE;
@@ -1044,25 +1071,25 @@ Helix_Editor( int action )
/* For reading/writing to GH rows */
static GtkTreeIter iter_gh;
- gint idx, idi;
+ gint idx;
gdouble ftmp;
static gboolean
- load = FALSE, /* Enable wire loading (conductivity specified) */
- linkall = TRUE, /* Link all radius spinbuttons */
- linkzo = FALSE, /* Link X, Y @ Z=0 spinbuttons */
- linkzhl = FALSE, /* Link X, Y @ Z=HL spinbuttons */
- helixlh = FALSE, /* Specify a left hand helix */
- newpcl = TRUE, /* New percent-of-lambda value */
- newspc = TRUE, /* New percent-of-lambda value */
- save = FALSE, /* Enable saving of editor data */
- busy = FALSE; /* Block callbacks. Must be a better way to do this? */
+ load = FALSE, /* Enable wire loading (conductivity specified) */
+ linkall = TRUE, /* Link all radius spinbuttons */
+ linkzo = FALSE, /* Link X, Y @ Z=0 spinbuttons */
+ linkzhl = FALSE, /* Link X, Y @ Z=HL spinbuttons */
+ helixlh = FALSE, /* Specify a left hand helix */
+ newpcl = TRUE, /* New percent-of-lambda value */
+ newspc = TRUE, /* New percent-of-lambda value */
+ save = FALSE, /* Enable saving of editor data */
+ busy = FALSE; /* Block callbacks. Must be a better way to do this? */
/* Float type data, wire conductivity */
- static gdouble fv[10], s = 0.0;
+ static gdouble fv[10], s = 0.0, helix_len = HELIX_LENGTH;
/* Integer type data */
- static gint iv[2];
+ static gint iv[2], seg_turn = HELIX_SEG_TURN;
/* Card (row) name */
gchar name[3];
@@ -1092,39 +1119,44 @@ Helix_Editor( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, helix_editor) ) return;
- /* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( helix_editor );
+ return;
+ }
+
+ /*** Save data to nec2 editor if appropriate ***/
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
/* Change seg/turn to total number of segs */
- gint tmp = iv[SPIN_COL_I2];
- double i = ceil( (gdouble)iv[SPIN_COL_I2] * fv[HELIX_NTURN] );
- iv[SPIN_COL_I2] = (gint)i;
+ double n = ceil( (gdouble)seg_turn * fv[HELIX_NTURN] );
+ iv[SPIN_COL_I2] = (gint)n;
/* Change to left hand helix */
- if( helixlh )
- fv[HELIX_LEN] = -fv[HELIX_LEN];
+ if( helixlh ) fv[HELIX_LEN] = -helix_len;
+ else fv[HELIX_LEN] = helix_len;
+ /* Save data to NEC2 editor treeview */
Set_Geometry_Data( geom_store, &iter_gh, iv, fv );
- /* Change back */
- iv[SPIN_COL_I2] = tmp;
- fv[HELIX_LEN] = fabs( fv[HELIX_LEN] );
-
/* Set wire conductivity (loading card) */
- if( load )
- Set_Wire_Conductivity( iv[SPIN_COL_I1], s, cmnd_store );
+ if( load ) Set_Wire_Conductivity( iv[SPIN_COL_I1], s, cmnd_store );
save = load = FALSE;
} /* if( (action & EDITOR_SAVE) && save ) */
- /* Read int data from the helix editor */
- for( idi = SPIN_COL_I1; idi <= SPIN_COL_I2; idi++ )
- {
- spin = GTK_SPIN_BUTTON(
- lookup_widget(helix_editor, ispin[idi]) );
- iv[idi] = gtk_spin_button_get_value_as_int( spin );
- }
- /* Read float data from the helix editor */
+ /*** Read int data from the helix editor ***/
+ spin = GTK_SPIN_BUTTON( lookup_widget(
+ helix_editor, ispin[SPIN_COL_I1]) );
+ iv[SPIN_COL_I1] = gtk_spin_button_get_value_as_int( spin );
+ spin = GTK_SPIN_BUTTON( lookup_widget(
+ helix_editor, ispin[SPIN_COL_I2]) );
+ seg_turn = gtk_spin_button_get_value_as_int( spin );
+
+ /*** Read float data from the helix editor ***/
for( idx = HELIX_TSPACE; idx <= HELIX_RES; idx++ )
{
spin = GTK_SPIN_BUTTON(
@@ -1132,6 +1164,7 @@ Helix_Editor( int action )
fv[idx] = gtk_spin_button_get_value( spin );
}
fv[HELIX_DIA] /= 2.0;
+ helix_len = fv[SPIN_COL_F2];
/* Link all radius spinbuttons to X @ Z=0 */
if( linkall )
@@ -1145,7 +1178,7 @@ Helix_Editor( int action )
if( linkzhl )
fv[HELIX_RYZHL] = fv[HELIX_RXZHL];
- /* Respond to user action */
+ /*** Respond to user action ***/
switch( action )
{
case EDITOR_NEW: /* New helix row to create */
@@ -1179,7 +1212,7 @@ Helix_Editor( int action )
Get_Wire_Conductivity(iv[SPIN_COL_I1], &s, cmnd_store);
fv[HELIX_RES] = s;
- /* Set LH/RH helix check button */
+ /* Set LH/RH helix check button */
{
GtkToggleButton *toggle =
GTK_TOGGLE_BUTTON( lookup_widget(
@@ -1190,13 +1223,14 @@ Helix_Editor( int action )
gtk_toggle_button_set_active( toggle, FALSE );
}
- /* If left hand helix */
- fv[HELIX_LEN] = fabs( fv[HELIX_LEN] );
+ /* For left hand helix length is -ve */
+ helix_len = fabs( fv[HELIX_LEN] );
+ if( fv[HELIX_LEN] < 0.0 ) helixlh = TRUE;
+ else helixlh = FALSE;
/* Change to number of segs/turn */
- fv[HELIX_NTURN] = fv[HELIX_LEN] / fv[HELIX_TSPACE];
- iv[SPIN_COL_I2] =
- (gint)((gdouble)iv[SPIN_COL_I2] / fv[HELIX_NTURN]);
+ fv[HELIX_NTURN] = helix_len / fv[HELIX_TSPACE];
+ seg_turn = (gint)((gdouble)iv[SPIN_COL_I2] / fv[HELIX_NTURN]);
break;
case EDITOR_CANCEL: /* Cancel helix editor */
@@ -1253,7 +1287,7 @@ Helix_Editor( int action )
break;
case HELIX_EDITOR_NTURN: /* New number of turns */
- fv[HELIX_TSPACE] = fv[HELIX_LEN] / fv[HELIX_NTURN];
+ fv[HELIX_TSPACE] = helix_len / fv[HELIX_NTURN];
newspc = FALSE;
save = TRUE;
break;
@@ -1265,15 +1299,15 @@ Helix_Editor( int action )
gdouble len, f;
/* Pitch angle of helix, assumes untapered helix */
- f = asin( fv[HELIX_TSPACE] / (gdouble)TP / fv[HELIX_RXZO] );
+ f = atan( fv[HELIX_TSPACE] / (gdouble)TWOPI / fv[HELIX_RXZO] );
/* Helix turn length */
- len = (gdouble)TP * fv[HELIX_RXZO] / (gdouble)cos( f );
+ len = (gdouble)TWOPI * fv[HELIX_RXZO] / (gdouble)cos( f );
/* New number of segments */
- double i = ceil(100.0 / fv[HELIX_PCL]*len /
+ double n = ceil(100.0 / fv[HELIX_PCL] * len /
((gdouble)CVEL / (gdouble)calc_data.mxfrq) );
- iv[SPIN_COL_I2] = (gint)i;
+ seg_turn = (gint)n;
}
newpcl = FALSE;
save = TRUE;
@@ -1286,33 +1320,34 @@ Helix_Editor( int action )
gdouble len, f;
/* Pitch angle of helix, assumes untapered helix */
- f = asin( fv[HELIX_TSPACE]/(gdouble)TP/fv[HELIX_RXZO] );
+ f = atan( fv[HELIX_TSPACE]/(gdouble)TWOPI/fv[HELIX_RXZO] );
/* Helix turn length */
- len = (gdouble)TP * fv[HELIX_RXZO] / (gdouble)cos( f );
+ len = (gdouble)TWOPI * fv[HELIX_RXZO] / (gdouble)cos( f );
- fv[HELIX_PCL] = 100.0 * (len/(gdouble)iv[SPIN_COL_I2]) /
+ fv[HELIX_PCL] = 100.0 * (len / (gdouble)seg_turn) /
((gdouble)CVEL / (gdouble)calc_data.mxfrq);
}
else newpcl = TRUE;
/* Calculate new turn spacing */
if( newspc )
- fv[HELIX_NTURN] = fv[HELIX_LEN] / fv[HELIX_TSPACE];
+ fv[HELIX_NTURN] = helix_len / fv[HELIX_TSPACE];
else
newspc = TRUE;
/* Write int data to the helix editor */
- for( idi = SPIN_COL_I1; idi <= SPIN_COL_I2; idi++ )
- {
- spin = GTK_SPIN_BUTTON( lookup_widget(
- helix_editor, ispin[idi]) );
- gtk_spin_button_set_value( spin, iv[idi] );
- }
+ spin = GTK_SPIN_BUTTON( lookup_widget(
+ helix_editor, ispin[SPIN_COL_I1]) );
+ gtk_spin_button_set_value( spin, iv[SPIN_COL_I1] );
+ spin = GTK_SPIN_BUTTON( lookup_widget(
+ helix_editor, ispin[SPIN_COL_I2]) );
+ gtk_spin_button_set_value( spin, seg_turn );
/* Write float data to the helix editor */
ftmp = fv[HELIX_DIA];
fv[HELIX_DIA] *= 2.0;
+ fv[HELIX_LEN] = helix_len;
for( idx = HELIX_TSPACE; idx <= HELIX_RES; idx++ )
{
spin = GTK_SPIN_BUTTON( lookup_widget(
@@ -1367,8 +1402,17 @@ Reflect_Editor( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, reflect_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( reflect_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Geometry_Int_Data( geom_store, &iter_gx, iv );
save = FALSE;
@@ -1500,8 +1544,17 @@ Scale_Editor( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, scale_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( scale_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
/* Clear all GS columns */
for( idx = GEOM_COL_I1; idx <= GEOM_COL_F7; idx++ )
@@ -1631,14 +1684,23 @@ Cylinder_Editor( int action )
static gboolean
save = FALSE, /* Enable saving of editor data */
- busy = FALSE; /* Block callbacks. Must be a better way to do this? */
+ busy = FALSE; /* Block callbacks. Must be a better way to do this? */
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, cylinder_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( cylinder_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Geometry_Int_Data( geom_store, &iter_gr, iv );
save = FALSE;
@@ -1757,8 +1819,17 @@ Transform_Editor( int action )
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, transform_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( transform_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save )
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
Set_Geometry_Data( geom_store, &iter_gm, iv, fv );
save = FALSE;
@@ -1871,19 +1942,30 @@ Gend_Editor( int action )
static gboolean
save = FALSE, /* Enable saving of editor data */
- busy = FALSE; /* Block callbacks. Must be a better way to do this? */
+ busy = FALSE; /* Block callbacks. Must be a better way to do this? */
/* Block callbacks. (Should be a better way to do this) */
if( Give_Up( &busy, gend_editor) ) return;
+ /* Quit if forced quit flag set (treeview row removed) */
+ if( isFlagSet(EDITOR_QUIT) )
+ {
+ ClearFlag( EDITOR_QUIT );
+ save = busy = FALSE;
+ gtk_widget_destroy( gend_editor );
+ return;
+ }
+
/* Save data to nec2 editor if appropriate */
- if( (action & EDITOR_SAVE) && save &&
- gtk_list_store_iter_is_valid(geom_store, &iter_ge))
+ if( (action == EDITOR_APPLY) || ((action == EDITOR_NEW) && save) )
{
- gtk_list_store_set(
- geom_store, &iter_ge, GEOM_COL_I1, si, -1 );
- save = FALSE;
+ if( gtk_list_store_iter_is_valid(geom_store, &iter_ge) )
+ {
+ gtk_list_store_set(
+ geom_store, &iter_ge, GEOM_COL_I1, si, -1 );
+ save = FALSE;
+ }
} /* if( (action & EDITOR_SAVE) && save ) */
/* Respond to user action */
@@ -2051,7 +2133,7 @@ Set_Geometry_Data(
gint idi, idf;
/* Format and set editor data to treeview (I1, I2 & F1-F7) */
- if( gtk_list_store_iter_is_valid(store, iter) )
+ if( iter && gtk_list_store_iter_is_valid(store, iter) )
{
for( idi = GEOM_COL_I1; idi <= GEOM_COL_I2; idi++ )
{
diff --git a/src/geom_edit.h b/src/geom_edit.h
index ac4a524..7ddb395 100644
--- a/src/geom_edit.h
+++ b/src/geom_edit.h
@@ -24,5 +24,9 @@
#include "support.h"
#include "editors.h"
+/* Default values for helix editor */
+#define HELIX_SEG_TURN 8
+#define HELIX_LENGTH 5.0
+
#endif
diff --git a/src/geometry.c b/src/geometry.c
index 60bdd07..8fb8914 100644
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -87,8 +87,8 @@ arc( int itg, int ns, double rada,
mem_realloc( (void **)&data.z2, mreq, "in geometry.c" );
mem_realloc( (void **)&data.bi, mreq, "in geometry.c" );
- ang= ang1* TA;
- dang=( ang2- ang1)* TA/ ns;
+ ang= ang1* TORAD;
+ dang=( ang2- ang1)* TORAD/ ns;
xs1= rada* cos( ang);
zs1= rada* sin( ang);
@@ -1486,7 +1486,7 @@ reflc( int ix, int iy, int iz, int iti, int nop )
/* reproduce structure with rotation to form cylindrical structure */
fnop= (double)nop;
data.ipsym=-1;
- sam=TP/ fnop;
+ sam=TWOPI/ fnop;
cs= cos( sam);
ss= sin( sam);
diff --git a/src/gnuplot.c b/src/gnuplot.c
index f060ca7..35c3912 100644
--- a/src/gnuplot.c
+++ b/src/gnuplot.c
@@ -383,8 +383,8 @@ Save_RadPattern_Gnuplot_Data( char *filename )
double theta, phi, r;
/* theta and phi step in rads */
- double dth = (double)fpat.dth * (double)TA;
- double dph = (double)fpat.dph * (double)TA;
+ double dth = (double)fpat.dth * (double)TORAD;
+ double dph = (double)fpat.dph * (double)TORAD;
/* Open gplot file, abort on error */
if( !Open_File(&fp, filename, "w") )
@@ -394,13 +394,13 @@ Save_RadPattern_Gnuplot_Data( char *filename )
/* Distance of rdpattern point nearest to xyz origin */
/*** Convert radiation pattern values
* to points in 3d space in x,y,z axis ***/
- phi = (double)fpat.phis * (double)TA; /* In rads */
+ phi = (double)fpat.phis * (double)TORAD; /* In rads */
/* Step phi angle */
idx = 0;
for( nph = 0; nph < fpat.nph; nph++ )
{
- theta = (double)fpat.thets * (double)TA; /* In rads */
+ theta = (double)fpat.thets * (double)TORAD; /* In rads */
/* Step theta angle */
for( nth = 0; nth < fpat.nth; nth++ )
diff --git a/src/ground.c b/src/ground.c
index 0f5aa45..cf12713 100644
--- a/src/ground.c
+++ b/src/ground.c
@@ -286,7 +286,7 @@ sflds( double t, complex double *e )
zphs= gwav.zph* gwav.zph;
r2s= rhs+ zphs;
gwav.r2= sqrt( r2s);
- rk= gwav.r2* TP;
+ rk= gwav.r2* TWOPI;
gwav.xx2= cmplx( cos( rk),- sin( rk));
/* use norton approximation for field due to ground.
@@ -335,7 +335,7 @@ sflds( double t, complex double *e )
if( rho >= 1.0e-12)
thet= atan( gwav.zph/ rho);
else
- thet= POT;
+ thet= PITWO;
/* combine vertical and horizontal components and convert */
/* to x,y,z components. multiply by exp(-jkr)/r. */
@@ -350,7 +350,7 @@ sflds( double t, complex double *e )
e[1]= erh* rhy+ eph* phy;
e[2]= ezh;
/* x,y,z fields for sine current */
- rk= TP* t;
+ rk= TWOPI* t;
sfac= sin( rk);
e[3]= e[0]* sfac;
e[4]= e[1]* sfac;
diff --git a/src/input.c b/src/input.c
index 1cf9bc8..0b26e54 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1389,9 +1389,9 @@ datagn( void )
stop( _("datagn(): Move GM data card error"), ERR_OK );
return( FALSE );
}
- xw1= xw1* TA;
- yw1= yw1* TA;
- zw1= zw1* TA;
+ xw1= xw1* TORAD;
+ yw1= yw1* TORAD;
+ zw1= zw1* TORAD;
if( !move(xw1, yw1, zw1, xw2, yw2, zw2, (int)(rad+.5), ns, itg) )
return( FALSE );
}
@@ -1433,8 +1433,8 @@ datagn( void )
} /* if( ns > 1) */
else
{
- xw2= xw2* TA;
- yw2= yw2* TA;
+ xw2= xw2* TORAD;
+ yw2= yw2* TORAD;
}
if( !patch( itg, ns, xw1, yw1, zw1, xw2,
diff --git a/src/interface.c b/src/interface.c
index b48e015..c4faf49 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -444,7 +444,7 @@ create_main_window (void)
structure_drawingarea = gtk_drawing_area_new ();
gtk_widget_show (structure_drawingarea);
gtk_container_add (GTK_CONTAINER (alignment1), structure_drawingarea);
- gtk_widget_set_size_request (structure_drawingarea, 769, 769);
+ gtk_widget_set_size_request (structure_drawingarea, 681, 769);
GTK_WIDGET_SET_FLAGS (structure_drawingarea, GTK_CAN_FOCUS);
main_hbox3 = gtk_hbox_new (FALSE, 0);
@@ -796,7 +796,9 @@ create_filechooserdialog (void)
filechooserdialog = gtk_file_chooser_dialog_new (_("xnec2c"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (filechooserdialog), 5);
- g_object_set (filechooserdialog, "show-hidden", TRUE, NULL);
+ g_object_set (filechooserdialog,
+ "show-hidden", TRUE,
+ NULL);
gtk_window_set_position (GTK_WINDOW (filechooserdialog), GTK_WIN_POS_MOUSE);
gtk_window_set_role (GTK_WINDOW (filechooserdialog), "GtkFileChooserDialog");
gtk_window_set_type_hint (GTK_WINDOW (filechooserdialog), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -1192,7 +1194,7 @@ create_freqplots_window (void)
freqplots_drawingarea = gtk_drawing_area_new ();
gtk_widget_show (freqplots_drawingarea);
gtk_container_add (GTK_CONTAINER (alignment2), freqplots_drawingarea);
- gtk_widget_set_size_request (freqplots_drawingarea, 769, 769);
+ gtk_widget_set_size_request (freqplots_drawingarea, 1025, 769);
GTK_WIDGET_SET_FLAGS (freqplots_drawingarea, GTK_CAN_FOCUS);
gtk_widget_set_events (freqplots_drawingarea, GDK_BUTTON_PRESS_MASK);
@@ -1733,6 +1735,7 @@ create_rdpattern_window (void)
rdpattern_hbox2 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (rdpattern_hbox2);
gtk_box_pack_start (GTK_BOX (vbox3), rdpattern_hbox2, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (rdpattern_hbox2, -1, 30);
rdpattern_colorcode_minlabel = gtk_label_new (_("0.0"));
gtk_widget_show (rdpattern_colorcode_minlabel);
@@ -1814,7 +1817,7 @@ create_rdpattern_window (void)
rdpattern_drawingarea = gtk_drawing_area_new ();
gtk_widget_show (rdpattern_drawingarea);
gtk_container_add (GTK_CONTAINER (alignment3), rdpattern_drawingarea);
- gtk_widget_set_size_request (rdpattern_drawingarea, 769, 769);
+ gtk_widget_set_size_request (rdpattern_drawingarea, 681, 769);
GTK_WIDGET_SET_FLAGS (rdpattern_drawingarea, GTK_CAN_FOCUS);
rdpattern_hbox3 = gtk_hbox_new (FALSE, 0);
@@ -2623,7 +2626,7 @@ create_nec2_editor (void)
nec2_cmnt_treeview = gtk_tree_view_new ();
gtk_widget_show (nec2_cmnt_treeview);
gtk_container_add (GTK_CONTAINER (scrolledwindow5), nec2_cmnt_treeview);
- gtk_widget_set_size_request (nec2_cmnt_treeview, 769, 176);
+ gtk_widget_set_size_request (nec2_cmnt_treeview, -1, 138);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (nec2_cmnt_treeview), TRUE);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (nec2_cmnt_treeview), TRUE);
@@ -2725,7 +2728,7 @@ create_nec2_editor (void)
nec2_geom_treeview = gtk_tree_view_new ();
gtk_widget_show (nec2_geom_treeview);
gtk_container_add (GTK_CONTAINER (scrolledwindow4), nec2_geom_treeview);
- gtk_widget_set_size_request (nec2_geom_treeview, 769, 176);
+ gtk_widget_set_size_request (nec2_geom_treeview, -1, 204);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (nec2_geom_treeview), TRUE);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (nec2_geom_treeview), TRUE);
@@ -2855,7 +2858,7 @@ create_nec2_editor (void)
nec2_cmnd_treeview = gtk_tree_view_new ();
gtk_widget_show (nec2_cmnd_treeview);
gtk_container_add (GTK_CONTAINER (scrolledwindow3), nec2_cmnd_treeview);
- gtk_widget_set_size_request (nec2_cmnd_treeview, 769, 176);
+ gtk_widget_set_size_request (nec2_cmnd_treeview, -1, 204);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (nec2_cmnd_treeview), TRUE);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (nec2_cmnd_treeview), TRUE);
@@ -4812,10 +4815,6 @@ create_helix_editor (void)
GtkWidget *label73;
GtkWidget *label75;
GtkWidget *label76;
- GtkWidget *label77;
- GtkWidget *label78;
- GtkWidget *label79;
- GtkWidget *label80;
GtkObject *helix_tagnum_spinbutton_adj;
GtkWidget *helix_tagnum_spinbutton;
GtkObject *helix_numseg_spinbutton_adj;
@@ -4826,29 +4825,33 @@ create_helix_editor (void)
GtkWidget *helix_tspace_spinbutton;
GtkObject *helix_len_spinbutton_adj;
GtkWidget *helix_len_spinbutton;
- GtkObject *helix_radxzo_spinbutton_adj;
- GtkWidget *helix_radxzo_spinbutton;
- GtkObject *helix_dia_spinbutton_adj;
- GtkWidget *helix_dia_spinbutton;
- GtkObject *helix_radyzhl_spinbutton_adj;
- GtkWidget *helix_radyzhl_spinbutton;
- GtkObject *helix_radxzhl_spinbutton_adj;
- GtkWidget *helix_radxzhl_spinbutton;
GtkWidget *label81;
GtkObject *helix_nturns_spinbutton_adj;
GtkWidget *helix_nturns_spinbutton;
GtkWidget *label82;
- GtkWidget *label83;
- GtkObject *helix_radyzo_spinbutton_adj;
- GtkWidget *helix_radyzo_spinbutton;
- GtkWidget *label84;
- GtkObject *helix_res_spinbutton_adj;
- GtkWidget *helix_res_spinbutton;
GtkWidget *helix_linkzo_radiobutton;
GSList *helix_linkzo_radiobutton_group = NULL;
GtkWidget *helix_linkzhl_radiobutton;
GtkWidget *helix_linkall_radiobutton;
GtkWidget *helix_lh_checkbutton;
+ GtkObject *helix_dia_spinbutton_adj;
+ GtkWidget *helix_dia_spinbutton;
+ GtkObject *helix_res_spinbutton_adj;
+ GtkWidget *helix_res_spinbutton;
+ GtkWidget *label80;
+ GtkWidget *label84;
+ GtkObject *helix_radyzhl_spinbutton_adj;
+ GtkWidget *helix_radyzhl_spinbutton;
+ GtkWidget *label79;
+ GtkWidget *label83;
+ GtkObject *helix_radyzo_spinbutton_adj;
+ GtkWidget *helix_radyzo_spinbutton;
+ GtkWidget *label78;
+ GtkObject *helix_radxzhl_spinbutton_adj;
+ GtkWidget *helix_radxzhl_spinbutton;
+ GtkWidget *label77;
+ GtkObject *helix_radxzo_spinbutton_adj;
+ GtkWidget *helix_radxzo_spinbutton;
GtkWidget *label85;
GtkWidget *hbox26;
GtkWidget *helix_new_button;
@@ -4909,34 +4912,6 @@ create_helix_editor (void)
gtk_label_set_selectable (GTK_LABEL (label76), TRUE);
gtk_misc_set_alignment (GTK_MISC (label76), 0.1, 0.5);
- label77 = gtk_label_new (_("Radius @ X,Z=0"));
- gtk_widget_show (label77);
- gtk_table_attach (GTK_TABLE (table9), label77, 2, 3, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label77), 0.1, 0.5);
-
- label78 = gtk_label_new (_("Rad. @ X,Z=HL"));
- gtk_widget_show (label78);
- gtk_table_attach (GTK_TABLE (table9), label78, 0, 1, 5, 6,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label78), 0.1, 0.5);
-
- label79 = gtk_label_new (_("Rad. @ Y,Z=HL"));
- gtk_widget_show (label79);
- gtk_table_attach (GTK_TABLE (table9), label79, 1, 2, 5, 6,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label79), 0.1, 0.5);
-
- label80 = gtk_label_new (_("Wire Diameter"));
- gtk_widget_show (label80);
- gtk_table_attach (GTK_TABLE (table9), label80, 2, 3, 5, 6,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label80), 0.1, 0.5);
-
helix_tagnum_spinbutton_adj = gtk_adjustment_new (1, 1, 100000, 1, 10, 0);
helix_tagnum_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_tagnum_spinbutton_adj), 0.00999999977648, 0);
gtk_widget_show (helix_tagnum_spinbutton);
@@ -4977,38 +4952,6 @@ create_helix_editor (void)
(GtkAttachOptions) (0), 2, 4);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_len_spinbutton), TRUE);
- helix_radxzo_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
- helix_radxzo_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radxzo_spinbutton_adj), 0.00999999977648, 5);
- gtk_widget_show (helix_radxzo_spinbutton);
- gtk_table_attach (GTK_TABLE (table9), helix_radxzo_spinbutton, 2, 3, 4, 5,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radxzo_spinbutton), TRUE);
-
- helix_dia_spinbutton_adj = gtk_adjustment_new (0.00300000002608, 9.99999974738e-06, 100, 9.99999974738e-06, 10, 0);
- helix_dia_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_dia_spinbutton_adj), 0.00999999977648, 5);
- gtk_widget_show (helix_dia_spinbutton);
- gtk_table_attach (GTK_TABLE (table9), helix_dia_spinbutton, 2, 3, 6, 7,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_dia_spinbutton), TRUE);
-
- helix_radyzhl_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
- helix_radyzhl_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radyzhl_spinbutton_adj), 0.00999999977648, 5);
- gtk_widget_show (helix_radyzhl_spinbutton);
- gtk_table_attach (GTK_TABLE (table9), helix_radyzhl_spinbutton, 1, 2, 6, 7,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radyzhl_spinbutton), TRUE);
-
- helix_radxzhl_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
- helix_radxzhl_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radxzhl_spinbutton_adj), 0.00999999977648, 5);
- gtk_widget_show (helix_radxzhl_spinbutton);
- gtk_table_attach (GTK_TABLE (table9), helix_radxzhl_spinbutton, 0, 1, 6, 7,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radxzhl_spinbutton), TRUE);
-
label81 = gtk_label_new (_("Tag Number"));
gtk_widget_show (label81);
gtk_table_attach (GTK_TABLE (table9), label81, 0, 1, 1, 2,
@@ -5031,36 +4974,6 @@ create_helix_editor (void)
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label82), 0.1, 0.5);
- label83 = gtk_label_new (_("Radius @ Y,Z=0"));
- gtk_widget_show (label83);
- gtk_table_attach (GTK_TABLE (table9), label83, 3, 4, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label83), 0.1, 0.5);
-
- helix_radyzo_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
- helix_radyzo_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radyzo_spinbutton_adj), 0.00999999977648, 5);
- gtk_widget_show (helix_radyzo_spinbutton);
- gtk_table_attach (GTK_TABLE (table9), helix_radyzo_spinbutton, 3, 4, 4, 5,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radyzo_spinbutton), TRUE);
-
- label84 = gtk_label_new (_("Conductivity S/m"));
- gtk_widget_show (label84);
- gtk_table_attach (GTK_TABLE (table9), label84, 3, 4, 5, 6,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label84), 0.1, 0.5);
-
- helix_res_spinbutton_adj = gtk_adjustment_new (0, 0, 1000000000, 9.99999974738e-06, 10, 0);
- helix_res_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_res_spinbutton_adj), 0.00999999977648, 5);
- gtk_widget_show (helix_res_spinbutton);
- gtk_table_attach (GTK_TABLE (table9), helix_res_spinbutton, 3, 4, 6, 7,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_res_spinbutton), TRUE);
-
helix_linkzo_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Link @ Z=0"));
gtk_widget_show (helix_linkzo_radiobutton);
gtk_table_attach (GTK_TABLE (table9), helix_linkzo_radiobutton, 2, 3, 0, 1,
@@ -5096,6 +5009,96 @@ create_helix_editor (void)
(GtkAttachOptions) (0), 0, 0);
gtk_container_set_border_width (GTK_CONTAINER (helix_lh_checkbutton), 2);
+ helix_dia_spinbutton_adj = gtk_adjustment_new (0.00300000002608, 9.99999974738e-06, 100, 9.99999974738e-06, 10, 0);
+ helix_dia_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_dia_spinbutton_adj), 0.00999999977648, 5);
+ gtk_widget_show (helix_dia_spinbutton);
+ gtk_table_attach (GTK_TABLE (table9), helix_dia_spinbutton, 2, 3, 4, 5,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 2, 4);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_dia_spinbutton), TRUE);
+
+ helix_res_spinbutton_adj = gtk_adjustment_new (0, 0, 1000000000, 9.99999974738e-06, 10, 0);
+ helix_res_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_res_spinbutton_adj), 0.00999999977648, 5);
+ gtk_widget_show (helix_res_spinbutton);
+ gtk_table_attach (GTK_TABLE (table9), helix_res_spinbutton, 3, 4, 4, 5,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 2, 4);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_res_spinbutton), TRUE);
+
+ label80 = gtk_label_new (_("Wire Diameter"));
+ gtk_widget_show (label80);
+ gtk_table_attach (GTK_TABLE (table9), label80, 2, 3, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label80), 0.1, 0.5);
+
+ label84 = gtk_label_new (_("Conductivity S/m"));
+ gtk_widget_show (label84);
+ gtk_table_attach (GTK_TABLE (table9), label84, 3, 4, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label84), 0.1, 0.5);
+
+ helix_radyzhl_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
+ helix_radyzhl_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radyzhl_spinbutton_adj), 0.00999999977648, 5);
+ gtk_widget_show (helix_radyzhl_spinbutton);
+ gtk_table_attach (GTK_TABLE (table9), helix_radyzhl_spinbutton, 3, 4, 6, 7,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 2, 4);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radyzhl_spinbutton), TRUE);
+
+ label79 = gtk_label_new (_("Rad. @ Y,Z=HL"));
+ gtk_widget_show (label79);
+ gtk_table_attach (GTK_TABLE (table9), label79, 3, 4, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label79), 0.1, 0.5);
+
+ label83 = gtk_label_new (_("Radius @ Y,Z=0"));
+ gtk_widget_show (label83);
+ gtk_table_attach (GTK_TABLE (table9), label83, 1, 2, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label83), 0.1, 0.5);
+
+ helix_radyzo_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
+ helix_radyzo_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radyzo_spinbutton_adj), 0.00999999977648, 5);
+ gtk_widget_show (helix_radyzo_spinbutton);
+ gtk_table_attach (GTK_TABLE (table9), helix_radyzo_spinbutton, 1, 2, 6, 7,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 2, 4);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radyzo_spinbutton), TRUE);
+
+ label78 = gtk_label_new (_("Rad. @ X,Z=HL"));
+ gtk_widget_show (label78);
+ gtk_table_attach (GTK_TABLE (table9), label78, 2, 3, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label78), 0.1, 0.5);
+
+ helix_radxzhl_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
+ helix_radxzhl_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radxzhl_spinbutton_adj), 0.00999999977648, 5);
+ gtk_widget_show (helix_radxzhl_spinbutton);
+ gtk_table_attach (GTK_TABLE (table9), helix_radxzhl_spinbutton, 2, 3, 6, 7,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 2, 4);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radxzhl_spinbutton), TRUE);
+
+ label77 = gtk_label_new (_("Radius @ X,Z=0"));
+ gtk_widget_show (label77);
+ gtk_table_attach (GTK_TABLE (table9), label77, 0, 1, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label77), 0.1, 0.5);
+
+ helix_radxzo_spinbutton_adj = gtk_adjustment_new (1, 9.99999974738e-06, 10000, 9.99999974738e-06, 10, 0);
+ helix_radxzo_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (helix_radxzo_spinbutton_adj), 0.00999999977648, 5);
+ gtk_widget_show (helix_radxzo_spinbutton);
+ gtk_table_attach (GTK_TABLE (table9), helix_radxzo_spinbutton, 0, 1, 6, 7,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 2, 4);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (helix_radxzo_spinbutton), TRUE);
+
label85 = gtk_label_new (_("GH Card"));
gtk_widget_show (label85);
gtk_frame_set_label_widget (GTK_FRAME (frame16), label85);
@@ -5163,27 +5166,9 @@ create_helix_editor (void)
g_signal_connect ((gpointer) helix_len_spinbutton, "value_changed",
G_CALLBACK (on_helix_data_spinbutton_value_changed),
NULL);
- g_signal_connect ((gpointer) helix_radxzo_spinbutton, "value_changed",
- G_CALLBACK (on_helix_data_spinbutton_value_changed),
- NULL);
- g_signal_connect ((gpointer) helix_dia_spinbutton, "value_changed",
- G_CALLBACK (on_helix_data_spinbutton_value_changed),
- NULL);
- g_signal_connect ((gpointer) helix_radyzhl_spinbutton, "value_changed",
- G_CALLBACK (on_helix_data_spinbutton_value_changed),
- NULL);
- g_signal_connect ((gpointer) helix_radxzhl_spinbutton, "value_changed",
- G_CALLBACK (on_helix_data_spinbutton_value_changed),
- NULL);
g_signal_connect ((gpointer) helix_nturns_spinbutton, "value_changed",
G_CALLBACK (on_helix_nturns_spinbutton_value_changed),
NULL);
- g_signal_connect ((gpointer) helix_radyzo_spinbutton, "value_changed",
- G_CALLBACK (on_helix_data_spinbutton_value_changed),
- NULL);
- g_signal_connect ((gpointer) helix_res_spinbutton, "value_changed",
- G_CALLBACK (on_helix_res_spinbutton_value_changed),
- NULL);
g_signal_connect ((gpointer) helix_linkzo_radiobutton, "toggled",
G_CALLBACK (on_helix_linkzo_radiobutton_toggled),
NULL);
@@ -5196,6 +5181,24 @@ create_helix_editor (void)
g_signal_connect ((gpointer) helix_lh_checkbutton, "toggled",
G_CALLBACK (on_helix_lh_checkbutton_toggled),
NULL);
+ g_signal_connect ((gpointer) helix_dia_spinbutton, "value_changed",
+ G_CALLBACK (on_helix_data_spinbutton_value_changed),
+ NULL);
+ g_signal_connect ((gpointer) helix_res_spinbutton, "value_changed",
+ G_CALLBACK (on_helix_res_spinbutton_value_changed),
+ NULL);
+ g_signal_connect ((gpointer) helix_radyzhl_spinbutton, "value_changed",
+ G_CALLBACK (on_helix_data_spinbutton_value_changed),
+ NULL);
+ g_signal_connect ((gpointer) helix_radyzo_spinbutton, "value_changed",
+ G_CALLBACK (on_helix_data_spinbutton_value_changed),
+ NULL);
+ g_signal_connect ((gpointer) helix_radxzhl_spinbutton, "value_changed",
+ G_CALLBACK (on_helix_data_spinbutton_value_changed),
+ NULL);
+ g_signal_connect ((gpointer) helix_radxzo_spinbutton, "value_changed",
+ G_CALLBACK (on_helix_data_spinbutton_value_changed),
+ NULL);
g_signal_connect ((gpointer) helix_new_button, "clicked",
G_CALLBACK (on_helix_new_button_clicked),
NULL);
@@ -5218,30 +5221,30 @@ create_helix_editor (void)
GLADE_HOOKUP_OBJECT (helix_editor, label73, "label73");
GLADE_HOOKUP_OBJECT (helix_editor, label75, "label75");
GLADE_HOOKUP_OBJECT (helix_editor, label76, "label76");
- GLADE_HOOKUP_OBJECT (helix_editor, label77, "label77");
- GLADE_HOOKUP_OBJECT (helix_editor, label78, "label78");
- GLADE_HOOKUP_OBJECT (helix_editor, label79, "label79");
- GLADE_HOOKUP_OBJECT (helix_editor, label80, "label80");
GLADE_HOOKUP_OBJECT (helix_editor, helix_tagnum_spinbutton, "helix_tagnum_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_numseg_spinbutton, "helix_numseg_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_pcl_spinbutton, "helix_pcl_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_tspace_spinbutton, "helix_tspace_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_len_spinbutton, "helix_len_spinbutton");
- GLADE_HOOKUP_OBJECT (helix_editor, helix_radxzo_spinbutton, "helix_radxzo_spinbutton");
- GLADE_HOOKUP_OBJECT (helix_editor, helix_dia_spinbutton, "helix_dia_spinbutton");
- GLADE_HOOKUP_OBJECT (helix_editor, helix_radyzhl_spinbutton, "helix_radyzhl_spinbutton");
- GLADE_HOOKUP_OBJECT (helix_editor, helix_radxzhl_spinbutton, "helix_radxzhl_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, label81, "label81");
GLADE_HOOKUP_OBJECT (helix_editor, helix_nturns_spinbutton, "helix_nturns_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, label82, "label82");
- GLADE_HOOKUP_OBJECT (helix_editor, label83, "label83");
- GLADE_HOOKUP_OBJECT (helix_editor, helix_radyzo_spinbutton, "helix_radyzo_spinbutton");
- GLADE_HOOKUP_OBJECT (helix_editor, label84, "label84");
- GLADE_HOOKUP_OBJECT (helix_editor, helix_res_spinbutton, "helix_res_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_linkzo_radiobutton, "helix_linkzo_radiobutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_linkzhl_radiobutton, "helix_linkzhl_radiobutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_linkall_radiobutton, "helix_linkall_radiobutton");
GLADE_HOOKUP_OBJECT (helix_editor, helix_lh_checkbutton, "helix_lh_checkbutton");
+ GLADE_HOOKUP_OBJECT (helix_editor, helix_dia_spinbutton, "helix_dia_spinbutton");
+ GLADE_HOOKUP_OBJECT (helix_editor, helix_res_spinbutton, "helix_res_spinbutton");
+ GLADE_HOOKUP_OBJECT (helix_editor, label80, "label80");
+ GLADE_HOOKUP_OBJECT (helix_editor, label84, "label84");
+ GLADE_HOOKUP_OBJECT (helix_editor, helix_radyzhl_spinbutton, "helix_radyzhl_spinbutton");
+ GLADE_HOOKUP_OBJECT (helix_editor, label79, "label79");
+ GLADE_HOOKUP_OBJECT (helix_editor, label83, "label83");
+ GLADE_HOOKUP_OBJECT (helix_editor, helix_radyzo_spinbutton, "helix_radyzo_spinbutton");
+ GLADE_HOOKUP_OBJECT (helix_editor, label78, "label78");
+ GLADE_HOOKUP_OBJECT (helix_editor, helix_radxzhl_spinbutton, "helix_radxzhl_spinbutton");
+ GLADE_HOOKUP_OBJECT (helix_editor, label77, "label77");
+ GLADE_HOOKUP_OBJECT (helix_editor, helix_radxzo_spinbutton, "helix_radxzo_spinbutton");
GLADE_HOOKUP_OBJECT (helix_editor, label85, "label85");
GLADE_HOOKUP_OBJECT (helix_editor, hbox26, "hbox26");
GLADE_HOOKUP_OBJECT (helix_editor, helix_new_button, "helix_new_button");
diff --git a/src/matrix.c b/src/matrix.c
index 89997f9..a9a840b 100644
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -856,7 +856,7 @@ void etmns( double p1, double p2, double p3, double p4,
{
for( i = 0; i < data.n; i++ )
{
- arg= -TP*( wx* data.x[i]+ wy* data.y[i]+ wz* data.z[i]);
+ arg= -TWOPI*( wx* data.x[i]+ wy* data.y[i]+ wz* data.z[i]);
e[i]=-( pxl* data.cab[i]+ pyl* data.sab[i]+ pzl*
data.salp[i])* cmplx( cos( arg), sin( arg));
}
@@ -870,7 +870,7 @@ void etmns( double p1, double p2, double p3, double p4,
for( i = 0; i < data.n; i++ )
{
- arg= -TP*( wx* data.x[i]+ wy* data.y[i]- wz* data.z[i]);
+ arg= -TWOPI*( wx* data.x[i]+ wy* data.y[i]- wz* data.z[i]);
e[i]= e[i]-( cx* data.cab[i]+ cy* data.sab[i]+
cz* data.salp[i])* cmplx(cos( arg), sin( arg));
}
@@ -889,7 +889,7 @@ void etmns( double p1, double p2, double p3, double p4,
i++;
i1 += 2;
i2 = i1+1;
- arg= -TP*( wx* data.px[i] +
+ arg= -TWOPI*( wx* data.px[i] +
wy* data.py[i]+ wz* data.pz[i]);
tt1= cmplx( cos( arg), sin( arg)) *
data.psalp[i]* RETA;
@@ -914,7 +914,7 @@ void etmns( double p1, double p2, double p3, double p4,
i++;
i1 += 2;
i2 = i1+1;
- arg= -TP*( wx* data.px[i] +
+ arg= -TWOPI*( wx* data.px[i] +
wy* data.py[i]- wz* data.pz[i]);
tt1= cmplx( cos( arg), sin( arg)) *
data.psalp[i]* RETA;
@@ -940,7 +940,7 @@ void etmns( double p1, double p2, double p3, double p4,
for( i = 0; i < data.n; i++ )
{
- arg= -TP*( wx* data.x[i]+ wy* data.y[i] + wz* data.z[i]);
+ arg= -TWOPI*( wx* data.x[i]+ wy* data.y[i] + wz* data.z[i]);
e[i]=-( cx* data.cab[i]+ cy* data.sab[i] +
cz * data.salp[i])* cmplx( cos( arg), sin( arg));
}
@@ -954,7 +954,7 @@ void etmns( double p1, double p2, double p3, double p4,
for( i = 0; i < data.n; i++ )
{
- arg= -TP*( wx* data.x[i]+ wy* data.y[i]- wz* data.z[i]);
+ arg= -TWOPI*( wx* data.x[i]+ wy* data.y[i]- wz* data.z[i]);
e[i]= e[i]-( cx* data.cab[i]+ cy* data.sab[i]+
cz* data.salp[i])* cmplx(cos( arg), sin( arg));
}
@@ -977,7 +977,7 @@ void etmns( double p1, double p2, double p3, double p4,
i++;
i1 += 2;
i2 = i1+1;
- arg= -TP*( wx* data.px[i] +
+ arg= -TWOPI*( wx* data.px[i] +
wy* data.py[i]+ wz* data.pz[i]);
tt2= cmplx( cos( arg),
sin( arg)) * data.psalp[i] * RETA;
@@ -1002,7 +1002,7 @@ void etmns( double p1, double p2, double p3, double p4,
i++;
i1 += 2;
i2 = i1+1;
- arg= -TP*( wx* data.px[i] +
+ arg= -TWOPI*( wx* data.px[i] +
wy* data.py[i]- wz* data.pz[i]);
tt1= cmplx( cos( arg), sin( arg)) *
data.psalp[i]* RETA;
@@ -1022,7 +1022,7 @@ void etmns( double p1, double p2, double p3, double p4,
wy= wz* sin( p5);
wz= sin( p4);
ds= p6*59.9580;
- dsh= p6/(2.0* TP);
+ dsh= p6/(2.0* TWOPI);
is= 0;
i1= data.n-2;
@@ -1072,14 +1072,14 @@ void etmns( double p1, double p2, double p3, double p4,
} /* if( arg >= 1.0e-30) */
- arg= -TP* r;
+ arg= -TWOPI* r;
tt1= cmplx( cos( arg), sin( arg));
if( i < data.n )
{
- tt2= cmplx(1.0,-1.0/( r* TP))/ rs;
+ tt2= cmplx(1.0,-1.0/( r* TWOPI))/ rs;
er= ds* tt1* tt2* cth;
- et=.5* ds* tt1*((CPLX_01)* TP/ r+ tt2)* sth;
+ et=.5* ds* tt1*((CPLX_01)* TWOPI/ r+ tt2)* sth;
ezh= er* cth- et* sth;
erh= er* sth+ et* cth;
cx= ezh* wx+ erh* qx;
@@ -1093,7 +1093,7 @@ void etmns( double p1, double p2, double p3, double p4,
pxl= wy* qz- wz* qy;
pyl= wz* qx- wx* qz;
pzl= wx* qy- wy* qx;
- tt2= dsh* tt1* cmplx(1.0/ r, TP) /
+ tt2= dsh* tt1* cmplx(1.0/ r, TWOPI) /
r* sth* data.psalp[is];
cx= tt2* pxl;
cy= tt2* pyl;
@@ -1267,7 +1267,7 @@ fblock( int nrow, int ncol, int imax, int ipsym )
/* set up smat.ssx matrix for rotational symmetry. */
if( ipsym <= 0)
{
- phaz = TP/smat.nop;
+ phaz = TWOPI/smat.nop;
for( i = 1; i < smat.nop; i++ )
{
diff --git a/src/network.c b/src/network.c
index 2d7f9af..9e910a3 100644
--- a/src/network.c
+++ b/src/network.c
@@ -243,7 +243,7 @@ void netwk( complex double *cmx, int *ip, complex double *einc )
}
else
{
- y22r= TP* netcx.x11i[j]/ data.wlam;
+ y22r= TWOPI* netcx.x11i[j]/ data.wlam;
y12r=0.0;
y12i=1.0/( netcx.x11r[j]* sin( y22r));
y11r= netcx.x12r[j];
@@ -574,7 +574,7 @@ void netwk( complex double *cmx, int *ip, complex double *einc )
cux= cmplx( crnt.air[isc1], crnt.aii[isc1]);
ymit= cmplx( crnt.bir[isc1], crnt.bii[isc1]);
netcx.zped= cmplx( crnt.cir[isc1], crnt.cii[isc1]);
- pwr= data.si[isc1]* TP*.5;
+ pwr= data.si[isc1]* TWOPI*.5;
cux=( cux- ymit* sin( pwr) +
netcx.zped* cos( pwr))* data.wlam;
netcx.zped= vlt/ cux;
diff --git a/src/radiation.c b/src/radiation.c
index 9dd5d19..a9d2541 100644
--- a/src/radiation.c
+++ b/src/radiation.c
@@ -108,7 +108,7 @@ void ffld( double thet, double phi,
zrsin= csqrt(1.0- gnd.zrati2* gnd.zrati2* thz* thz);
rrv2=-( roz- gnd.zrati2* zrsin)/( roz+ gnd.zrati2* zrsin);
rrh2=( gnd.zrati2* roz- zrsin)/( gnd.zrati2* roz+ zrsin);
- darg= -TP*2.0* gnd.ch* roz;
+ darg= -TWOPI*2.0* gnd.ch* roz;
}
} /* if( gnd.ifar > 1) */
@@ -151,7 +151,7 @@ void ffld( double thet, double phi,
c= el*( boo+ too);
rr= a* crnt.air[i]+ b* crnt.bii[i]+ c* crnt.cir[i];
ri= a* crnt.aii[i]- b* crnt.bir[i]+ c* crnt.cii[i];
- arg= TP*( data.x[i]* rox+ data.y[i]* roy+ data.z[i]* roz);
+ arg= TWOPI*( data.x[i]* rox+ data.y[i]* roy+ data.z[i]* roz);
if( (k != 1) || (gnd.ifar < 2) )
{
@@ -375,7 +375,7 @@ void fflds( double rox, double roy, double roz,
for( j = 0; j < data.m; j++ )
{
i++;
- arg= TP*( rox* xs[i]+ roy* ys[i]+ roz* zs[i]);
+ arg= TWOPI*( rox* xs[i]+ roy* ys[i]+ roz* zs[i]);
ct= cmplx( cos( arg)* s[i], sin( arg)* s[i]);
k=3*j;
*ex += scur[k ]* ct;
@@ -418,7 +418,7 @@ void gfld( double rho, double phi, double rz,
thet= PI*.5;
ffld( thet, phi, eth, epi);
- arg= -TP* r;
+ arg= -TWOPI* r;
exa= cmplx( cos( arg), sin( arg))/ r;
*eth= *eth* exa;
*epi= *epi* exa;
@@ -514,9 +514,9 @@ void gfld( double rho, double phi, double rz,
b* crnt.bii[i]+ c* crnt.cir[i];
ri= a* crnt.aii[i] -
b* crnt.bir[i]+ c* crnt.cii[i];
- arg= TP*( data.x[i] *
+ arg= TWOPI*( data.x[i] *
rnx+ data.y[i]* rny+ data.z[i]* rnz* rfl);
- exa= cmplx( cos( arg), sin( arg))* cmplx( rr, ri)/ TP;
+ exa= cmplx( cos( arg), sin( arg))* cmplx( rr, ri)/ TWOPI;
if( k != 1 )
{
@@ -546,7 +546,7 @@ void gfld( double rho, double phi, double rz,
} /* for( i = 0; i < n; i++ ) */
- arg= -TP* r;
+ arg= -TWOPI* r;
exa= cmplx( cos( arg), sin( arg));
cix= cix* exa;
ciy= ciy* exa;
@@ -635,7 +635,7 @@ void rdpat(void)
for( kph = 1; kph <= fpat.nph; kph++ )
{
phi += fpat.dph;
- pha= phi* TA;
+ pha= phi* TORAD;
thet= fpat.thets - fpat.dth;
for( kth = 1; kth <= fpat.nth; kth++ )
@@ -652,7 +652,7 @@ void rdpat(void)
"Please check RP card data and correct"), ERR_STOP );
}
- tha= thet* TA;
+ tha= thet* TORAD;
if( gnd.ifar != 1)
ffld( tha, pha, ð, &eph);
else
@@ -690,7 +690,7 @@ void rdpat(void)
if( fabs(dfaz) > fabs(dfaz2) )
dfaz= dfaz2;
- cdfaz= cos( dfaz* TA);
+ cdfaz= cos( dfaz* TORAD);
tstor1= ethm2- ephm2;
tstor2=2.0* ephm* ethm* cdfaz;
tilta=atan2( tstor2, tstor1)/2.0;
diff --git a/src/somnec.c b/src/somnec.c
index edc66cb..daf90d5 100644
--- a/src/somnec.c
+++ b/src/somnec.c
@@ -113,7 +113,7 @@ void somnec( double epr, double sig, double fmhz )
}
else ggrid.epscf=cmplx(epr,sig);
- ck2=TP;
+ ck2=TWOPI;
ck2sq=ck2*ck2;
/* sommerfeld integral evaluation uses exp(-jwt),
diff --git a/src/xnec2c.c b/src/xnec2c.c
index bc8811d..3372d31 100644
--- a/src/xnec2c.c
+++ b/src/xnec2c.c
@@ -192,8 +192,8 @@ Set_Excitation( void )
{
if( (fpat.ixtyp >= 1) && (fpat.ixtyp <= 4) )
{
- tmp4= TA* calc_data.xpr4;
- tmp5= TA* calc_data.xpr5;
+ tmp4= TORAD* calc_data.xpr4;
+ tmp5= TORAD* calc_data.xpr5;
if( fpat.ixtyp == 4)
{
@@ -204,9 +204,9 @@ Set_Excitation( void )
}
else
{
- tmp1= TA* calc_data.xpr1;
- tmp2= TA* calc_data.xpr2;
- tmp3= TA* calc_data.xpr3;
+ tmp1= TORAD* calc_data.xpr1;
+ tmp2= TORAD* calc_data.xpr2;
+ tmp3= TORAD* calc_data.xpr3;
tmp6= calc_data.xpr6;
} /* if( fpat.ixtyp == 4) */
diff --git a/xnec2c.glade b/xnec2c.glade
index 042b65c..6e0bcc9 100644
--- a/xnec2c.glade
+++ b/xnec2c.glade
@@ -871,7 +871,7 @@ for New Frequency</property>
<child>
<widget class="GtkDrawingArea" id="structure_drawingarea">
<property name="width_request">681</property>
- <property name="height_request">481</property>
+ <property name="height_request">769</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<signal name="configure_event" handler="on_structure_drawingarea_configure_event" last_modification_time="Wed, 09 Feb 2005 06:20:26 GMT"/>
@@ -2136,8 +2136,8 @@ to Plane of Screen</property>
<child>
<widget class="GtkDrawingArea" id="freqplots_drawingarea">
- <property name="width_request">681</property>
- <property name="height_request">481</property>
+ <property name="width_request">1025</property>
+ <property name="height_request">769</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_BUTTON_PRESS_MASK</property>
@@ -3108,7 +3108,7 @@ to Plane of Screen</property>
<child>
<widget class="GtkDrawingArea" id="rdpattern_drawingarea">
<property name="width_request">681</property>
- <property name="height_request">481</property>
+ <property name="height_request">769</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<signal name="configure_event" handler="on_rdpattern_drawingarea_configure_event" last_modification_time="Sat, 19 Mar 2005 14:26:17 GMT"/>
@@ -4246,7 +4246,7 @@ to Plane of Screen</property>
<child>
<widget class="GtkTreeView" id="nec2_cmnt_treeview">
- <property name="height_request">70</property>
+ <property name="height_request">138</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
@@ -4548,7 +4548,7 @@ to Plane of Screen</property>
<child>
<widget class="GtkTreeView" id="nec2_geom_treeview">
- <property name="height_request">70</property>
+ <property name="height_request">204</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
@@ -4930,7 +4930,7 @@ to Plane of Screen</property>
<child>
<widget class="GtkTreeView" id="nec2_cmnd_treeview">
- <property name="height_request">70</property>
+ <property name="height_request">204</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
@@ -8926,118 +8926,6 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkLabel" id="label77">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Radius @ X,Z=0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.10000000149</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label78">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Rad. @ X,Z=HL</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.10000000149</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label79">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Rad. @ Y,Z=HL</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.10000000149</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label80">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Wire Diameter</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.10000000149</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkSpinButton" id="helix_tagnum_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9158,7 +9046,35 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkSpinButton" id="helix_radxzo_spinbutton">
+ <widget class="GtkLabel" id="label81">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Tag Number</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.10000000149</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="helix_nturns_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">0.00999999977648</property>
@@ -9167,14 +9083,14 @@ to Plane of Screen</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 9.99999974738e-06 10000 9.99999974738e-06 10 0</property>
- <signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:34:20 GMT"/>
+ <property name="adjustment">8 0.10000000149 10000 9.99999974738e-06 10 0</property>
+ <signal name="value_changed" handler="on_helix_nturns_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 07:06:36 GMT"/>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_padding">2</property>
<property name="y_padding">4</property>
<property name="y_options"></property>
@@ -9182,6 +9098,132 @@ to Plane of Screen</property>
</child>
<child>
+ <widget class="GtkLabel" id="label82">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Num. of Turns</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.10000000149</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="helix_linkzo_radiobutton">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Link @ Z=0</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_helix_linkzo_radiobutton_toggled" last_modification_time="Tue, 01 Aug 2006 18:18:11 GMT"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="helix_linkzhl_radiobutton">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Link @ Z=HL</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">helix_linkzo_radiobutton</property>
+ <signal name="toggled" handler="on_helix_linkzhl_radiobutton_toggled" last_modification_time="Tue, 01 Aug 2006 18:18:17 GMT"/>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="helix_linkall_radiobutton">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Link all Radii</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">helix_linkzo_radiobutton</property>
+ <signal name="toggled" handler="on_helix_linkall_radiobutton_toggled" last_modification_time="Tue, 01 Aug 2006 18:18:05 GMT"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="helix_lh_checkbutton">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Left Hand</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_helix_lh_checkbutton_toggled" last_modification_time="Tue, 01 Aug 2006 06:22:08 GMT"/>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkSpinButton" id="helix_dia_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9197,8 +9239,8 @@ to Plane of Screen</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_padding">2</property>
<property name="y_padding">4</property>
<property name="y_options"></property>
@@ -9206,7 +9248,7 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkSpinButton" id="helix_radyzhl_spinbutton">
+ <widget class="GtkSpinButton" id="helix_res_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">0.00999999977648</property>
@@ -9215,14 +9257,14 @@ to Plane of Screen</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 9.99999974738e-06 10000 9.99999974738e-06 10 0</property>
- <signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:34:55 GMT"/>
+ <property name="adjustment">0 0 1000000000 9.99999974738e-06 10 0</property>
+ <signal name="value_changed" handler="on_helix_res_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 07:09:23 GMT"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_padding">2</property>
<property name="y_padding">4</property>
<property name="y_options"></property>
@@ -9230,33 +9272,37 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkSpinButton" id="helix_radxzhl_spinbutton">
+ <widget class="GtkLabel" id="label80">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">0.00999999977648</property>
- <property name="digits">5</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
+ <property name="label" translatable="yes">Wire Diameter</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
- <property name="adjustment">1 9.99999974738e-06 10000 9.99999974738e-06 10 0</property>
- <signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:35:35 GMT"/>
+ <property name="selectable">False</property>
+ <property name="xalign">0.10000000149</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_padding">2</property>
- <property name="y_padding">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label81">
+ <widget class="GtkLabel" id="label84">
<property name="visible">True</property>
- <property name="label" translatable="yes">Tag Number</property>
+ <property name="label" translatable="yes">Conductivity S/m</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9272,17 +9318,17 @@ to Plane of Screen</property>
<property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="helix_nturns_spinbutton">
+ <widget class="GtkSpinButton" id="helix_radyzhl_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">0.00999999977648</property>
@@ -9291,14 +9337,14 @@ to Plane of Screen</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">8 0.10000000149 10000 9.99999974738e-06 10 0</property>
- <signal name="value_changed" handler="on_helix_nturns_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 07:06:36 GMT"/>
+ <property name="adjustment">1 9.99999974738e-06 10000 9.99999974738e-06 10 0</property>
+ <signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:34:55 GMT"/>
</widget>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_padding">2</property>
<property name="y_padding">4</property>
<property name="y_options"></property>
@@ -9306,9 +9352,9 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkLabel" id="label82">
+ <widget class="GtkLabel" id="label79">
<property name="visible">True</property>
- <property name="label" translatable="yes">Num. of Turns</property>
+ <property name="label" translatable="yes">Rad. @ Y,Z=HL</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9326,8 +9372,8 @@ to Plane of Screen</property>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -9352,10 +9398,10 @@ to Plane of Screen</property>
<property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -9375,10 +9421,10 @@ to Plane of Screen</property>
<signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:35:46 GMT"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_padding">2</property>
<property name="y_padding">4</property>
<property name="y_options"></property>
@@ -9386,9 +9432,9 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkLabel" id="label84">
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
- <property name="label" translatable="yes">Conductivity S/m</property>
+ <property name="label" translatable="yes">Rad. @ X,Z=HL</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9404,8 +9450,8 @@ to Plane of Screen</property>
<property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">fill</property>
@@ -9414,7 +9460,7 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkSpinButton" id="helix_res_spinbutton">
+ <widget class="GtkSpinButton" id="helix_radxzhl_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">0.00999999977648</property>
@@ -9423,12 +9469,12 @@ to Plane of Screen</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 1000000000 9.99999974738e-06 10 0</property>
- <signal name="value_changed" handler="on_helix_res_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 07:09:23 GMT"/>
+ <property name="adjustment">1 9.99999974738e-06 10000 9.99999974738e-06 10 0</property>
+ <signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:35:35 GMT"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_padding">2</property>
@@ -9438,99 +9484,53 @@ to Plane of Screen</property>
</child>
<child>
- <widget class="GtkRadioButton" id="helix_linkzo_radiobutton">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Link @ Z=0</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_helix_linkzo_radiobutton_toggled" last_modification_time="Tue, 01 Aug 2006 18:18:11 GMT"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="helix_linkzhl_radiobutton">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Link @ Z=HL</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">helix_linkzo_radiobutton</property>
- <signal name="toggled" handler="on_helix_linkzhl_radiobutton_toggled" last_modification_time="Tue, 01 Aug 2006 18:18:17 GMT"/>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="helix_linkall_radiobutton">
- <property name="border_width">2</property>
+ <widget class="GtkLabel" id="label77">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Link all Radii</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">helix_linkzo_radiobutton</property>
- <signal name="toggled" handler="on_helix_linkall_radiobutton_toggled" last_modification_time="Tue, 01 Aug 2006 18:18:05 GMT"/>
+ <property name="label" translatable="yes">Radius @ X,Z=0</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.10000000149</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="helix_lh_checkbutton">
- <property name="border_width">2</property>
+ <widget class="GtkSpinButton" id="helix_radxzo_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Left Hand</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_helix_lh_checkbutton_toggled" last_modification_time="Tue, 01 Aug 2006 06:22:08 GMT"/>
+ <property name="climb_rate">0.00999999977648</property>
+ <property name="digits">5</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 9.99999974738e-06 10000 9.99999974738e-06 10 0</property>
+ <signal name="value_changed" handler="on_helix_data_spinbutton_value_changed" last_modification_time="Tue, 01 Aug 2006 08:34:20 GMT"/>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_padding">2</property>
+ <property name="y_padding">4</property>
<property name="y_options"></property>
</packing>
</child>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xnec2c.git
More information about the pkg-hamradio-commits
mailing list