SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added -Wall option for cmake build system, fixed some warnings, corrected *.pro file for qmake build system

Browse Source
This commit is contained in:
Vadim Kuznetzov 2014-09-12 10:24:09 +04:00 committed by Guilherme Brondani Torri
parent 1d5c271001
commit fa2ad12f40
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs-activefilter/CMakeLists.txt
View File

@ -15,6 +15,8 @@ SET(CMAKE_BUILD_TYPE Debug)
ADD_DEFINITIONS( -DHAVE_CONFIG_H ) ADD_DEFINITIONS( -DHAVE_CONFIG_H )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ")
# define variables # define variables
SET(BINARYDIR "${CMAKE_INSTALL_PREFIX}/bin/") SET(BINARYDIR "${CMAKE_INSTALL_PREFIX}/bin/")
SET(BITMAPDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/bitmaps/") SET(BITMAPDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/bitmaps/")

2
qucs-activefilter/mfbfilter.cpp
View File

@ -435,7 +435,7 @@ void MFBfilter::calcBandPass()
if (order%2 != 0) { // Need to implement first-order section if (order%2 != 0) { // Need to implement first-order section
float R1,R2,R3,R4,C1; float R1,R2,R3,C1;
int k = order/2 + 1; int k = order/2 + 1;
float re = Poles.at(k-1).real(); float re = Poles.at(k-1).real();

7
qucs-activefilter/qucsactivefilter.pro
View File

@ -11,6 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = qucsactivefilter TARGET = qucsactivefilter
TEMPLATE = app TEMPLATE = app
DEFINES += HAVE_CONFIG_H
SOURCES += main.cpp\ SOURCES += main.cpp\
filter.cpp \ filter.cpp \
@ -19,7 +20,8 @@ SOURCES += main.cpp\
qf_poly.cpp \ qf_poly.cpp \
schcauer.cpp \ schcauer.cpp \
transferfuncdialog.cpp \ transferfuncdialog.cpp \
qucsactivefilter.cpp qucsactivefilter.cpp \
helpdialog.cpp
HEADERS += \ HEADERS += \
filter.h \ filter.h \
@ -30,7 +32,8 @@ HEADERS += \
schcauer.h \ schcauer.h \
transferfuncdialog.h \ transferfuncdialog.h \
bessel.h \ bessel.h \
qucsactivefilter.h qucsactivefilter.h \
helpdialog.h
RESOURCES += \ RESOURCES += \
qucsactivefilter.qrc qucsactivefilter.qrc

8
qucs-activefilter/sallenkey.cpp
View File

@ -148,6 +148,8 @@ void SallenKey::calcBandPass()
current_section.R2 = 1000*R2; current_section.R2 = 1000*R2;
current_section.R3 = 1000*R3; current_section.R3 = 1000*R3;
current_section.R4 = 1000*R4; current_section.R4 = 1000*R4;
current_section.R5 = 0;
current_section.R6 = 0;
current_section.C1 = C1; current_section.C1 = C1;
current_section.C2 = C1; current_section.C2 = C1;
Sections.append(current_section); Sections.append(current_section);
@ -184,6 +186,8 @@ void SallenKey::calcBandPass()
current_section.R2 = 1000*R2; current_section.R2 = 1000*R2;
current_section.R3 = 1000*R3; current_section.R3 = 1000*R3;
current_section.R4 = 1000*R4; current_section.R4 = 1000*R4;
current_section.R5 = 0;
current_section.R6 = 0;
current_section.C1 = C1; current_section.C1 = C1;
current_section.C2 = C1; current_section.C2 = C1;
Sections.append(current_section); Sections.append(current_section);
@ -203,6 +207,8 @@ void SallenKey::calcBandPass()
current_section.R2 = 1000*R2; current_section.R2 = 1000*R2;
current_section.R3 = 1000*R3; current_section.R3 = 1000*R3;
current_section.R4 = 1000*R4; current_section.R4 = 1000*R4;
current_section.R5 = 0;
current_section.R6 = 0;
current_section.C1 = C1; current_section.C1 = C1;
current_section.C2 = C1; current_section.C2 = C1;
Sections.append(current_section); Sections.append(current_section);
@ -234,6 +240,8 @@ void SallenKey::calcBandPass()
current_section.R2 = 1000*R2; current_section.R2 = 1000*R2;
current_section.R3 = 1000*R3; current_section.R3 = 1000*R3;
current_section.R4 = 1000*R4; current_section.R4 = 1000*R4;
current_section.R5 = 0;
current_section.R6 = 0;
current_section.C1 = C1; current_section.C1 = C1;
current_section.C2 = C1; current_section.C2 = C1;
Sections.append(current_section); Sections.append(current_section);

1
qucs-activefilter/schcauer.cpp
View File

@ -258,7 +258,6 @@ void SchCauer::calcBandStop()
R4 = Kv1*R5/mu; R4 = Kv1*R5/mu;
R6 = mu*R2/(mu-1.0); R6 = mu*R2/(mu-1.0);
current_section;
current_section.N = cnt; current_section.N = cnt;
current_section.R1 = 1000*R1; current_section.R1 = 1000*R1;
current_section.R2 = 1000*R2; current_section.R2 = 1000*R2;