Merge pull request #722 from andresmmera/ImprovedAttenuatorTool

Improved Qucs-S Attenuator Tool
ra3xdh · May 17, 2024 · eb0509e · eb0509e
2 parents 4562245 + 797081b
commit eb0509e
Show file tree

Hide file tree

Showing 15 changed files with 1,382 additions and 103 deletions.
diff --git a/qucs-attenuator/attenuatorfunc.cpp b/qucs-attenuator/attenuatorfunc.cpp
diff --git a/qucs-attenuator/attenuatorfunc.h b/qucs-attenuator/attenuatorfunc.h
@@ -16,6 +16,16 @@
 #define PI_TYPE 0
 #define TEE_TYPE 1
 #define BRIDGE_TYPE 2
+#define REFLECTION_TYPE 3
+#define QW_SERIES_TYPE 4
+#define QW_SHUNT_TYPE 5
+#define L_PAD_1ST_SERIES 6
+#define L_PAD_1ST_SHUNT 7
+#define R_SERIES 8
+#define R_SHUNT 9
+
+#define C0 299792458
+#define PI 3.141592653589793238462643383279502884197169399375105820974944592307816406286
 
 #include <cmath>
 
@@ -29,6 +39,19 @@ struct tagATT
   double R1;
   double R2;
   double R3;
+  double R4;
+  double L; // Length of the quarter-wavelength inverter. QW series/shunt attenuator only
+  double PR1;//Power dissipated by R1 [W]
+  double PR2;//Power dissipated by R2 [W]
+  double PR3;//Power dissipated by R3 [W]
+  double PR4;//Power dissipated by R4 [W]
+  double Pin;//Input power [W]
+  bool minR; //The reflection attenuator can be designed using two different resistor values. The first one is such
+             //as R < Z0 whereas the other is such as R > Z0. This field is just a flag to indicate what solution
+             //qucsattenuator should use.
+  double freq;//Central frequency for quarter-wavelength attenuators
+  bool useLumped;//Used only in the quarter wave attenuators. It indicates that the program must replace the
+                   //qw line by its lumped element equivalent (CLC)
 };
 
 class QString;
@@ -40,9 +63,9 @@ class QUCS_Att
   ~QUCS_Att();
 
   int Calc(tagATT*);
-  static QString* createSchematic(tagATT*);
-
-
+  static QString* createSchematic(tagATT*, bool);
 };
 
+QString num2str(double);
+
 #endif
diff --git a/qucs-attenuator/bitmaps/L_pad_1st_series.png b/qucs-attenuator/bitmaps/L_pad_1st_series.png
diff --git a/qucs-attenuator/bitmaps/L_pad_1st_shunt.png b/qucs-attenuator/bitmaps/L_pad_1st_shunt.png
diff --git a/qucs-attenuator/bitmaps/Rseries.png b/qucs-attenuator/bitmaps/Rseries.png
diff --git a/qucs-attenuator/bitmaps/Rshunt.png b/qucs-attenuator/bitmaps/Rshunt.png
diff --git a/qucs-attenuator/bitmaps/att_bridge.png b/qucs-attenuator/bitmaps/att_bridge.png
diff --git a/qucs-attenuator/bitmaps/att_reflection.png b/qucs-attenuator/bitmaps/att_reflection.png
diff --git a/qucs-attenuator/bitmaps/qw_series.png b/qucs-attenuator/bitmaps/qw_series.png
diff --git a/qucs-attenuator/bitmaps/qw_series_CLC.png b/qucs-attenuator/bitmaps/qw_series_CLC.png
diff --git a/qucs-attenuator/bitmaps/qw_shunt.png b/qucs-attenuator/bitmaps/qw_shunt.png
diff --git a/qucs-attenuator/bitmaps/qw_shunt_CLC.png b/qucs-attenuator/bitmaps/qw_shunt_CLC.png