Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #578 fix #598

Merged
merged 1 commit into from
Nov 11, 2016
Merged

Issue #578 fix #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qucs/qucs/diagrams/diagram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Diagram : public Element {
virtual QString extraMarkerText(Marker const*) const {return "";}

virtual void paint(ViewPainter*);
void paintDiagram(ViewPainter* p);
virtual void paintDiagram(ViewPainter* p);
void paintMarkers(ViewPainter* p, bool paintAll = true);
void setCenter(int, int, bool relative=false);
void getCenter(int&, int&);
Expand Down
7 changes: 6 additions & 1 deletion qucs/qucs/diagrams/tabdiagram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ TabDiagram::~TabDiagram()
{
}

// ------------------------------------------------------------
void TabDiagram::paint(ViewPainter *p)
{
paintDiagram(p);
}

// ------------------------------------------------------------
void TabDiagram::paintDiagram(ViewPainter *p)
{
// paint all lines
foreach(Line *pl, Lines) {
Expand Down
1 change: 1 addition & 0 deletions qucs/qucs/diagrams/tabdiagram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class TabDiagram : public Diagram {
virtual Diagram* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
virtual void paint(ViewPainter*);
virtual void paintDiagram(ViewPainter *p);
virtual int calcDiagram();
virtual int scroll(int);
virtual bool scrollTo(int, int, int);
Expand Down
7 changes: 6 additions & 1 deletion qucs/qucs/diagrams/timingdiagram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,13 @@ TimingDiagram::~TimingDiagram()
{
}

// ------------------------------------------------------------
void TimingDiagram::paint(ViewPainter *p)
{
paintDiagram(p);
}

// ------------------------------------------------------------
void TimingDiagram::paintDiagram(ViewPainter *p)
{
// paint all lines
foreach(Line *pl, Lines) {
Expand Down
3 changes: 2 additions & 1 deletion qucs/qucs/diagrams/timingdiagram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class TimingDiagram : public TabDiagram {

Diagram* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
void paint(ViewPainter*);
void paint(ViewPainter *p);
void paintDiagram(ViewPainter *p);
int calcDiagram();
int scroll(int);
bool scrollTo(int, int, int);
Expand Down