Merge pull request #598 from ra3xdh/578_fix

Issue #578 fix
Qucs · Nov 11, 2016 · 269230f · 269230f
2 parents 21e4a91 + 2152392
commit 269230f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/qucs/qucs/diagrams/diagram.h b/qucs/qucs/diagrams/diagram.h
@@ -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&);

diff --git a/qucs/qucs/diagrams/tabdiagram.cpp b/qucs/qucs/diagrams/tabdiagram.cpp
@@ -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) {

diff --git a/qucs/qucs/diagrams/tabdiagram.h b/qucs/qucs/diagrams/tabdiagram.h
@@ -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);

diff --git a/qucs/qucs/diagrams/timingdiagram.cpp b/qucs/qucs/diagrams/timingdiagram.cpp
@@ -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) {

diff --git a/qucs/qucs/diagrams/timingdiagram.h b/qucs/qucs/diagrams/timingdiagram.h
@@ -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);