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

add msvc build support. - added msvc compiler flags. - fixed wrong file encoding. - change VLA to fixed or dynamic array for msvc. - succesfully build with qt6.5.0 and vs2019 on win10 native.

Browse Source
This commit is contained in:
dsm 2023-02-28 14:49:51 +03:00
parent 053eedbcc2
commit a22e4ba234
11 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs-activefilter/CMakeLists.txt
View File

@ -58,7 +58,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
ENDIF()
if (MSVC)
add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
else()
# additional warnings
add_compile_options(-Wall -Wextra)

2
qucs-attenuator/CMakeLists.txt
View File

@ -45,7 +45,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
ENDIF()
if (MSVC)
add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
else()
# additional warnings
add_compile_options(-Wall -Wextra)

2
qucs-filter/CMakeLists.txt
View File

@ -46,7 +46,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
ENDIF()
if (MSVC)
add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
else()
# additional warnings
add_compile_options(-Wall -Wextra)

2
qucs-filter/qf_cauer.cpp
View File

@ -308,7 +308,7 @@ void qf_cauer::xfer (void) {
#ifdef _QF_CAUER_DEBUG
std::cerr << "Computing filter of order " << ord << " with ";
std::cerr << "rho = " << rho << " and theta = " << ASIND (th) << "°\n";
std::cerr << "rho = " << rho << " and theta = " << ASIND (th) << "°\n";
std::cerr << "k = " << k << '\n';
#endif

8
qucs-filter/qf_poly.cpp
View File

@ -46,7 +46,7 @@ qf_poly::qf_poly (qf_double_t a, qf_double_t b, qf_double_t c, unsigned deg) {
#ifdef _QF_POLY_DEBUG
std::cout << "qf_poly (ax^2+bx+c), a = " << a << ", b = " << b
<< ", c = " << c << ", d° = " << deg << "\n";
<< ", c = " << c << ", d° = " << deg << "\n";
#endif
// Pathological cases
@ -67,7 +67,7 @@ qf_poly::qf_poly (qf_double_t a, qf_double_t b, qf_double_t c, unsigned deg) {
d = 0;
p = new qf_double_t[1];
p[0] = a;
rts = NULL; // no root (or an infinite # of them)
rts = NULL; // no root (or an infinite # of them)
krts = a;
rep = BOTH;
break;
@ -84,7 +84,7 @@ qf_poly::qf_poly (qf_double_t a, qf_double_t b, qf_double_t c, unsigned deg) {
rep = BOTH;
break;
default:
// Polynom of d° 2 (aX^2 + bX + c)
// Polynom of d° 2 (aX^2 + bX + c)
if (deg > 2)
std::cout << "Warning: qf_poly called with deg > 2.\n";
d = 2;
@ -214,7 +214,7 @@ qf_double_t & qf_poly::operator [] (int i) {
return rts[i];
}
// Returns d° (order) of polynom
// Returns d° (order) of polynom
unsigned qf_poly::deg () {
return d;
}

4
qucs-filter/qf_poly.h
View File

@ -54,8 +54,8 @@ class qf_poly
public:
qf_poly ();
qf_poly (unsigned); // id with d°
qf_poly (qf_double_t, qf_double_t, qf_double_t, unsigned); // Up to d°=2
qf_poly (unsigned); // id with d°
qf_poly (qf_double_t, qf_double_t, qf_double_t, unsigned); // Up to d°=2
qf_poly (int, const qf_double_t[]); // Id, with inst.
qf_poly (int, qf_double_t, const qf_double_t[]);
qf_poly (const qf_poly &); // Copy

2
qucs-powercombining/CMakeLists.txt
View File

@ -57,7 +57,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
ENDIF()
if (MSVC)
add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
else()
# additional warnings
add_compile_options(-Wall -Wextra)

7
qucs-powercombining/qucspowercombiningtool.cpp
View File

@ -794,7 +794,7 @@ QString QucsPowerCombiningTool::calcChebyLines(double RL, double Z0, double gamm
//double sec_theta_m = cosh((1/(1.*N))*acosh(fabs(log(RL/Z0)/(2*gamma))) );
(fabs(log(RL/Z0)/(2*gamma)) < 1) ? sec_theta_m = 0 : sec_theta_m = cosh((1/(1.*N))*acosh(fabs(log(RL/Z0)/(2*gamma))) );
double w[N];
double w[7]; // for msvc predefined size.
switch(N)//The weights are calculated by equating the reflection coeffient formula to the N-th Chebyshev polinomial
{
@ -885,7 +885,9 @@ int QucsPowerCombiningTool::MultistageWilkinson(double Z0, double Freq, int NSta
double lambda = SPEED_OF_LIGHT/(Freq);
double lambda4=lambda/4, W;
double alpha;
double C[NStages], L[NStages];
auto C = new double[NStages];
auto L = new double[NStages];
if (LumpedElements)//CLC pi equivalent calculation
{
double w = 2*M_PI*Freq;
@ -896,7 +898,6 @@ int QucsPowerCombiningTool::MultistageWilkinson(double Z0, double Freq, int NSta
L[j] = Zi/w;
C[j] = 1./(L[j]*w*w);
}
}

2
qucs-transcalc/CMakeLists.txt
View File

@ -45,7 +45,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
ENDIF()
if (MSVC)
add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
else()
# additional warnings
add_compile_options(-Wall -Wextra)

2
qucs/CMakeLists.txt
View File

@ -87,7 +87,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
ENDIF()
if (MSVC)
add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
else()
# additional warnings
add_compile_options(-Wall -Wextra)

12
qucs/projectView.h
View File

@ -27,12 +27,20 @@
#include <QTreeView>
#include <QString>
#define APPEND_ROW(parent, data) \
/*#define APPEND_ROW(parent, data) \
({ \
QList<QStandardItem*> c; \
c.append(new QStandardItem(data)); \
parent->appendRow(c); \
})
})*/
#define APPEND_ROW(parent, data) \
if(1){ \
QList<QStandardItem*> c; \
c.append(new QStandardItem(data)); \
parent->appendRow(c); \
}
class QStandardItemModel;