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

Allow zooming of diagrams using the mouse.

Browse Source 
Initial commit of new feature, only rectangular diagrams are supported.
Behaviour with other diagram types is undefined.
This change also provides a preliminary refactoring of the code that
transforms between the various coordinate systems.
This commit is contained in:
Iwbnwif Yiw 2024-01-21 20:32:18 +00:00
parent 0d63ab95b7
commit 0660bd9332
12 changed files with 262 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -51,4 +51,9 @@ qrc_*.cpp
*.dat.xyce
*.dat.spopus
.idea/
__pycache__
__pycache__
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/settings.json
.vscode/tasks.json
.gitignore

2
qucs/diagrams/diagram.cpp
View File

@ -1973,7 +1973,7 @@ bool Diagram::calcYAxis(Axis *Axis, int x0) {
if ((zD < 1.5 * zDstep) || (z == 0)) {
double yVal = qucs::num2db(zD, Axis->Units);
if (engineeringNotation) tmp = misc::num2str(yVal);
if (engineeringNotation) tmp = misc::num2str(yVal, 2);
else tmp = misc::StringNiceNum(yVal);
if (Axis->up < 0.0) tmp = '-' + tmp;

5
qucs/diagrams/diagram.h
View File

@ -112,6 +112,8 @@ public:
virtual void calcCoordinate
(const double*, const double*, const double*, float*, float*, Axis const*) const {};
void calcCoordinateP (const double*x, const double*y, const double*z, Graph::iterator& p, Axis const* A) const;
// TODO: Make pointToValue a pure virtual function.
virtual QPointF pointToValue(const QPointF&) { return QPointF(0.0, 0.0); };
virtual void finishMarkerCoordinates(float&, float&) const;
virtual void calcLimits() {};
virtual QString extraMarkerText(Marker const*) const {return "";}
@ -172,6 +174,9 @@ protected:
virtual void calcData(Graph*);
QTransform pointTransform; // Transform between Qucs-S logical coordinates and diagram (logical) point coordinates.
QTransform valueTransform; // Transform between diagram point coordinates and diagram values.
private:
int Bounding_x1, Bounding_x2, Bounding_y1, Bounding_y2;
};

25
qucs/diagrams/rectdiagram.cpp
View File

@ -82,6 +82,27 @@ void RectDiagram::calcCoordinate(const double* xD, const double* yD, const doubl
if(!std::isfinite(*py)) *py = 0.0;
}
// --------------------------------------------------------------
// Convert a point on the diagram to the value represented by that point.
QPointF RectDiagram::pointToValue(const QPointF& point)
{
// Update the value transform. TODO: This only needs to be called when the limits change.
valueTransform.reset();
qreal xMin = xAxis.log ? log10(xAxis.low) : xAxis.low;
qreal yMin = yAxis.log ? log10(yAxis.low) : yAxis.low;
qreal xMax = xAxis.log ? log10(xAxis.up) : xAxis.up;
qreal yMax = yAxis.log ? log10(yAxis.up) : yAxis.up;
valueTransform.translate(xMin, yMin);
valueTransform.scale((xMax - xMin) / x2, (yMax - yMin) / y2);
// Obtain the value at point.
QPointF value = valueTransform.map(point);
// qDebug() << "Transform yields: " << value;
// Convert to exponential if needed.
return QPointF(xAxis.log ? exp10(value.x()) : value.x(), yAxis.log ? exp10(value.y()) : value.y());
}
// --------------------------------------------------------------
void RectDiagram::finishMarkerCoordinates(float& fCX, float& fCY) const
{
@ -174,7 +195,7 @@ if(xAxis.log) {
Lines.prepend(new qucs::Line(z, y2, z, 0, GridPen)); // x grid
if((zD < 1.5*zDstep) || (z == 0) || (z == x2)) {
if (engineeringNotation) tmp = misc::num2str(zD);
if (engineeringNotation) tmp = misc::num2str(zD, 2);
else tmp = misc::StringNiceNum(zD);
if(xAxis.up < 0.0) tmp = '-'+tmp;
w = metrics.boundingRect(tmp).width(); // width of text
@ -204,7 +225,7 @@ else { // not logarithmical
z = int(zD); // "int(...)" implies "floor(...)"
while((z <= x2) && (z >= 0)) { // create all grid lines
if(fabs(GridNum) < 0.01*pow(10.0, Expo)) GridNum = 0.0;// make 0 really 0
if (engineeringNotation) tmp = misc::num2str(GridNum);
if (engineeringNotation) tmp = misc::num2str(GridNum, 2);
else tmp = misc::StringNiceNum(GridNum);
w = metrics.boundingRect(tmp).width(); // width of text
// center text horizontally under the x tick mark

1
qucs/diagrams/rectdiagram.h
View File

@ -32,6 +32,7 @@ public:
int calcDiagram();
void calcLimits();
void calcCoordinate(const double*, const double*, const double*, float*, float*, Axis const*) const;
virtual QPointF pointToValue(const QPointF& point) override;
void finishMarkerCoordinates(float&, float&) const;
bool insideDiagram(float, float) const;

5
qucs/misc.cpp
View File

@ -181,7 +181,9 @@ QString misc::StringNum(double num, char form, int Precision)
// #########################################################################
QString misc::StringNiceNum(double num)
{
char Format[6] = "%.8e";
// char Format[6] = "%.8e";
// TEMP: lower precision to avoid overly long graph axis values.
char Format[6] = "%.2e";
if(fabs(num) < 1e-250) return QString("0"); // avoid many problems
if(fabs(log10(fabs(num))) < 3.0) Format[3] = 'g';
@ -300,6 +302,7 @@ QString misc::num2str(double Num, int Precision)
Str = QString::number(Num);
} else {
Str = QString::number(Num,'f',Precision);
qDebug() << Str;
}
if(c) Str += c;

138
qucs/mouseactions.cpp
View File

@ -655,6 +655,37 @@ void MouseActions::MMoveMarker(Schematic *Doc, QMouseEvent *Event)
Doc->PostPaintEvent(_Line, MAx3 - 7, MAy3 - 10, MAx3 + 7, MAy3 - 10);
}
/**
* @brief MouseActions::MMoveSetLimits Sets the cursor to a magnifying glass with a wave.
* @param Doc
* @param Event
*/
void MouseActions::MMoveSetLimits(Schematic *Doc, QMouseEvent *Event)
{
// Set the start position. TODO: Refactor to a QRectF for easy normalisation etc.
MAx3 = DOC_X_POS(Event->pos().x());
MAy3 = DOC_Y_POS(Event->pos().y());
#ifdef DEBUG_DIAGRAM_COORDS
for (Diagram *pd = Doc->Diagrams->last(); pd != 0; pd = Doc->Diagrams->prev()){
if (pd->getSelected(MAx3, MAy3)) {
QPointF diagramPoint(MAx3 - pd->cx, pd->cy - MAy3);
QPointF diagramValue(pd->pointToValue(diagramPoint));
// qDebug() << "Physical: " << Event->x() << "," << Event->y() <<
// " Qucs Logical: " << MAx3 << "," << MAy3 <<
// " Diagram point: " << diagramPoint <<
// " Diagram value: " << diagramValue;
// No need to keep looking.
return;
}
}
// qDebug() << "Physical: " << Event->x() << "," << Event->y() <<
// " Qucs Logical: " << MAx3 << "," << MAy3 <<
// " Diagram: -,-";
#endif
}
/**
* @brief MouseActions::MMoveMirrorX Paints rounded "mirror about y axis" mouse cursor
* @param Doc
@ -844,6 +875,8 @@ void MouseActions::rightPressMenu(Schematic *Doc, QMouseEvent *Event, float fX,
while (true) {
if (focusElement) {
if (focusElement->Type == isDiagram) {
ComponentMenu->addAction(QucsMain->resetDiagramLimits);
// TODO: This should probably be in qucs_init::initActions.
QAction *actExport = new QAction(QObject::tr("Export as image"), QucsMain);
QObject::connect(actExport,
SIGNAL(triggered(bool)),
@ -1552,6 +1585,40 @@ void MouseActions::MPressMarker(Schematic *Doc, QMouseEvent *, float fX, float f
drawn = false;
}
/**
* @brief MouseActions::MPressSetLimits Sets the start point of the diagram limits.
* @param Doc
* @param Event
*/
void MouseActions::MPressSetLimits(Schematic *Doc, QMouseEvent*, float fX, float fY)
{
// fX, fY are the scaled / adjusted coordinates, equivalent to DOC_X_POS(Event->x()).
// MAx1, MAy1 are needed to set the start of the selection box.
MAx1 = int(fX);
MAy1 = int(fY);
// Check to see if the mouse is within a diagram using the oddly named "getSelected".
for (Diagram *pd = Doc->Diagrams->last(); pd != 0; pd = Doc->Diagrams->prev()){
if (pd->getSelected(fX, fY)) {
qDebug() << "In a diagram, setting up for area selection.";
// cx and cy are the adjusted points of the bottom left hand corner.
mouseDownPoint = QPointF(fX - pd->cx, pd->cy - fY);
pActiveDiagram = pd;
QucsMain->MouseMoveAction = &MouseActions::MMoveSelect;
QucsMain->MouseReleaseAction = &MouseActions::MReleaseSetLimits;
Doc->grabKeyboard(); // no keyboard inputs during move actions
// No need to continue searching;
break;
}
}
Doc->viewport()->update();
drawn = false;
}
// -----------------------------------------------------------
void MouseActions::MPressOnGrid(Schematic *Doc, QMouseEvent *, float fX, float fY)
{
@ -1770,6 +1837,77 @@ void MouseActions::MReleaseResizePainting(Schematic *Doc, QMouseEvent *Event)
Doc->setChanged(true, true);
}
// -----------------------------------------------------------
void MouseActions::MReleaseSetLimits(Schematic *Doc, QMouseEvent *Event)
{
if (Event->button() != Qt::LeftButton) {
qDebug() << "Release set limits left button";
return;
}
// TODO: Make a point version of DOC_n_POS.
MAx2 = DOC_X_POS(Event->pos().x());
MAy2 = DOC_Y_POS(Event->pos().y());
qDebug() << "Mouse released after setting limits.";
// Check to see if the mouse is within a diagram using the oddly named "getSelected".
for (Diagram *pd = Doc->Diagrams->last(); pd != 0; pd = Doc->Diagrams->prev()){
if (pd->getSelected(MAx2, MAy2) && pd == pActiveDiagram) {
qDebug() << "In a diagram, setting limits";
mouseUpPoint = QPointF(MAx2 - pd->cx, pd->cy - MAy2);
QPointF minValue = pd->pointToValue(mouseDownPoint);
QPointF maxValue = pd->pointToValue(mouseUpPoint);
// TODO: Create a rectangle and normalise.
pd->xAxis.limit_min = minValue.x();
pd->xAxis.limit_max = maxValue.x();
pd->xAxis.step = (maxValue.x() - minValue.x()) / 2;
pd->xAxis.autoScale = false;
pd->yAxis.limit_min = maxValue.y();
pd->yAxis.limit_max = minValue.y();
pd->yAxis.step = (maxValue.y() - minValue.y() / 2);
pd->yAxis.autoScale = false;
// The diagram dialog updates the graphs by making a copy of the diagrams
// graphs, deleting the original graphs and adding the copy back.
// TODO: Refactor this away from the diagram dialog to the diagram class.
Q3PtrList<Graph> Graphs;
// Copy diagram graphs (this is implemented as a function in the diagram dialog)
Graphs.setAutoDelete(false);
for (Graph *pg : pd->Graphs)
Graphs.append(pg->sameNewOne());
// Delete all the existing graphs in the diagram.
pd->Graphs.clear();
// Now copy the graphs back to the diagram.
for(Graph *pg = Graphs.first(); pg != 0; pg = Graphs.next())
pd->Graphs.append(pg); // transfer the new graphs to diagram
// Cleanup the local copy of the graphs.
Graphs.clear();
Graphs.setAutoDelete(true);
// Now read in the data.
QFileInfo Info(Doc->DocName);
QString defaultDataSet = Info.absolutePath() + QDir::separator() + Doc->DataSet;
pd->loadGraphData(defaultDataSet);
}
}
// Stay in set limits and allow user to choose a new start point.
QucsMain->MouseMoveAction = &MouseActions::MMoveSetLimits;
Doc->viewport()->repaint();
Doc->setChanged(true, true);
Doc->viewport()->update();
drawn = false;
}
// -----------------------------------------------------------
void MouseActions::paintElementsScheme(Schematic *p)
{

8
qucs/mouseactions.h
View File

@ -25,6 +25,7 @@
class Wire;
class Schematic;
class Diagram;
class QPainter;
class QMenu;
class QMouseEvent;
@ -59,6 +60,10 @@ private:
bool isMoveEqual;
QucsApp* App;
Diagram* pActiveDiagram = nullptr;
QPointF mouseDownPoint;
QPointF mouseUpPoint;
// -------------------------------------------------------------------
public:
void MMoveSelect(Schematic*, QMouseEvent*);
@ -71,6 +76,7 @@ public:
void MMoveDelete(Schematic*, QMouseEvent*);
void MMoveLabel(Schematic*, QMouseEvent*);
void MMoveMarker(Schematic*, QMouseEvent*);
void MMoveSetLimits(Schematic*, QMouseEvent*);
void MMoveMirrorY(Schematic*, QMouseEvent*);
void MMoveMirrorX(Schematic*, QMouseEvent*);
void MMoveRotate(Schematic*, QMouseEvent*);
@ -95,6 +101,7 @@ public:
void MPressWire2(Schematic*, QMouseEvent*, float, float);
void MPressPainting(Schematic*, QMouseEvent*, float, float);
void MPressMarker(Schematic*, QMouseEvent*, float, float);
void MPressSetLimits(Schematic*, QMouseEvent*, float, float);
void MPressOnGrid(Schematic*, QMouseEvent*, float, float);
void MPressMoveText(Schematic*, QMouseEvent*, float, float);
void MPressZoomIn(Schematic*, QMouseEvent*, float, float);
@ -111,6 +118,7 @@ public:
void MReleaseResizePainting(Schematic*, QMouseEvent*);
void MReleaseMoveText(Schematic*, QMouseEvent*);
void MReleaseZoomIn(Schematic*, QMouseEvent*);
void MReleaseSetLimits(Schematic*, QMouseEvent*);
void paintElementsScheme(Schematic*);
void rotateElements(Schematic*, int&, int&);

2
qucs/qucs.cpp
View File

@ -2952,6 +2952,7 @@ void QucsApp::switchSchematicDoc (bool SchematicMode)
insGround->setEnabled (SchematicMode);
insEquation->setEnabled (SchematicMode);
setMarker->setEnabled (SchematicMode);
setDiagramLimits->setEnabled (SchematicMode);
exportAsImage->setEnabled (SchematicMode); // only export schematic, no text
@ -2977,6 +2978,7 @@ void QucsApp::switchEditMode(bool SchematicMode)
insWire->setEnabled(SchematicMode);
insLabel->setEnabled(SchematicMode);
setMarker->setEnabled(SchematicMode);
setDiagramLimits->setEnabled(SchematicMode);
selectMarker->setEnabled(SchematicMode);
simulate->setEnabled(SchematicMode);
// no search in "symbol painting mode" as only paintings should be used

4
qucs/qucs.h
View File

@ -349,7 +349,7 @@ public:
QAction *insWire, *insLabel, *insGround, *insPort, *insEquation, *magPlus,
*editRotate, *editMirror, *editMirrorY, *editPaste, *select,
*editActivate, *wire, *editDelete, *setMarker, *onGrid, *moveText,
*editActivate, *wire, *editDelete, *setMarker, *setDiagramLimits, *resetDiagramLimits, *onGrid, *moveText,
*helpIndex, *helpGetStart, *callEditor, *callFilter, *callLine, *callActiveFilter,
*showMsg, *showNet, *alignTop, *alignBottom, *alignLeft, *alignRight,
*distrHor, *distrVert, *selectAll, *callMatch, *changeProps,
@ -379,6 +379,8 @@ public slots:
void slotEditActivate(bool);
void slotInsertLabel(bool);
void slotSetMarker(bool);
void slotSetDiagramLimits(bool);
void slotResetDiagramLimits();
void slotOnGrid(bool); // set selected elements on grid
void slotMoveText(bool); // move property text of components
void slotZoomIn(bool);

55
qucs/qucs_actions.cpp
View File

@ -211,6 +211,61 @@ void QucsApp::slotSetMarker(bool on)
&MouseActions::MMoveMarker, &MouseActions::MPressMarker);
}
// -----------------------------------------------------------------------
// Toolbar button to update the diagram limits using the mouse - aka zooming.
void QucsApp::slotSetDiagramLimits(bool on)
{
performToggleAction(on, setDiagramLimits, 0,
&MouseActions::MMoveSetLimits, &MouseActions::MPressSetLimits);
}
// -----------------------------------------------------------------------
// Context menu option to reset the diagram limits to defaults.
void QucsApp::slotResetDiagramLimits()
{
qDebug() << "Reset limits.";
if (view->focusElement && view->focusElement->Type == isDiagram)
{
Diagram* diagram = static_cast<Diagram*>(view->focusElement);
diagram->xAxis.autoScale = true;
diagram->yAxis.autoScale = true;
// The diagram dialog updates the graphs by making a copy of the diagrams
// graphs, deleting the original graphs and adding the copy back.
// TODO: Refactor this away from the diagram dialog to the diagram class.
Q3PtrList<Graph> Graphs;
// Copy diagram graphs (this is implemented as a function in the diagram dialog)
Graphs.setAutoDelete(false);
for (Graph* graph : diagram->Graphs)
Graphs.append(graph->sameNewOne());
// Delete all the existing graphs in the diagram.
diagram->Graphs.clear();
// Now copy the graphs back to the diagram.
for(Graph* graph = Graphs.first(); graph != 0; graph = Graphs.next())
diagram->Graphs.append(graph); // transfer the new graphs to diagram
// Cleanup the local copy of the graphs.
Graphs.clear();
Graphs.setAutoDelete(true);
// Now read in the data.
Schematic* Doc = static_cast<Schematic*>(getDoc(-1)); // Get a pointer to the current document.
QFileInfo Info(Doc->DocName);
QString defaultDataSet = Info.absolutePath() + QDir::separator() + Doc->DataSet;
diagram->loadGraphData(defaultDataSet);
Doc->viewport()->repaint();
Doc->setChanged(true, true);
Doc->viewport()->update();
}
// Return to select mode (in case SetDiagramLimits is still selected).
slotEscape();
}
// -----------------------------------------------------------------------
// Is called, when "move component text" action is triggered.
void QucsApp::slotMoveText(bool on)

17
qucs/qucs_init.cpp
View File

@ -475,7 +475,7 @@ void QucsApp::initActions()
connect(insPort, SIGNAL(toggled(bool)), SLOT(slotInsertPort(bool)));
insWire = new QAction(QIcon(":bitmaps/svg/wire.svg"), tr("Wire"), this);
insWire->setShortcut(tr("Ctrl+E"));
insWire->setShortcut(tr("Ctrl+W"));
insWire->setStatusTip(tr("Inserts a wire"));
insWire->setWhatsThis(tr("Wire\n\nInserts a wire"));
insWire->setCheckable(true);
@ -574,6 +574,19 @@ void QucsApp::initActions()
setMarker->setCheckable(true);
connect(setMarker, SIGNAL(toggled(bool)), SLOT(slotSetMarker(bool)));
setDiagramLimits = new QAction(QIcon((":/bitmaps/svg/viewmag1.svg")), tr("Set Diagram Limits"), this);
setDiagramLimits->setShortcut(tr("Ctrl+E"));
setDiagramLimits->setStatusTip(tr("Pick the diagram limits using the mouse. Right click for default."));
setDiagramLimits->setWhatsThis(tr("Set Diagram Limits\n\nPick the diagram limits using the mouse. Right click for default."));
setDiagramLimits->setCheckable(true);
connect(setDiagramLimits, SIGNAL(toggled(bool)), SLOT(slotSetDiagramLimits(bool)));
resetDiagramLimits = new QAction(tr("Reset Diagram Limits"), this);
resetDiagramLimits->setShortcut(tr("Ctrl+Shift+E"));
resetDiagramLimits->setStatusTip(tr("Resets the limits for all axis to auto."));
resetDiagramLimits->setWhatsThis(tr("Reset Diagram Limits\n\nResets the limits for all axis to auto."));
connect(resetDiagramLimits, SIGNAL(triggered()), SLOT(slotResetDiagramLimits()));
showMsg = new QAction(tr("Show Last Messages"), this);
showMsg->setShortcut(Qt::Key_F5);
showMsg->setStatusTip(tr("Shows last simulation messages"));
@ -787,6 +800,7 @@ void QucsApp::initMenuBar()
viewMenu->addAction(magOne);
viewMenu->addAction(magPlus);
viewMenu->addAction(magMinus);
viewMenu->addAction(setDiagramLimits);
viewMenu->addSeparator();
//viewMenu->setCheckable(true);
viewMenu->addAction(viewToolBar);
@ -939,6 +953,7 @@ void QucsApp::initToolBar()
simulateToolbar->addAction(tune);
simulateToolbar->addAction(dpl_sch);
simulateToolbar->addAction(setMarker);
simulateToolbar->addAction(setDiagramLimits);
}
// ----------------------------------------------------------