*** empty log message ***

git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@778 b5b04e8c-4942-46c9-ab4f-83783d557d1c
2025-03-28 21:13:26 +00:00 · 2006-01-30 07:13:26 +00:00 · 2006-01-30 07:13:26 +00:00 · b758e3da25
commit b758e3da25
parent c9b1185d99
20 changed files with 503 additions and 6 deletions
--- a/qucs/bitmaps/Makefile.am
+++ b/qucs/bitmaps/Makefile.am
@ -41,7 +41,7 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png   \
  cpwopen.png cpwstep.png mutual.png mutual2.png noise_ii.png noise_vv.png    \
  noise_iv.png or.png nor.png and.png nand.png xor.png xnor.png digi.png      \
  inverter.png digi_source.png timing.png truth.png rsflipflop.png            \
-  dflipflop.png jkflipflop.png coupler.png
+  dflipflop.png jkflipflop.png coupler.png coaxial.png

 # toolbar pictures
 PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png      \
--- a/qucs/bitmaps/coaxial.png
+++ b/qucs/bitmaps/coaxial.png
--- a/qucs/components/Makefile.am
+++ b/qucs/components/Makefile.am
@ -43,7 +43,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp    \
  mutual2.cpp noise_ii.cpp noise_iv.cpp noise_vv.cpp logical_or.cpp           \
  logical_nor.cpp logical_and.cpp logical_nand.cpp logical_xor.cpp            \
  logical_xnor.cpp logical_inv.cpp digi_sim.cpp digi_source.cpp coupler.cpp   \
-  rs_flipflop.cpp d_flipflop.cpp jk_flipflop.cpp
+  rs_flipflop.cpp d_flipflop.cpp jk_flipflop.cpp coaxialline.cpp

 nodist_libcomponents_a_SOURCES = $(MOCFILES)

@ -60,7 +60,7 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h     \
  cpwgap.h cpwstep.h libcomp.h mutual.h mutual2.h noise_ii.h noise_iv.h       \
  noise_vv.h logical_or.h logical_nor.h logical_and.h logical_nand.h          \
  logical_xor.h logical_xnor.h logical_inv.h digi_sim.h digi_source.h         \
-  coupler.h rs_flipflop.h d_flipflop.h jk_flipflop.h
+  coupler.h rs_flipflop.h d_flipflop.h jk_flipflop.h coaxialline.h

 INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs

--- a/qucs/components/coaxialline.cpp
+++ b/qucs/components/coaxialline.cpp
@ -0,0 +1,79 @@
+/***************************************************************************
+                              coaxialline.cpp
+                             -----------------
+    begin                : Sun Jan 29 2006
+    copyright            : (C) 2006 by Michael Margraf
+    email                : michael.margraf@alumni.tu-berlin.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "coaxialline.h"
+
+
+CoaxialLine::CoaxialLine()
+{
+  Description = QObject::tr("coaxial transmission line");
+
+  Arcs.append(new Arc(-20, -9, 9, 19,     0, 16*360,QPen(QPen::darkBlue,2)));
+  Arcs.append(new Arc( 11, -9, 9, 19,16*270, 16*180,QPen(QPen::darkBlue,2)));
+
+  Lines.append(new Line(-30,  0,-16,  0,QPen(QPen::darkBlue,2)));
+  Lines.append(new Line( 18,  0, 30,  0,QPen(QPen::darkBlue,2)));
+  Lines.append(new Line(-16, -9, 16, -9,QPen(QPen::darkBlue,2)));
+  Lines.append(new Line(-16,  9, 16,  9,QPen(QPen::darkBlue,2)));
+  Lines.append(new Line(-11,  0, 18,  0,QPen(QPen::darkBlue,1,Qt::DotLine)));
+
+  Ports.append(new Port(-30, 0));
+  Ports.append(new Port( 30, 0));
+
+  x1 = -30; y1 =-12;
+  x2 =  30; y2 = 12;
+
+  tx = x1+4;
+  ty = y2+4;
+  Model = "COAX";
+  Name  = "Line";
+
+  Props.append(new Property("er", "1", true,
+		QObject::tr("relative permittivity of dielectrica")));
+  Props.append(new Property("rho", "0.022e-6", false,
+		QObject::tr("specific resistance of conductor")));
+  Props.append(new Property("mu", "1", false,
+		QObject::tr("relative permeability of conductor")));
+  Props.append(new Property("D", "5 mm", false,
+		QObject::tr("inner diameter of shield")));
+  Props.append(new Property("d", "1 mm", false,
+		QObject::tr("diameter of inner conductor")));
+  Props.append(new Property("L", "1 m", true,
+		QObject::tr("mechanical length of the line")));
+  Props.append(new Property("tand", "2e-4", false,
+		QObject::tr("loss tangent")));
+  Props.append(new Property("Temp", "26.85", false,
+		QObject::tr("simulation temperature in degree Celsius")));
+}
+
+CoaxialLine::~CoaxialLine()
+{
+}
+
+Component* CoaxialLine::newOne()
+{
+  return new CoaxialLine();
+}
+
+Element* CoaxialLine::info(QString& Name, char* &BitmapFile, bool getNewOne)
+{
+  Name = QObject::tr("Coaxial Line");
+  BitmapFile = "coaxial";
+
+  if(getNewOne)  return new CoaxialLine();
+  return 0;
+}
--- a/qucs/components/coaxialline.h
+++ b/qucs/components/coaxialline.h
@ -0,0 +1,32 @@
+/***************************************************************************
+                              coaxialline.h
+                             ---------------
+    begin                : Sun Jan 29 2006
+    copyright            : (C) 2006 by Michael Margraf
+    email                : michael.margraf@alumni.tu-berlin.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef COAXIALLINE_H
+#define COAXIALLINE_H
+
+#include "component.h"
+
+
+class CoaxialLine : public Component  {
+public:
+  CoaxialLine();
+ ~CoaxialLine();
+  Component* newOne();
+  static Element* info(QString&, char* &, bool getNewOne=false);
+};
+
+#endif
--- a/qucs/components/component.cpp
+++ b/qucs/components/component.cpp
@ -1213,6 +1213,7 @@ Component* getComponentFromName(QString& Line)
 	else if(cstr == "SHORT") c = new CPWshort();
 	else if(cstr == "GAP") c = new CPWgap();
 	else if(cstr == "STEP") c = new CPWstep();
+	else if(cstr == "OAX") c = new CoaxialLine();
 	break;
  case 'L' : if(cstr.isEmpty()) c = new Inductor();
 	else if(cstr == "ib") c = new LibComp();
--- a/qucs/components/components.h
+++ b/qucs/components/components.h
@ -52,6 +52,7 @@
 #include "vcvs.h"
 #include "ccvs.h"
 #include "tline.h"
+#include "coaxialline.h"
 #include "substrate.h"
 #include "msline.h"
 #include "mscoupled.h"
--- a/qucs/qucs.cpp
+++ b/qucs/qucs.cpp
@ -1668,9 +1668,9 @@ pInfoFunc Sources[] =
   &Noise_iv::info, 0};

 pInfoFunc TransmissionLines[] =
-  {&TLine::info, &Substrate::info, &MSline::info, &MScoupled::info,
-   &MScorner::info, &MSmbend::info, &MSstep::info, &MStee::info,
-   &MScross::info, &MSopen::info, &MSgap::info, &MSvia::info,
+  {&TLine::info, &CoaxialLine::info, &Substrate::info, &MSline::info,
+   &MScoupled::info, &MScorner::info, &MSmbend::info, &MSstep::info,
+   &MStee::info, &MScross::info, &MSopen::info, &MSgap::info, &MSvia::info,
   &Coplanar::info, &CPWopen::info, &CPWshort::info, &CPWgap::info,
   &CPWstep::info, 0};

--- a/qucs/qucs_de.ts
+++ b/qucs/qucs_de.ts
@ -3431,6 +3431,38 @@ Verwendung:  qucsedit [-r] Datei
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation>Fehler: Falsches Zeitformat in &quot;%1&quot;. Verwende positive Zahl mit den Einheiten</translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">Koaxialkabel</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_es.ts
+++ b/qucs/qucs_es.ts
@ -3218,6 +3218,38 @@ Use:  qucsedit [-r] archivo
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">Línea coaxial</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_fr.ts
+++ b/qucs/qucs_fr.ts
@ -3204,6 +3204,38 @@ Invocation :  qucsedit [-r] fichier
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation>Erreur ! mauvais format temporel dans &quot;%1&quot;. Utilisez des valeurs positives avec des unités</translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_he.ts
+++ b/qucs/qucs_he.ts
@ -3132,6 +3132,38 @@ Usage:  qucsedit [-r] file
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_hu.ts
+++ b/qucs/qucs_hu.ts
@ -3202,6 +3202,38 @@ Digitális szimuláció</translation>
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_it.ts
+++ b/qucs/qucs_it.ts
@ -3350,6 +3350,38 @@ Usage:  qucsedit [-r] file
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">Linea Coassiale</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_jp.ts
+++ b/qucs/qucs_jp.ts
@ -3179,6 +3179,38 @@ Usage:  qucsedit [-r] file
        <source>RS-FlipFlop</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">同軸線路</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_pl.ts
+++ b/qucs/qucs_pl.ts
@ -3264,6 +3264,38 @@ Stosowanie:  qucsedit [-r] plik
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">Linia koncentryczna</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_pt.ts
+++ b/qucs/qucs_pt.ts
@ -3141,6 +3141,38 @@ Usage:  qucsedit [-r] file
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_ro.ts
+++ b/qucs/qucs_ro.ts
@ -3217,6 +3217,38 @@ Folosire:  qucsedit [-r] file
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_sv.ts
+++ b/qucs/qucs_sv.ts
@ -3050,6 +3050,38 @@ Usage:  qucsedit [-r] file
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">Koaxialledning</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>
--- a/qucs/qucs_tr.ts
+++ b/qucs/qucs_tr.ts
@ -3050,6 +3050,38 @@ Kullanım:  qucsedit -r kütük
        <source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>coaxial transmission line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permittivity of dielectrica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>specific resistance of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>relative permeability of conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>outer diameter (inner diameter of shield)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>diameter of inner conductor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mechanical length of the line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coaxial Line</source>
+        <translation type="unfinished">Eşeksenli Hat</translation>
+    </message>
 </context>
 <context>
    <name>QucsActions</name>