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 2004-08-22 14:41:35 +00:00
parent 74a0fac792
commit 8bbbbcfa97
15 changed files with 215 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qucs-help/docs/en/short.html
View File

@ -131,11 +131,18 @@ commands are shown in the following list:
element is selected.</td>
</tr>
<tr><td>Cursor left/right</td>
<td>Changes the position of selected markers on their graphs.</td>
<td>
Changes the position of selected markers on their graphs.<br>
If no marker is selected, move selected elements.<br>
If no element is selected, scroll document area.
</td>
</tr>
<tr><td>Cursor up/down</td>
<td>Changes the position of selected markers on more-dimensional
graphs.</td>
<td>
Changes the position of selected markers on more-dimensional graphs.<br>
If no marker is selected, move selected elements.<br>
If no element is selected, scroll document area.
</td>
</tr>
<tr><td>Tabulator</td>
<td>Changes to the next open document (according to the TabBar above).</td>

1
qucs/components/componentdialog.cpp
View File

@ -283,6 +283,7 @@ void ComponentDialog::slotApplyProperty()
}
prop->setSelected(item, true);
prop->ensureItemVisible(item);
slotSelectProperty(item); // switch to the next property
}

8
qucs/diagrams/graph.cpp
View File

@ -49,16 +49,16 @@ Graph::~Graph()
// ---------------------------------------------------------------------
void Graph::paint(QPainter *p, int x0, int y0)
{
// draw markers
for(Marker *pm = Markers.first(); pm != 0; pm = Markers.next())
pm->paint(p, x0, y0);
int *pp = Points;
if(pp == 0) {
p->setPen(QPen(QColor(Color))); // set color for xlabel text
return;
}
// draw markers
for(Marker *pm = Markers.first(); pm != 0; pm = Markers.next())
pm->paint(p, x0, y0);
int n1;
if(isSelected) {
p->setPen(QPen(QPen::darkGray,Thick+4));

4
qucs/diagrams/marker.cpp
View File

@ -169,6 +169,10 @@ void Marker::makeInvalid()
{
cx = 0;
cy = 0;
if(Diag) if(Diag->Name != "Rect") {
cx = Diag->x2 >> 1;
cy = Diag->y2 >> 1;
}
Text = QObject::tr("invalid");
QFontMetrics metrics(QucsSettings.font);

4
qucs/dialogs/settingsdialog.cpp
View File

@ -26,6 +26,7 @@
#include <qtabwidget.h>
#include <qlayout.h>
#include <qvalidator.h>
#include <qregexp.h>
SettingsDialog::SettingsDialog(QucsDoc *d, QWidget *parent, const char *name)
@ -64,7 +65,8 @@ SettingsDialog::SettingsDialog(QucsDoc *d, QWidget *parent, const char *name)
Check_GridOn = new QCheckBox(tr("show Grid"),Tab2);
gp2->addMultiCellWidget(Check_GridOn,0,0,0,1);
QValidator *Validator = new QIntValidator(0,1000, this);
QValidator *Validator
= new QRegExpValidator(QRegExp("[1-9]\\d{0,2}"), this);
QLabel *l3 = new QLabel(tr("horizontal Grid:"), Tab2);
gp2->addWidget(l3,1,0);

14
qucs/qucs_de.ts
View File

@ -1300,7 +1300,7 @@ Ungültiger Zeilenanfang!</translation>
</message>
<message>
<source>microstrip model |Kirschning|Kobayashi|Yamashita</source>
<translation>Mikrostreifenmodell |Kirschning|Kobayashi|Yamashita</translation>
<translation type="obsolete">Mikrostreifenmodell |Kirschning|Kobayashi|Yamashita</translation>
</message>
<message>
<source>specific resistance of metal</source>
@ -2058,6 +2058,18 @@ Ungültiger Zeilenanfang!</translation>
<source>excess phase in degrees</source>
<translation>Zusatzphase in Grad</translation>
</message>
<message>
<source>microstrip model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip dispersion model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip open end model (Kirschning,Hammerstad)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

16
qucs/qucs_fr.ts
View File

@ -1112,10 +1112,6 @@ Wrong line start!</source>
<source>junction potential</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model |Kirschning|Kobayashi|Yamashita</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>specific resistance of metal</source>
<translation type="unfinished"></translation>
@ -1852,6 +1848,18 @@ Wrong line start!</source>
<source>excess phase in degrees</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip dispersion model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip open end model (Kirschning,Hammerstad)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsApp</name>

16
qucs/qucs_it.ts
View File

@ -963,10 +963,6 @@ Wrong &apos;component&apos; line format!</source>
<source>spacing between the lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model |Kirschning|Kobayashi|Yamashita</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip cross</source>
<translation type="unfinished"></translation>
@ -1975,6 +1971,18 @@ Wrong &apos;component&apos; line format!</source>
<source>excess phase in degrees</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip dispersion model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip open end model (Kirschning,Hammerstad)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

14
qucs/qucs_pl.ts
View File

@ -1164,7 +1164,7 @@ Błędny początek linii!</translation>
</message>
<message>
<source>microstrip model |Kirschning|Kobayashi|Yamashita</source>
<translation>model linii mikropaskowej |Kirschning|Kobayashi|Yamashita </translation>
<translation type="obsolete">model linii mikropaskowej |Kirschning|Kobayashi|Yamashita </translation>
</message>
<message>
<source>specific resistance of metal</source>
@ -1918,6 +1918,18 @@ Błędny początek linii!</translation>
<source>excess phase in degrees</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip dispersion model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip open end model (Kirschning,Hammerstad)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsApp</name>

16
qucs/qucs_ro.ts
View File

@ -868,10 +868,6 @@ Wrong &apos;component&apos; line format!</source>
<source>spacing between the lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model |Kirschning|Kobayashi|Yamashita</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip cross</source>
<translation type="unfinished"></translation>
@ -1852,6 +1848,18 @@ Wrong &apos;component&apos; line format!</source>
<source>excess phase in degrees</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip dispersion model</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>microstrip open end model (Kirschning,Hammerstad)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsApp</name>

38
qucs/qucsdoc.cpp
View File

@ -1095,13 +1095,13 @@ bool QucsDoc::MarkerLeftRight(bool left)
bool acted = false;
for(Diagram *pd = Diags.last(); pd != 0; pd = Diags.prev())
for(Graph *pg = pd->Graphs.last(); pg != 0; pg = pd->Graphs.prev())
// test all markers of the diagram
for(Marker *pm = pg->Markers.first(); pm!=0; pm = pg->Markers.next()) {
// test all markers of the graph
for(Marker *pm = pg->Markers.first(); pm!=0; pm = pg->Markers.next())
if(pm->isSelected) {
if(!pm->moveLeftRight(left)) continue;
acted = true;
pm->moveLeftRight(left);
acted = true; // even though marker is not neccessarily moved
}
}
if(acted) setChanged(true, true, 'm');
return acted;
}
@ -1113,13 +1113,13 @@ bool QucsDoc::MarkerUpDown(bool up)
bool acted = false;
for(Diagram *pd = Diags.last(); pd != 0; pd = Diags.prev())
for(Graph *pg = pd->Graphs.last(); pg != 0; pg = pd->Graphs.prev())
// test all markers of the diagram
for(Marker *pm = pg->Markers.first(); pm!=0; pm = pg->Markers.next()) {
// test all markers of the graph
for(Marker *pm = pg->Markers.first(); pm!=0; pm = pg->Markers.next())
if(pm->isSelected) {
if(!pm->moveUpDown(up)) continue;
acted = true;
pm->moveUpDown(up);
acted = true; // even though marker is not neccessarily moved
}
}
if(acted) setChanged(true, true, 'm');
return acted;
}
@ -1929,16 +1929,22 @@ void QucsDoc::copyCompsWires(int& x1, int& y1, int& x2, int& y2)
Wire *pw;
Component *pc;
WireLabel *pl;
int bx1, by1, bx2, by2;
// int bx1, by1, bx2, by2;
// find bounds of all selected components
for(pc = Comps.first(); pc != 0; ) {
if(pc->isSelected) {
pc->Bounding(bx1, by1, bx2, by2);
if(bx1 < x1) x1 = bx1;
if(bx2 > x2) x2 = bx2;
if(by1 < y1) y1 = by1;
if(by2 > y2) y2 = by2;
// pc->Bounding(bx1, by1, bx2, by2);
// if(bx1 < x1) x1 = bx1;
// if(bx2 > x2) x2 = bx2;
// if(by1 < y1) y1 = by1;
// if(by2 > y2) y2 = by2;
// is better for unsymmetrical components
if(pc->cx < x1) x1 = pc->cx;
if(pc->cx > x2) x2 = pc->cx;
if(pc->cy < y1) y1 = pc->cy;
if(pc->cy > y2) y2 = pc->cy;
ElementCache.append(pc);
deleteComp(pc);

8
qucs/qucsfile.cpp
View File

@ -694,16 +694,18 @@ bool QucsFile::createSubNetlist(QTextStream *stream)
{
if(!giveNodeNames(stream)) return false;
int i;
int i, z;
QStringList sl;
QStringList::Iterator it;
Component *pc;
// collect all subcircuit ports and sort their node names into "sl"
for(pc = Comps->first(); pc != 0; pc = Comps->next())
if(pc->Model == "Port") {
i = pc->Props.first()->Value.toInt();
for(int z=sl.size(); z<i; z++)
for(z=sl.size(); z<i; z++)
sl.append(" ");
sl.insert(sl.at(i), pc->Ports.getFirst()->Connection->Name);
it = sl.at(i-1);
(*it) = pc->Ports.getFirst()->Connection->Name;
}
QString Type = Doc->DocName;

8
qucs/qucsinit.cpp
View File

@ -232,13 +232,13 @@ void QucsInit::initActions()
// cursor left/right to move marker on a graph
mainAccel->connectItem(mainAccel->insertItem(Key_Left),
App->view, SLOT(slotMarkerLeft()));
App->view, SLOT(slotCursorLeft()));
mainAccel->connectItem(mainAccel->insertItem(Key_Right),
App->view, SLOT(slotMarkerRight()));
App->view, SLOT(slotCursorRight()));
mainAccel->connectItem(mainAccel->insertItem(Key_Up),
App->view, SLOT(slotMarkerUp()));
App->view, SLOT(slotCursorUp()));
mainAccel->connectItem(mainAccel->insertItem(Key_Down),
App->view, SLOT(slotMarkerDown()));
App->view, SLOT(slotCursorDown()));
mainAccel->connectItem(mainAccel->insertItem(Key_Tab),
App, SLOT(slotNextTab()));

130
qucs/qucsview.cpp
View File

@ -175,36 +175,88 @@ void QucsView::setPainter(QPainter *p, QucsDoc *d)
}
// -----------------------------------------------------------
void QucsView::slotMarkerLeft()
void QucsView::slotCursorLeft()
{
if(Docs.current()->MarkerLeftRight(true)) {
QucsDoc *d = Docs.current();
if(d->MarkerLeftRight(true)) {
viewport()->repaint();
drawn = false;
return; // if marker selected, do not move other elements
}
movingElements.clear();
d->copySelectedElements(&movingElements);
if(movingElements.isEmpty()) {
slotScrollLeft();
return;
}
MAx1 = -(d->GridX); MAy1 = 0; // move "GridX" to left
MovingElements();
MAx3 = 1; // sign for moved elements
endElementMoving();
}
void QucsView::slotMarkerRight()
void QucsView::slotCursorRight()
{
if(Docs.current()->MarkerLeftRight(false)) {
QucsDoc *d = Docs.current();
if(d->MarkerLeftRight(false)) {
viewport()->repaint();
drawn = false;
return; // if marker selected, do not move other elements
}
movingElements.clear();
d->copySelectedElements(&movingElements);
if(movingElements.isEmpty()) {
slotScrollRight();
return;
}
MAx1 = d->GridX; MAy1 = 0; // move "GridX" to right
MovingElements();
MAx3 = 1; // sign for moved elements
endElementMoving();
}
void QucsView::slotMarkerUp()
void QucsView::slotCursorUp()
{
if(Docs.current()->MarkerUpDown(true)) {
QucsDoc *d = Docs.current();
if(d->MarkerUpDown(true)) {
viewport()->repaint();
drawn = false;
return; // if marker selected, do not move other elements
}
movingElements.clear();
d->copySelectedElements(&movingElements);
if(movingElements.isEmpty()) {
slotScrollUp();
return;
}
MAx1 = 0; MAy1 = -(d->GridY); // move "GridY" up
MovingElements();
MAx3 = 1; // sign for moved elements
endElementMoving();
}
void QucsView::slotMarkerDown()
void QucsView::slotCursorDown()
{
if(Docs.current()->MarkerUpDown(false)) {
QucsDoc *d = Docs.current();
if(d->MarkerUpDown(false)) {
viewport()->repaint();
drawn = false;
return; // if marker selected, do not move other elements
}
movingElements.clear();
d->copySelectedElements(&movingElements);
if(movingElements.isEmpty()) {
slotScrollDown();
return;
}
MAx1 = 0; MAy1 = d->GridY; // move "GridY" down
MovingElements();
MAx3 = 1; // sign for moved elements
endElementMoving();
}
// -----------------------------------------------------------
@ -246,7 +298,7 @@ void QucsView::endElementMoving()
QucsDoc *d = Docs.current();
for(pe = movingElements.first(); pe!=0; pe = movingElements.next()) {
pe->isSelected = false; // deselect first (maybe afterwards pe == NULL)
// pe->isSelected = false; // deselect first (maybe afterwards pe == NULL)
switch(pe->Type) {
case isWire:
if(pe->x1 == pe->x2) if(pe->y1 == pe->y2) break;
@ -284,6 +336,39 @@ void QucsView::endElementMoving()
drawn = false;
}
// -----------------------------------------------------------
// Moves elements in "movingElements" by MAx1/MAy1
void QucsView::MovingElements()
{
Wire *pw;
Element *pe;
for(pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
if(pe->Type == isWire) {
pw = (Wire*)pe; // connecting wires are not moved completely
if(int(pw->Port1) > 3) {
pw->x1 += MAx1; pw->y1 += MAy1;
if(pw->Label) { pw->Label->cx += MAx1; pw->Label->cy += MAy1; }
}
else { if(int(pw->Port1) & 1) { pw->x1 += MAx1; }
if(int(pw->Port1) & 2) { pw->y1 += MAy1; } }
if(int(pw->Port2) > 3) { pw->x2 += MAx1; pw->y2 += MAy1; }
else { if(int(pw->Port2) & 1) pw->x2 += MAx1;
if(int(pw->Port2) & 2) pw->y2 += MAy1; }
if(pw->Label) { // root of node label must lie on wire
if(pw->Label->cx < pw->x1) pw->Label->cx = pw->x1;
if(pw->Label->cy < pw->y1) pw->Label->cy = pw->y1;
if(pw->Label->cx > pw->x2) pw->Label->cx = pw->x2;
if(pw->Label->cy > pw->y2) pw->Label->cy = pw->y2;
}
}
else pe->setCenter(MAx1, MAy1, true);
}
}
// -----------------------------------------------------------
void QucsView::MouseDoNothing(QMouseEvent*)
{
@ -521,32 +606,7 @@ void QucsView::MMoveMoving2(QMouseEvent *Event)
MAy1 = MAy2 - MAy1;
MAx3 += MAx1; MAy3 += MAy1; // keep track of the complete movement
Wire *pw;
for(pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
if(pe->Type == isWire) {
pw = (Wire*)pe; // connecting wires are not moved completely
if(int(pw->Port1) > 3) {
pw->x1 += MAx1; pw->y1 += MAy1;
if(pw->Label) { pw->Label->cx += MAx1; pw->Label->cy += MAy1; }
}
else { if(int(pw->Port1) & 1) { pw->x1 += MAx1; }
if(int(pw->Port1) & 2) { pw->y1 += MAy1; } }
if(int(pw->Port2) > 3) { pw->x2 += MAx1; pw->y2 += MAy1; }
else { if(int(pw->Port2) & 1) pw->x2 += MAx1;
if(int(pw->Port2) & 2) pw->y2 += MAy1; }
if(pw->Label) { // root of node label must lie on wire
if(pw->Label->cx < pw->x1) pw->Label->cx = pw->x1;
if(pw->Label->cy < pw->y1) pw->Label->cy = pw->y1;
if(pw->Label->cx > pw->x2) pw->Label->cx = pw->x2;
if(pw->Label->cy > pw->y2) pw->Label->cy = pw->y2;
}
}
else pe->setCenter(MAx1, MAy1, true);
}
MovingElements(); // moves elements by MAx1/MAy1
// paint afterwards to avoid conflict between wire and label painting
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())

9
qucs/qucsview.h
View File

@ -92,10 +92,10 @@ protected slots:
void slotScrollRight();
public slots:
void slotMarkerLeft();
void slotMarkerRight();
void slotMarkerUp();
void slotMarkerDown();
void slotCursorLeft();
void slotCursorRight();
void slotCursorUp();
void slotCursorDown();
public:
void MouseDoNothing(QMouseEvent*);
@ -148,6 +148,7 @@ public:
void MReleaseResizePainting(QMouseEvent*);
void (QucsView::*MouseReleaseAction) (QMouseEvent*);
void MovingElements();
void endElementMoving();
signals: