FIX TTF and style

stmoon · Aug 14, 2021 · 13d546d · 13d546d
1 parent da8e546
commit 13d546d
Show file tree

Hide file tree

Showing 12 changed files with 2,191 additions and 95 deletions.
diff --git a/datasamples/simple_fft.csv b/datasamples/simple_fft.csv
diff --git a/plotjuggler_app/plotwidget.cpp b/plotjuggler_app/plotwidget.cpp
@@ -552,6 +552,10 @@ QDomElement PlotWidget::xmlSaveState(QDomDocument& doc) const
   {
     plot_el.setAttribute("style", "Dots");
   }
+  else if (curveStyle() == PlotWidgetBase::STICKS)
+  {
+    plot_el.setAttribute("style", "Sticks");
+  }
 
   for (auto& it : curveList())
   {
@@ -723,6 +727,10 @@ bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
     {
       changeCurvesStyle( PlotWidgetBase::DOTS );
     }
+    else if (style == "Sticks" )
+    {
+      changeCurvesStyle( PlotWidgetBase::STICKS );
+    }
   }
 
   updateMaximumZoomArea();
@@ -1242,42 +1250,15 @@ void PlotWidget::on_pasteAction_triggered()
 
 bool PlotWidget::eventFilter(QObject* obj, QEvent* event)
 {
-  if( event->type() == QEvent::Destroy )
+  if( PlotWidgetBase::eventFilter(obj, event) )
   {
-    return false;
-  }
-  QwtScaleWidget* bottomAxis = qwtPlot()->axisWidget(QwtPlot::xBottom);
-  QwtScaleWidget* leftAxis = qwtPlot()->axisWidget(QwtPlot::yLeft);
-
-  if (magnifier() &&
-      (obj == bottomAxis || obj == leftAxis)
-      && !(isXYPlot()
-      && keepRatioXY()))
-  {
-    if (event->type() == QEvent::Wheel)
-    {
-      auto wheel_event = dynamic_cast<QWheelEvent*>(event);
-      if (obj == bottomAxis)
-      {
-        magnifier()->setDefaultMode(PlotMagnifier::X_AXIS);
-      }
-      else
-      {
-        magnifier()->setDefaultMode(PlotMagnifier::Y_AXIS);
-      }
-      magnifier()->widgetWheelEvent(wheel_event);
-    }
+    return true;
   }
 
   if (obj == qwtPlot()->canvas())
   {
-    if (magnifier())
-    {
-      magnifier()->setDefaultMode(PlotMagnifier::BOTH_AXES);
-    }
     return canvasEventFilter(event);
   }
-
   return false;
 }
 

diff --git a/plotjuggler_app/plotwidget_editor.cpp b/plotjuggler_app/plotwidget_editor.cpp
@@ -56,6 +56,10 @@ PlotwidgetEditor::PlotwidgetEditor(PlotWidget *plotwidget, QWidget *parent) :
   {
     ui->radioPoints->setChecked(true);
   }
+  else if( _plotwidget->curveStyle() == PlotWidgetBase::STICKS)
+  {
+    ui->radioSticks->setChecked(true);
+  }
   else {
     ui->radioBoth->setChecked(true);
   }
@@ -282,6 +286,15 @@ void PlotwidgetEditor::on_radioBoth_toggled(bool checked)
   }
 }
 
+void PlotwidgetEditor::on_radioSticks_toggled(bool checked)
+{
+  if(checked)
+  {
+    _plotwidget->changeCurvesStyle( PlotWidgetBase::STICKS );
+  }
+}
+
+
 void PlotwidgetEditor::on_checkBoxMax_toggled(bool checked)
 {
   ui->lineLimitMax->setEnabled(checked);

diff --git a/plotjuggler_app/plotwidget_editor.h b/plotjuggler_app/plotwidget_editor.h
@@ -75,6 +75,8 @@ private slots:
 
   void on_lineLimitMax_textChanged(const QString &text);
 
+  void on_radioSticks_toggled(bool checked);
+
 private:
   Ui::PlotWidgetEditor *ui;
 

diff --git a/plotjuggler_app/plotwidget_editor.ui b/plotjuggler_app/plotwidget_editor.ui
@@ -334,6 +334,13 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QRadioButton" name="radioSticks">
+              <property name="text">
+               <string>Sticks</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>

diff --git a/plotjuggler_app/resources/stylesheet_dark.qss b/plotjuggler_app/resources/stylesheet_dark.qss
@@ -21,13 +21,11 @@ item_selection_background: #148CD2
 
 QWidget {
   background: transparent;
-  border: 0px solid ${border_default};
   padding: 0px;
   color: ${default_text};
   font-size: 10pt;
 }
 
-
 QWidget:disabled{
   color: ${disabled_text};
   background: ${widget_background_disabled};
@@ -802,7 +800,10 @@ QSplitter#mainSplitter::handle:horizontal::hover {
         stop:0.6 #cc00cc, stop:1.0 #1177ff);
 }
 
-QWidget#framePlotPreview{
+QFrame#framePlotPreview,
+QFrame#framePlotPreviewA,
+QFrame#framePlotPreviewB,
+QFrame#framePlotPreviewC {
    background-color: ${widget_background};
    border: 1px solid ${border_default};
    margin: 0px;
@@ -832,6 +833,11 @@ QwtPlot {
    border: 0px;
 }
 
+QWidget#qwtCanvas {
+   background: ${widget_background};
+   border: 0px;
+}
+
 QDialog#PlotWidgetEditor QListView::item:selected {
     background-color: ${main_background};
 }

diff --git a/plotjuggler_app/resources/stylesheet_light.qss b/plotjuggler_app/resources/stylesheet_light.qss
@@ -21,10 +21,9 @@ item_selection_background: #62c5ff
 
 QWidget {
   background: transparent;
-  border: 0px solid ${border_default};
   padding: 0px;
   color: ${default_text};
-  font-size: 10pt;
+  font-size: 11pt;
 }
 
 QWidget:disabled{
@@ -812,12 +811,16 @@ QSplitter#mainSplitter::handle:horizontal::hover {
         stop:0.6 #cc00cc, stop:1.0 #1177ff);
 }
 
-QWidget#framePlotPreview{
+QFrame#framePlotPreview,
+QFrame#framePlotPreviewA,
+QFrame#framePlotPreviewB,
+QFrame#framePlotPreviewC {
    background-color: ${widget_background};
    border: 1px solid ${border_default};
    margin: 0px;
 }
 
+
 QWidget#formulaPage{
    background-color: ${main_background};
 }
@@ -842,6 +845,11 @@ QwtPlot {
    border: 0px;
 }
 
+QWidget#qwtCanvas {
+   background: ${widget_background};
+   border: 0px;
+}
+
 QDialog#PlotWidgetEditor QListView::item:selected {
     background-color: ${main_background};
 }

diff --git a/plotjuggler_base/include/PlotJuggler/plotwidget_base.h b/plotjuggler_base/include/PlotJuggler/plotwidget_base.h
@@ -27,7 +27,7 @@ class PlotWidgetBase: public QObject
     LINES,
     DOTS,
     LINES_AND_DOTS,
-    HISTOGRAM
+    STICKS
   };
 
   struct CurveInfo
@@ -131,6 +131,8 @@ public slots:
 
   void updateMaximumZoomArea();
 
+  bool eventFilter(QObject* obj, QEvent* event);
+
 private:
   bool _xy_mode;
 

diff --git a/plotjuggler_base/src/plotwidget_base.cpp b/plotjuggler_base/src/plotwidget_base.cpp
@@ -346,6 +346,7 @@ PlotWidgetBase::PlotWidgetBase(QWidget *parent):
     canvas->setPaintAttribute(QwtPlotCanvas::BackingStore, true);
     abs_canvas = canvas;
   }
+  abs_canvas->setObjectName("qwtCanvas");
 
   p = new QwtPlotPimpl(this, abs_canvas, onViewResized, onEvent);
 
@@ -507,6 +508,44 @@ void PlotWidgetBase::setAcceptDrops(bool accept)
   qwtPlot()->setAcceptDrops(accept);
 }
 
+bool PlotWidgetBase::eventFilter(QObject* obj, QEvent* event)
+{
+  if( event->type() == QEvent::Destroy )
+  {
+    return false;
+  }
+
+  QwtScaleWidget* bottomAxis = qwtPlot()->axisWidget(QwtPlot::xBottom);
+  QwtScaleWidget* leftAxis = qwtPlot()->axisWidget(QwtPlot::yLeft);
+
+  if (magnifier() &&
+      (obj == bottomAxis || obj == leftAxis)
+      && !(isXYPlot()
+      && keepRatioXY()))
+  {
+    if (event->type() == QEvent::Wheel)
+    {
+      auto wheel_event = dynamic_cast<QWheelEvent*>(event);
+      if (obj == bottomAxis)
+      {
+        magnifier()->setDefaultMode(PlotMagnifier::X_AXIS);
+      }
+      else
+      {
+        magnifier()->setDefaultMode(PlotMagnifier::Y_AXIS);
+      }
+      magnifier()->widgetWheelEvent(wheel_event);
+    }
+  }
+  if (obj == qwtPlot()->canvas())
+  {
+    if (magnifier())
+    {
+      magnifier()->setDefaultMode(PlotMagnifier::BOTH_AXES);
+    }
+  }
+  return false;
+}
 
 QColor PlotWidgetBase::getColorHint(PlotData* data)
 {
@@ -592,7 +631,7 @@ void PlotWidgetBase::setStyle( QwtPlotCurve* curve, CurveStyle style )
     break;
     case DOTS: curve->setStyle( QwtPlotCurve::Dots );
     break;
-    case HISTOGRAM: curve->setStyle( QwtPlotCurve::Sticks );
+    case STICKS: curve->setStyle( QwtPlotCurve::Sticks );
   }
 }