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

*** empty log message ***

Browse Source
This commit is contained in:
margraf 2006-01-16 07:19:57 +00:00
parent 72a61af3b5
commit cdca4242f0
20 changed files with 275 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
qucs-filter/qf_filter.cpp
View File

@ -15,6 +15,10 @@
* *
***************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <math.h>
#include <iostream>
#include <strstream>
@ -201,6 +205,161 @@ std::string qf_filter::to_qucs (void) {
return res.str();
}
/*
void qf_filter::to_Qucs (void) {
double Value, Value2;
// create the Qucs schematic
std::cout << "<Qucs Schematic " << PACKAGE_VERSION << ">\n";
int x = 20;
if(type != BANDPASS) x += 40;
std::cout << "<Components>\n";
std::cout << "<Pac P1 1 " << x << " 320 18 -26 0 1 \"1\" 1 \""
<< imp << " Ohm\" 1 \"0 dBm\" 0 \"1 GHz\" 0>\n";
std::cout << "<GND * 1 " << x << " 350 0 0 0 0>\n";
int yc = 320, yl = 240;
unsigned int i, j=0;
for(i = 0; i < o; i++) {
x = 100 +((i+1) * 70);
if(Comp[j].comp == CAP)
std::cout << "<C C";
else
std::cout << "<L L";
std::cout << j << " 1 " << x;
if(Comp[j].node2 == 0)
std::cout << " " << yc << " 17 -26 0 1";
else
std::cout << " " << yl << " -26 10 0 0";
std::cout << " \"" << Comp[j].val;
if(Comp[j].comp == CAP)
std::cout << "F";
else
std::cout << "H";
std::cout << "\" 1>\n";
if(Comp[j].node2 == 0)
std::cout << "<GND * 1 " << x << " " << (yc+30) << " 0 0 0 0>\n";
j++;
if(j >= ncomp) break;
if(Comp[j].node1 != Comp[j-1].node1) continue;
if(Comp[j].node2 != Comp[j-1].node2) continue;
// second component parallel to the last
if(Comp[j].comp == CAP)
std::cout << "<C C";
else
std::cout << "<L L";
std::cout << j << " 1 " << x;
if(Comp[j].node2 == 0)
std::cout << " " << (yc+60) << " 17 -26 0 1";
else
std::cout << " " << (yl-35) << " -26 -44 0 0";
std::cout << " \"" << Comp[j].val;
if(Comp[j].comp == CAP)
std::cout << "F";
else
std::cout << "H";
std::cout << "\" 1>\n";
if(Comp[j].node2 == 0)
std::cout << "<GND * 1 " << x << " " << (yc+90) << " 0 0 0 0>\n";
j++;
}
if(o & 1) x += 110;
else x += 70;
std::cout << "<Pac P2 1 "<< x << " 320 18 -26 0 1 \"2\" 1 \""
<< imp << " Ohm\" 1 \"0 dBm\" 0 \"1 GHz\" 0>\n"
<< "<GND * 1 " << x << " 350 0 0 0 0>\n";
yc += 100;
Value = f / 10.0;
if((type == BANDPASS) || (type == BANDSTOP))
Value2 = 10.0 * (f + bw);
else
Value2 = 10.0 *f;
std::cout << "<.SP SP1 1 70 " << yc << " 0 50 0 0 \"log\" 1 \""
<< Value << "Hz\" 1 \"" << Value2
<< "Hz\" 1 \"200\" 1 \"no\" 0 \"1\" 0 \"2\" 0>\n"
<< "<Eqn Eqn1 1 260 " << (yc+10)
<< " -28 15 0 0 \"dBS21=dB(S[2,1])\" 1 \"dBS11=dB(S[1,1])\" 1 \"yes\" 0>\n"
<< "</Components>\n";
std::cout << "<Wires>\n";
// connect left source
x = 20;
if(type != BANDPASS) x += 40;
std::cout << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n"
<< "<" << x << " 240 170 240 \"\" 0 0 0>\n";
// wires down to shunt components
for(i = 0; i < (o / 2) + 1; i++) {
x = 170 + (i * 140);
std::cout << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n";
}
// horizontal wires for series components
if(type == BANDPASS) {
for(i = 0; i < (o / 2); i++) {
x = 170 + (i * 140);
std::cout << "<" << x << " 240 " << (x+20) << " 240 \"\" 0 0 0>\n"
<< "<" << (x-30) << " 290 " << x << " 290 \"\" 0 0 0>\n"
<< "<" << (x-30) << " 350 " << x << " 350 \"\" 0 0 0>\n";
}
if(o & 1)
std::cout << "<" << (x+110) << " 290 " << (x+140) << " 290 \"\" 0 0 0>\n"
<< "<" << (x+110) << " 350 " << (x+140) << " 350 \"\" 0 0 0>\n";
}
else
for(i = 0; i < (o / 2); i++) {
x = 170 + (i * 140);
std::cout << "<" << x << " 240 " << (x+40) << " 240 \"\" 0 0 0>\n"
<< "<" << (x+100) << " 240 " << (x+140) << " 240 \"\" 0 0 0>\n";
// if(type == BANDSTOP)
// connect parallel components
std::cout << "<" << (x+40) << " 240 " << (x+40) << " 205 \"\" 0 0 0>\n"
<< "<" << (x+100) << " 240 " << (x+100) << " 205 \"\" 0 0 0>\n";
}
// connect right source
if(o & 1) {
x += 140 + 110;
std::cout << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n"
<< "<" << (x-110) << " 240 " << x << " 240 \"\" 0 0 0>\n";
}
std::cout << "</Wires>\n"
<< "<Diagrams>\n"
<< "</Diagrams>\n"
<< "<Paintings>\n";
std::cout << "<Text 400 " << (yc+10) << " 12 #000000 0 \"Cauer ";
switch(type) {
case LOWPASS:
std::cout << "low-pass filter\\n" << f << "Hz cutoff"; break;
case HIGHPASS:
std::cout << "high-pass filter\\n" << f << "Hz cutoff"; break;
case BANDPASS:
std::cout << "band-pass filter\\n" << f << "Hz..." << (f+bw) << "Hz"; break;
case BANDSTOP:
std::cout << "band-reject filter\\n" << f << "Hz..." << (f+bw) << "Hz"; break;
}
std::cout << ", PI-type,\\nimpedance matching " << imp << " Ohm\">\n";
std::cout << "</Paintings>\n";
*/
void qf_filter::dump_qucs (void) {
std::cout << to_qucs();
}

6
qucs/ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-14 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* qucsdigi script can run complete digital simulation
* check time formats for VHDL standard
* correct truth table simulation
2006-01-05 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* new component: coupler

17
qucs/components/digi_source.cpp
View File

@ -16,6 +16,7 @@
***************************************************************************/
#include "digi_source.h"
#include "main.h"
#include "node.h"
@ -102,7 +103,7 @@ QString Digi_Source::NetList()
// -------------------------------------------------------
QString Digi_Source::VHDL_Code(int NumPorts)
{
QString s, Time;
QString s, t;
QString Out(" " + Ports.getFirst()->Connection->Name + " <= '");
s = "\n " + Name + ":process\n begin\n";
@ -115,13 +116,17 @@ QString Digi_Source::VHDL_Code(int NumPorts)
else
State = '1';
Time = Props.next()->Value.section(';',z,z);
while(!Time.isEmpty()) {
t = Props.next()->Value.section(';',z,z).stripWhiteSpace();
while(!t.isEmpty()) {
s += Out + State + "';"; // next value for signal
s += " wait for " + Time + ";\n";
if(!VHDL_Time(t, Name))
return t; // time has not VHDL format
s += " wait for " + t + ";\n";
State ^= 1;
z++;
Time = Props.current()->Value.section(';',z,z);
t = Props.current()->Value.section(';',z,z).stripWhiteSpace();
}
}
else { // truth table simulation
@ -130,7 +135,7 @@ QString Digi_Source::VHDL_Code(int NumPorts)
for(z=1<<(NumPorts-Num); z>0; z--) {
s += Out + State + "';"; // next value for signal
s += " wait for "+QString::number(1 << Num)+"ns;\n";
s += " wait for "+QString::number(1 << Num)+" ns;\n";
State ^= 1;
}
}

9
qucs/dialogs/simmessage.cpp
View File

@ -245,6 +245,11 @@ void SimMessage::startSimulator()
QString SimTime =
Doc->File.createNetlist(Stream, SimPorts);
NetlistFile.close();
if(SimTime.at(0) == '§') {
ErrText->insert(SimTime.mid(1));
FinishSimulation(-1);
return;
}
ProgText->insert(tr("done.\n"));
QStringList com;
@ -252,8 +257,8 @@ void SimMessage::startSimulator()
com << QucsSettings.BinDir + "qucsator" << "-b" << "-g" << "-i"
<< QucsHomeDir.filePath("netlist.txt") << "-o" << DataSet;
else
com << QucsSettings.BinDir + "qucsdigi" << "netlist.txt" << SimTime
<< QucsHomeDir.absPath();
com << QucsSettings.BinDir + "qucsdigi" << "netlist.txt" << DataSet
<< SimTime << QucsHomeDir.absPath() << QucsSettings.BinDir;
SimProcess.setArguments(com);

27
qucs/main.cpp
View File

@ -343,6 +343,33 @@ QString properName (const QString& Name)
return s;
}
// #########################################################################
// Checks and corrects a time (number & unit) according VHDL standard.
bool VHDL_Time(QString& t, const QString& Name)
{
char *p;
double Time = strtod(t.latin1(), &p);
while(*p == ' ') p++;
for(;;) {
if(Time >= 0.0) {
if(strcmp(p, "fs") == 0) break;
if(strcmp(p, "ps") == 0) break;
if(strcmp(p, "ns") == 0) break;
if(strcmp(p, "us") == 0) break;
if(strcmp(p, "ms") == 0) break;
if(strcmp(p, "sec") == 0) break;
if(strcmp(p, "min") == 0) break;
if(strcmp(p, "hr") == 0) break;
}
t = "§" + QObject::tr("Error: Wrong time format in \"%1\". Use positive number with units").arg(Name)
+ " fs, ps, ns, us, ms, sec, min, hr.\n";
return false;
}
t = QString::number(Time) + " " + QString(p); // the space is mandatory !
return true;
}
// #########################################################################
// ########## ##########

1
qucs/main.h
View File

@ -69,6 +69,7 @@ QString num2str (double);
QString StringNiceNum(double);
void convert2Unicode(QString&);
QString properName (const QString&);
bool VHDL_Time(QString&, const QString&);
// just dummies for empty lists
extern QPtrList<Wire> SymbolWires;

4
qucs/qucs_de.ts
View File

@ -3427,6 +3427,10 @@ Verwendung: qucsedit [-r] Datei
<source>RS-FlipFlop</source>
<translation>RS-Speicherglied</translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_es.ts
View File

@ -3214,6 +3214,10 @@ Use: qucsedit [-r] archivo
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_fr.ts
View File

@ -3198,6 +3198,10 @@ Invocation : qucsedit [-r] fichier
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_he.ts
View File

@ -3128,6 +3128,10 @@ Usage: qucsedit [-r] file
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_hu.ts
View File

@ -3198,6 +3198,10 @@ Digitális szimuláció</translation>
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_it.ts
View File

@ -3346,6 +3346,10 @@ Usage: qucsedit [-r] file
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_jp.ts
View File

@ -3174,6 +3174,10 @@ Usage: qucsedit [-r] file
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_pl.ts
View File

@ -3260,6 +3260,10 @@ Stosowanie: qucsedit [-r] plik
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_pt.ts
View File

@ -3137,6 +3137,10 @@ Usage: qucsedit [-r] file
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_ro.ts
View File

@ -3213,6 +3213,10 @@ Folosire: qucsedit [-r] file
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_sv.ts
View File

@ -3046,6 +3046,10 @@ Usage: qucsedit [-r] file
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

4
qucs/qucs_tr.ts
View File

@ -3046,6 +3046,10 @@ Kullanım: qucsedit -r kütük
<source>RS-FlipFlop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error: Wrong time format in &quot;%1&quot;. Use positive number with units</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

12
qucs/qucsdigi
View File

@ -25,15 +25,17 @@
# Bail out on any error
set -e
if [ "$#" != 3 ]; then
echo "Usage: $0 <netlist.txt> <time> <directory>"
if [ "$#" != 5 ]; then
echo "Usage: $0 <netlist.txt> <output.dat> <time> <directory> <bindirectory>"
echo " Directory has to contain netlist.txt"
exit 1
fi
NAME=$1
TIME=$2
DIR=$3
NAMEOUT=$2
TIME=$3
DIR=$4
BINDIR=$5
if [ ! -d "$DIR" ]; then
echo "$DIR: Not a directory"
@ -78,5 +80,5 @@ echo -n "simulating..."
echo " done."
echo -n "running VCD conversion..."
#qucsconv -if vcd -of qucsdata -i $NAME.vcd -o $NAME.dat
$BINDIR/qucsconv -if vcd -of qucsdata -i $NAME.vcd -o $NAMEOUT
echo " done."

13
qucs/qucsfile.cpp
View File

@ -1082,9 +1082,16 @@ QString QucsFile::createNetlist(QTextStream& stream, int NumPorts)
if(NumPorts < 0)
s = pc->NetList();
else {
if(pc->Model.at(0) == '.')
Time = pc->Props.at(1)->Value;
if(pc->Model.at(0) == '.') { // simulation component ?
if(NumPorts > 0) // truth table simulation ?
Time = QString::number((1 << NumPorts) - 1) + " ns";
else {
Time = pc->Props.at(1)->Value;
if(!VHDL_Time(Time, pc->Name)) return Time; // wrong time format
}
}
s = pc->VHDL_Code(NumPorts);
if(s.at(0) == '§') return s; // return error
}
if(!s.isEmpty()) // not inserted: subcircuit ports, disabled components
@ -1094,7 +1101,5 @@ QString QucsFile::createNetlist(QTextStream& stream, int NumPorts)
if(NumPorts >= 0)
stream << "end architecture;\n";
if(NumPorts > 0)
return QString::number(1 << NumPorts) + "ns";
return Time;
}