kopia lustrzana https://github.com/r-burg/rbfilter
Add files via upload
R. Burghall
GitHub
rodzic
4e12bc36ad
commit
e19e0b31d8
5
Build
5
Build
|
|
@ -1,6 +1,7 @@
|
|||
#! /bin/bash
|
||||
# I'm still using Gtk2!
|
||||
g++ -g `pkg-config --cflags gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0` -o rbfilter ./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp `pkg-config --libs gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0`
|
||||
# I'm WAS still using Gtk2!
|
||||
# g++ -g `pkg-config --cflags gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-2.0` -o rbfilter ./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp `pkg-config --libs gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-3.0`
|
||||
g++ -g `pkg-config --cflags gtk+-3.0 gdk-3.0` -o rbfilter ./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp `pkg-config --libs gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-2.0`
|
||||
echo "Done!"
|
||||
read
|
||||
|
||||
|
|
|
|||
19
Calcs.cpp
19
Calcs.cpp
|
|
@ -66,7 +66,7 @@ double isinh(double x)
|
|||
|
||||
double n_to_freq(int n, double f1, int nmax=FSTEPS, int decades=2)
|
||||
{
|
||||
return(f1 * pow10(double(n) * decades / nmax));
|
||||
return(f1 * exp10(double(n) * decades / nmax));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -140,6 +140,7 @@ stage& stage::operator= (stage& f1)
|
|||
this->q = f1.q;
|
||||
this->pole = f1.pole;
|
||||
this->zero = f1.zero;
|
||||
return(*this);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -391,15 +392,15 @@ void
|
|||
TFilter::chebyshev(void)
|
||||
{
|
||||
char dump;
|
||||
|
||||
int i;
|
||||
|
||||
double aa[20], ww[20], g, a, w, tt, qq;
|
||||
|
||||
// Chebyshev filter design.
|
||||
log("<Chebyshev>");
|
||||
unsigned n = poles;
|
||||
g = ripple;
|
||||
// Version 2.11: correct ripple factor from dB.
|
||||
// g = ripple;
|
||||
g = sqrt(pow(10.0, ripple / 10.0) - 1.0);
|
||||
|
||||
for(i=1; i<=n; i++) {
|
||||
a=-sin((2*i-1)*M_PI/(2*n))*sinh(isinh(1.0/g)/n);
|
||||
|
|
@ -498,7 +499,7 @@ bode_calc(TFilter& filter)
|
|||
j = std::complex<double>(0.0, 1.0);
|
||||
|
||||
// filter.fmax = 1.0 * filter.frequency * M_PI / 2.0;
|
||||
filter.fmax = 0.1 * filter.frequency;
|
||||
filter.fmax = T_MULTIPLE_HP * filter.frequency;
|
||||
for(i=0; i<FSTEPS; i++) filter.freq_resp[i] = 1.0;
|
||||
for(k=0; k<(filter.poles/2); k++) {
|
||||
// t = 1.0 / abs(filter.pole[k]);
|
||||
|
|
@ -584,9 +585,9 @@ TFilter::step_calc(void)
|
|||
j = std::complex<double>(0.0, 1.0);
|
||||
|
||||
switch(fclass) {
|
||||
case Lowpass: tmax = 5.0/frequency; break;
|
||||
case Bandpass: tmax = 5.0/bandwidth; break;
|
||||
case Highpass: tmax = 2.0/frequency; break;
|
||||
case Lowpass: tmax = T_MULTIPLE_LP/frequency; break;
|
||||
case Bandpass: tmax = T_MULTIPLE_BP/bandwidth; break;
|
||||
case Highpass: tmax = T_MULTIPLE_HP/frequency; break;
|
||||
default: cout << "Unknown fclass\n"; exit(-1);
|
||||
}
|
||||
dt = tmax/TSTEPS;
|
||||
|
|
@ -1038,7 +1039,7 @@ double q1, q2; // Used for checking.
|
|||
// Check:
|
||||
q1 = (a1*a1+b1*b1)/(2.0*a1);
|
||||
q2 = (a2*a2+b2*b2)/(2.0*a2);
|
||||
cout << "q=" << q1 << " & " << q2 << "\n";
|
||||
// cout << "q=" << q1 << " & " << q2 << "\n"; TODO: WHAT has gone wrong here?!!!
|
||||
|
||||
filter.log("</geffe>");
|
||||
}
|
||||
|
|
|
|||
7
Calcs.h
7
Calcs.h
|
|
@ -28,6 +28,13 @@ using std::string;
|
|||
#define IMAX 19
|
||||
#define MAXS 19
|
||||
|
||||
#define T_MULTIPLE_LP 5.0
|
||||
#define T_MULTIPLE_BP 5.0
|
||||
#define T_MULTIPLE_HP 2.0
|
||||
#define F_MULTIPLE 0.1
|
||||
|
||||
#define LINEAR_FREQ true
|
||||
|
||||
#define LOG true
|
||||
|
||||
#define NORMALISE
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
#! /bin/bash
|
||||
rm *~
|
||||
echo "Done!"
|
||||
sleep 2
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
#! /bin/bash
|
||||
echo "Count lines:"
|
||||
wc -l *.cpp *.h
|
||||
read
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#! /bin/bash
|
||||
gedit *.cpp *.h
|
||||
read
|
||||
|
||||
6
Makefile
6
Makefile
|
|
@ -1,8 +1,10 @@
|
|||
# Initial makefile for use of autotools.
|
||||
CC=g++
|
||||
FLAGS=`pkg-config --cflags gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0`
|
||||
# FLAGS=`pkg-config --cflags gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0`
|
||||
FLAGS=`pkg-config --cflags gtk+-3.0 gdk-3.0`
|
||||
HEAD=
|
||||
LIBS=`pkg-config --libs gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0`
|
||||
# LIBS=`pkg-config --libs gtk+-2.0 gdk-2.0 libgnome-2.0 libgnomeui-2.0 gdk-pixbuf-xlib-2.0`
|
||||
LIBS=`pkg-config --libs gtk+-3.0 gdk-3.0 gdk-pixbuf-xlib-2.0`
|
||||
|
||||
bin_PROGRAMS=rbfilter
|
||||
rbfilter_SOURCES=./rbfilter.cpp ./Calcs.cpp ./Rauch.cpp ./Sallen_and_Key.cpp ./Discrete.cpp Calcs.h Drawing.h filter.h preferred.h Discrete.h Enums.h gnome.h rbfilter.h
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ double nearest(double v, ee e1)
|
|||
double l = log10(v);
|
||||
double p = int(l); // Power of ten: i.e. exponent
|
||||
double f = l - p;
|
||||
double x = pow10(f+1.0); // Mantissa
|
||||
double x = exp10(f+1.0); // Mantissa
|
||||
double *ep;
|
||||
switch(e1) {
|
||||
case _e6: ep = e6; n = 6; break;
|
||||
|
|
@ -62,7 +62,7 @@ double nearest(double v, ee e1)
|
|||
cout << "Value below 1.0\n";
|
||||
return(1.0);
|
||||
}
|
||||
return((x/ep[i-1] < ep[i]/x)? ep[i-1] * pow10(p-1.0): ep[i] * pow10(p-1.0));
|
||||
return((x/ep[i-1] < ep[i]/x)? ep[i-1] * exp10(p-1.0): ep[i] * exp10(p-1.0));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -166,8 +166,10 @@ void stage::synthesise_R_band(void)
|
|||
double C;
|
||||
double R;
|
||||
|
||||
cout << "There may be a problem in this function. Try another method of realization.\n";
|
||||
#if 0
|
||||
cout << "There may be a problem in this function. Calculation aborted: try another method of realization.\n";
|
||||
return;
|
||||
#endif
|
||||
|
||||
#if SHOW_CALC
|
||||
cout << "\nsynthesise_band\n";
|
||||
|
|
@ -178,6 +180,7 @@ void stage::synthesise_R_band(void)
|
|||
// Let C1 = C.r, C2 = C/r
|
||||
// If R1 = R2 then q = T/(R1*(C.r+C/r))
|
||||
// C.r^2 - T/(q * R1).r + C = 0
|
||||
R1 *= 0.75;
|
||||
R2 *= 1.5; /// Try progressively increasing ratios of R2:R1 until a solution is possible.
|
||||
C = T / sqrt(R1*R2);
|
||||
R = sqrt(R1*R2);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ double Fn_e6(double c)
|
|||
int i = 0;
|
||||
double temp;
|
||||
float e6[] = { 10.0, 6.8, 4.7, 3.3, 2.2, 1.5, 1.0, 0.68 };
|
||||
double exponent = pow10(int(log10(c)));
|
||||
double exponent = exp10(int(log10(c)));
|
||||
double mantissa = c / exponent;
|
||||
cout << "mantissa = " << mantissa << " exponent = " << exponent << "\n";
|
||||
do {
|
||||
|
|
@ -73,7 +73,7 @@ double Fn_e12(double c)
|
|||
int i = 0;
|
||||
double temp;
|
||||
float e12[] = { 10.0, 8.2, 6.8, 5.6, 4.7, 3.9, 3.3, 2.7, 2.2, 1.8, 1.5, 1.2, 1.0, 0.82 };
|
||||
double exponent = pow10(int(log10(c)));
|
||||
double exponent = exp10(int(log10(c)));
|
||||
double mantissa = c / exponent;
|
||||
do {
|
||||
temp = sqrt(e12[i] * e12[i+1]) / 10.0;
|
||||
|
|
|
|||
Plik binarny nie jest wyświetlany.
Plik binarny nie jest wyświetlany.
|
|
@ -0,0 +1,348 @@
|
|||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.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, 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, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# 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.
|
||||
|
||||
# This file is maintained in Automake, please report
|
||||
# bugs to <bug-automake@gnu.org> or send patches to
|
||||
# <automake-patches@gnu.org>.
|
||||
|
||||
nl='
|
||||
'
|
||||
|
||||
# We need space, tab and new line, in precisely that order. Quoting is
|
||||
# there to prevent tools from complaining about whitespace usage.
|
||||
IFS=" "" $nl"
|
||||
|
||||
file_conv=
|
||||
|
||||
# func_file_conv build_file lazy
|
||||
# Convert a $build file to $host form and store it in $file
|
||||
# Currently only supports Windows hosts. If the determined conversion
|
||||
# type is listed in (the comma separated) LAZY, no conversion will
|
||||
# take place.
|
||||
func_file_conv ()
|
||||
{
|
||||
file=$1
|
||||
case $file in
|
||||
/ | /[!/]*) # absolute file, and not a UNC file
|
||||
if test -z "$file_conv"; then
|
||||
# lazily determine how to convert abs files
|
||||
case `uname -s` in
|
||||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
CYGWIN*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
file_conv=wine
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
case $file_conv/,$2, in
|
||||
*,$file_conv,*)
|
||||
;;
|
||||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
cygwin/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
file=`winepath -w "$file" || echo "$file"`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# func_cl_dashL linkdir
|
||||
# Make cl look for libraries in LINKDIR
|
||||
func_cl_dashL ()
|
||||
{
|
||||
func_file_conv "$1"
|
||||
if test -z "$lib_path"; then
|
||||
lib_path=$file
|
||||
else
|
||||
lib_path="$lib_path;$file"
|
||||
fi
|
||||
linker_opts="$linker_opts -LIBPATH:$file"
|
||||
}
|
||||
|
||||
# func_cl_dashl library
|
||||
# Do a library search-path lookup for cl
|
||||
func_cl_dashl ()
|
||||
{
|
||||
lib=$1
|
||||
found=no
|
||||
save_IFS=$IFS
|
||||
IFS=';'
|
||||
for dir in $lib_path $LIB
|
||||
do
|
||||
IFS=$save_IFS
|
||||
if $shared && test -f "$dir/$lib.dll.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.dll.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/$lib.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/lib$lib.a"; then
|
||||
found=yes
|
||||
lib=$dir/lib$lib.a
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS=$save_IFS
|
||||
|
||||
if test "$found" != yes; then
|
||||
lib=$lib.lib
|
||||
fi
|
||||
}
|
||||
|
||||
# func_cl_wrapper cl arg...
|
||||
# Adjust compile command to suit cl
|
||||
func_cl_wrapper ()
|
||||
{
|
||||
# Assume a capable shell
|
||||
lib_path=
|
||||
shared=:
|
||||
linker_opts=
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.[oO][bB][jJ])
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fo"$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fe"$file"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-I)
|
||||
eat=1
|
||||
func_file_conv "$2" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-I*)
|
||||
func_file_conv "${1#-I}" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-l)
|
||||
eat=1
|
||||
func_cl_dashl "$2"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-l*)
|
||||
func_cl_dashl "${1#-l}"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-L)
|
||||
eat=1
|
||||
func_cl_dashL "$2"
|
||||
;;
|
||||
-L*)
|
||||
func_cl_dashL "${1#-L}"
|
||||
;;
|
||||
-static)
|
||||
shared=false
|
||||
;;
|
||||
-Wl,*)
|
||||
arg=${1#-Wl,}
|
||||
save_ifs="$IFS"; IFS=','
|
||||
for flag in $arg; do
|
||||
IFS="$save_ifs"
|
||||
linker_opts="$linker_opts $flag"
|
||||
done
|
||||
IFS="$save_ifs"
|
||||
;;
|
||||
-Xlinker)
|
||||
eat=1
|
||||
linker_opts="$linker_opts $2"
|
||||
;;
|
||||
-*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
|
||||
func_file_conv "$1"
|
||||
set x "$@" -Tp"$file"
|
||||
shift
|
||||
;;
|
||||
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
|
||||
func_file_conv "$1" mingw
|
||||
set x "$@" "$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
if test -n "$linker_opts"; then
|
||||
linker_opts="-link$linker_opts"
|
||||
fi
|
||||
exec "$@" $linker_opts
|
||||
exit 1
|
||||
}
|
||||
|
||||
eat=
|
||||
|
||||
case $1 in
|
||||
'')
|
||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
||||
exit 1;
|
||||
;;
|
||||
-h | --h*)
|
||||
cat <<\EOF
|
||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
||||
|
||||
Wrapper for compilers which do not understand '-c -o'.
|
||||
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
|
||||
arguments, and rename the output as expected.
|
||||
|
||||
If you are trying to build a whole package this is not the
|
||||
right script to run: please start by reading the file 'INSTALL'.
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>.
|
||||
EOF
|
||||
exit $?
|
||||
;;
|
||||
-v | --v*)
|
||||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
|
||||
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
||||
ofile=
|
||||
cfile=
|
||||
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
# So we strip '-o arg' only if arg is an object.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.obj)
|
||||
ofile=$2
|
||||
;;
|
||||
*)
|
||||
set x "$@" -o "$2"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*.c)
|
||||
cfile=$1
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
if test -z "$ofile" || test -z "$cfile"; then
|
||||
# If no '-o' option was seen then we might have been invoked from a
|
||||
# pattern rule where we don't need one. That is ok -- this is a
|
||||
# normal compilation that the losing compiler can handle. If no
|
||||
# '.c' file was seen then we are probably linking. That is also
|
||||
# ok.
|
||||
exec "$@"
|
||||
fi
|
||||
|
||||
# Name of file we expect compiler to create.
|
||||
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
|
||||
|
||||
# Create the lock directory.
|
||||
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
|
||||
# that we are using for the .o file. Also, base the name on the expected
|
||||
# object file name, since that is what matters with a parallel build.
|
||||
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
|
||||
while true; do
|
||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# FIXME: race condition here if user kills between mkdir and trap.
|
||||
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
||||
|
||||
# Run the compile.
|
||||
"$@"
|
||||
ret=$?
|
||||
|
||||
if test -f "$cofile"; then
|
||||
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
|
||||
elif test -f "${cofile}bj"; then
|
||||
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
|
||||
fi
|
||||
|
||||
rmdir "$lockdir"
|
||||
exit $ret
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
Plik diff jest za duży
Load Diff
1807
rbfilter.cpp
1807
rbfilter.cpp
Plik diff jest za duży
Load Diff
Ładowanie…
Reference in New Issue