From a57dbbccb96d58b05fee792d07a60f6b1df06928 Mon Sep 17 00:00:00 2001
From: tianduanrui <2407223896@qq.com>
Date: Tue, 24 Oct 2017 20:18:09 +0800
Subject: [PATCH] change complex progressbar to circle effect progressbar

---
 examples/exquisite/qqtexquisiteform.cpp       |   6 +-
 examples/exquisite/qqtexquisiteform.ui        |   6 +-
 ...bar.cpp => qqtcircleeffectprogressbar.cpp} | 100 +++++++++---------
 ...ressbar.h => qqtcircleeffectprogressbar.h} |  14 +--
 src/qqt_source.pri                            |   8 +-
 5 files changed, 67 insertions(+), 67 deletions(-)
 rename src/exquisite/{qqtcomplexprogressbar.cpp => qqtcircleeffectprogressbar.cpp} (79%)
 rename src/exquisite/{qqtcomplexprogressbar.h => qqtcircleeffectprogressbar.h} (95%)

diff --git a/examples/exquisite/qqtexquisiteform.cpp b/examples/exquisite/qqtexquisiteform.cpp
index ef22bd9f..649684f3 100644
--- a/examples/exquisite/qqtexquisiteform.cpp
+++ b/examples/exquisite/qqtexquisiteform.cpp
@@ -23,11 +23,11 @@ QQtExquisiteForm::QQtExquisiteForm(QWidget* parent) :
     ui->w2->setCircleColor(QColor(20, 40, 100));
     ui->w2->setRange(0, 80);
     ui->w2->setWaveDensity(2);
-    ui->w2->setWaveDirection(QQtComplexProgressBar::WaveDirection_Left_Right);
+    ui->w2->setWaveDirection(QQtCircleEffectProgressBar::WaveDirection_Left_Right);
     ui->w2->setWaveHeight(2);
     ui->w2->setWaveSpeed(6);
-    ui->w2->setPercentStyle(QQtComplexProgressBar::PercentStyle_Wave);
-    //ui->w2->setCircleType(QQtComplexProgressBar::CircleType_Image);
+    ui->w2->setPercentStyle(QQtCircleEffectProgressBar::PercentStyle_Wave);
+    //ui->w2->setCircleType(QQtCircleEffectProgressBar::CircleType_Image);
     //ui->w2->setCircleImage("./xxtest.png");
 
     connect(ui->hs0, SIGNAL(valueChanged(int)), ui->w0, SLOT(setValue(int)));
diff --git a/examples/exquisite/qqtexquisiteform.ui b/examples/exquisite/qqtexquisiteform.ui
index 74ce2fcc..b37f7c6d 100644
--- a/examples/exquisite/qqtexquisiteform.ui
+++ b/examples/exquisite/qqtexquisiteform.ui
@@ -25,7 +25,7 @@
         <widget class="QQtCustomSpeedMeter" name="w0" native="true"/>
        </item>
        <item row="0" column="1">
-        <widget class="QQtComplexProgressBar" name="w2" native="true"/>
+        <widget class="QQtCircleEffectProgressBar" name="w2" native="true"/>
        </item>
       </layout>
      </widget>
@@ -54,9 +54,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>QQtComplexProgressBar</class>
+   <class>QQtCircleEffectProgressBar</class>
    <extends>QWidget</extends>
-   <header location="global">qqtcomplexprogressbar.h</header>
+   <header location="global">qqtcircleeffectprogressbar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/exquisite/qqtcomplexprogressbar.cpp b/src/exquisite/qqtcircleeffectprogressbar.cpp
similarity index 79%
rename from src/exquisite/qqtcomplexprogressbar.cpp
rename to src/exquisite/qqtcircleeffectprogressbar.cpp
index a72596e8..abfb2baf 100644
--- a/src/exquisite/qqtcomplexprogressbar.cpp
+++ b/src/exquisite/qqtcircleeffectprogressbar.cpp
@@ -2,13 +2,13 @@
 #pragma execution_character_set("utf-8")
 #endif
 
-#include "qqtcomplexprogressbar.h"
+#include "qqtcircleeffectprogressbar.h"
 #include "qpainter.h"
 #include "qdebug.h"
 #include "qmath.h"
 #include "qtimer.h"
 
-QQtComplexProgressBar::QQtComplexProgressBar(QWidget* parent) : QWidget(parent)
+QQtCircleEffectProgressBar::QQtCircleEffectProgressBar(QWidget* parent) : QWidget(parent)
 {
     minValue = 0;
     maxValue = 100;
@@ -43,11 +43,11 @@ QQtComplexProgressBar::QQtComplexProgressBar(QWidget* parent) : QWidget(parent)
     connect(timer, SIGNAL(timeout()), this, SLOT(update()));
 }
 
-QQtComplexProgressBar::~QQtComplexProgressBar()
+QQtCircleEffectProgressBar::~QQtCircleEffectProgressBar()
 {
 }
 
-void QQtComplexProgressBar::paintEvent(QPaintEvent*)
+void QQtCircleEffectProgressBar::paintEvent(QPaintEvent*)
 {
     int width = this->width();
     int height = this->height();
@@ -95,7 +95,7 @@ void QQtComplexProgressBar::paintEvent(QPaintEvent*)
     drawText(&painter, 100);
 }
 
-void QQtComplexProgressBar::drawCircle(QPainter* painter, int radius)
+void QQtCircleEffectProgressBar::drawCircle(QPainter* painter, int radius)
 {
     if (percentStyle == PercentStyle_Arc)
     {
@@ -130,7 +130,7 @@ void QQtComplexProgressBar::drawCircle(QPainter* painter, int radius)
     painter->restore();
 }
 
-void QQtComplexProgressBar::drawArc(QPainter* painter, int radius)
+void QQtCircleEffectProgressBar::drawArc(QPainter* painter, int radius)
 {
     painter->save();
     painter->setBrush(Qt::NoBrush);
@@ -178,7 +178,7 @@ void QQtComplexProgressBar::drawArc(QPainter* painter, int radius)
     painter->restore();
 }
 
-void QQtComplexProgressBar::drawPolo(QPainter* painter, int radius)
+void QQtCircleEffectProgressBar::drawPolo(QPainter* painter, int radius)
 {
     /*计算当前值所占百分比对应高度*/
     double poloHeight = (double)radius / (maxValue - minValue) * (value - minValue) ;
@@ -204,7 +204,7 @@ void QQtComplexProgressBar::drawPolo(QPainter* painter, int radius)
     painter->restore();
 }
 
-void QQtComplexProgressBar::drawWave(QPainter* painter, int radius)
+void QQtCircleEffectProgressBar::drawWave(QPainter* painter, int radius)
 {
     /*大路径*/
     QPainterPath bigPath;
@@ -318,7 +318,7 @@ void QQtComplexProgressBar::drawWave(QPainter* painter, int radius)
     painter->restore();
 }
 
-void QQtComplexProgressBar::drawText(QPainter* painter, int radius)
+void QQtCircleEffectProgressBar::drawText(QPainter* painter, int radius)
 {
     QString strValue = QString("%1").arg(value);
 
@@ -343,97 +343,97 @@ void QQtComplexProgressBar::drawText(QPainter* painter, int radius)
     painter->restore();
 }
 
-int QQtComplexProgressBar::getMinValue() const
+int QQtCircleEffectProgressBar::getMinValue() const
 {
     return this->minValue;
 }
 
-int QQtComplexProgressBar::getMaxValue() const
+int QQtCircleEffectProgressBar::getMaxValue() const
 {
     return this->maxValue;
 }
 
-int QQtComplexProgressBar::getValue() const
+int QQtCircleEffectProgressBar::getValue() const
 {
     return this->value;
 }
 
-int QQtComplexProgressBar::getNullPosition() const
+int QQtCircleEffectProgressBar::getNullPosition() const
 {
     return this->nullPosition;
 }
 
-int QQtComplexProgressBar::getLineWidth() const
+int QQtCircleEffectProgressBar::getLineWidth() const
 {
     return this->lineWidth;
 }
 
-bool QQtComplexProgressBar::getShowPercent() const
+bool QQtCircleEffectProgressBar::getShowPercent() const
 {
     return this->showPercent;
 }
 
-bool QQtComplexProgressBar::getShowFree() const
+bool QQtCircleEffectProgressBar::getShowFree() const
 {
     return this->showFree;
 }
 
-bool QQtComplexProgressBar::getShowSmallCircle() const
+bool QQtCircleEffectProgressBar::getShowSmallCircle() const
 {
     return this->showSmallCircle;
 }
 
-bool QQtComplexProgressBar::getClockWise() const
+bool QQtCircleEffectProgressBar::getClockWise() const
 {
     return this->clockWise;
 }
 
-QColor QQtComplexProgressBar::getUsedColor() const
+QColor QQtCircleEffectProgressBar::getUsedColor() const
 {
     return this->usedColor;
 }
 
-QColor QQtComplexProgressBar::getFreeColor() const
+QColor QQtCircleEffectProgressBar::getFreeColor() const
 {
     return this->freeColor;
 }
 
-QColor QQtComplexProgressBar::getCircleColor() const
+QColor QQtCircleEffectProgressBar::getCircleColor() const
 {
     return this->circleColor;
 }
 
-QColor QQtComplexProgressBar::getTextColor() const
+QColor QQtCircleEffectProgressBar::getTextColor() const
 {
     return this->textColor;
 }
 
-QString QQtComplexProgressBar::getPercentSuffix() const
+QString QQtCircleEffectProgressBar::getPercentSuffix() const
 {
     return this->percentSuffix;
 }
 
-QQtComplexProgressBar::PercentStyle QQtComplexProgressBar::getPercentStyle() const
+QQtCircleEffectProgressBar::PercentStyle QQtCircleEffectProgressBar::getPercentStyle() const
 {
     return this->percentStyle;
 }
 
-QQtComplexProgressBar::CircleType QQtComplexProgressBar::getCircleType() const
+QQtCircleEffectProgressBar::CircleType QQtCircleEffectProgressBar::getCircleType() const
 {
     return this->circleType;
 }
 
-QSize QQtComplexProgressBar::sizeHint() const
+QSize QQtCircleEffectProgressBar::sizeHint() const
 {
     return QSize(200, 200);
 }
 
-QSize QQtComplexProgressBar::minimumSizeHint() const
+QSize QQtCircleEffectProgressBar::minimumSizeHint() const
 {
     return QSize(10, 10);
 }
 
-void QQtComplexProgressBar::setRange(int minValue, int maxValue)
+void QQtCircleEffectProgressBar::setRange(int minValue, int maxValue)
 {
     /*如果最小值大于或者等于最大值则不设置*/
     if (minValue >= maxValue)
@@ -453,17 +453,17 @@ void QQtComplexProgressBar::setRange(int minValue, int maxValue)
     update();
 }
 
-void QQtComplexProgressBar::setMinValue(int minValue)
+void QQtCircleEffectProgressBar::setMinValue(int minValue)
 {
     setRange(minValue, maxValue);
 }
 
-void QQtComplexProgressBar::setMaxValue(int maxValue)
+void QQtCircleEffectProgressBar::setMaxValue(int maxValue)
 {
     setRange(minValue, maxValue);
 }
 
-void QQtComplexProgressBar::setValue(int value)
+void QQtCircleEffectProgressBar::setValue(int value)
 {
     /*值小于最小值或者值大于最大值或者值和当前值一致则无需处理*/
     if (value < minValue || value > maxValue || value == this->value)
@@ -476,7 +476,7 @@ void QQtComplexProgressBar::setValue(int value)
     emit valueChanged(value);
 }
 
-void QQtComplexProgressBar::setNullPosition(int nullPosition)
+void QQtCircleEffectProgressBar::setNullPosition(int nullPosition)
 {
     if (this->nullPosition != nullPosition)
     {
@@ -485,7 +485,7 @@ void QQtComplexProgressBar::setNullPosition(int nullPosition)
     }
 }
 
-void QQtComplexProgressBar::setLineWidth(int lineWidth)
+void QQtCircleEffectProgressBar::setLineWidth(int lineWidth)
 {
     if (this->lineWidth != lineWidth)
     {
@@ -494,7 +494,7 @@ void QQtComplexProgressBar::setLineWidth(int lineWidth)
     }
 }
 
-void QQtComplexProgressBar::setShowPercent(bool showPercent)
+void QQtCircleEffectProgressBar::setShowPercent(bool showPercent)
 {
     if (this->showPercent != showPercent)
     {
@@ -503,7 +503,7 @@ void QQtComplexProgressBar::setShowPercent(bool showPercent)
     }
 }
 
-void QQtComplexProgressBar::setPercentSuffix(QString percentSuffix)
+void QQtCircleEffectProgressBar::setPercentSuffix(QString percentSuffix)
 {
     if (this->percentSuffix != percentSuffix)
     {
@@ -512,7 +512,7 @@ void QQtComplexProgressBar::setPercentSuffix(QString percentSuffix)
     }
 }
 
-void QQtComplexProgressBar::setShowFree(bool showFree)
+void QQtCircleEffectProgressBar::setShowFree(bool showFree)
 {
     if (this->showFree != showFree)
     {
@@ -521,7 +521,7 @@ void QQtComplexProgressBar::setShowFree(bool showFree)
     }
 }
 
-void QQtComplexProgressBar::setShowSmallCircle(bool showSmallCircle)
+void QQtCircleEffectProgressBar::setShowSmallCircle(bool showSmallCircle)
 {
     if (this->showSmallCircle != showSmallCircle)
     {
@@ -530,7 +530,7 @@ void QQtComplexProgressBar::setShowSmallCircle(bool showSmallCircle)
     }
 }
 
-void QQtComplexProgressBar::setClockWise(bool clockWise)
+void QQtCircleEffectProgressBar::setClockWise(bool clockWise)
 {
     if (this->clockWise != clockWise)
     {
@@ -539,7 +539,7 @@ void QQtComplexProgressBar::setClockWise(bool clockWise)
     }
 }
 
-void QQtComplexProgressBar::setUsedColor(const QColor& usedColor)
+void QQtCircleEffectProgressBar::setUsedColor(const QColor& usedColor)
 {
     if (this->usedColor != usedColor)
     {
@@ -548,7 +548,7 @@ void QQtComplexProgressBar::setUsedColor(const QColor& usedColor)
     }
 }
 
-void QQtComplexProgressBar::setFreeColor(const QColor& freeColor)
+void QQtCircleEffectProgressBar::setFreeColor(const QColor& freeColor)
 {
     if (this->freeColor != freeColor)
     {
@@ -557,7 +557,7 @@ void QQtComplexProgressBar::setFreeColor(const QColor& freeColor)
     }
 }
 
-void QQtComplexProgressBar::setCircleColor(const QColor& circleColor)
+void QQtCircleEffectProgressBar::setCircleColor(const QColor& circleColor)
 {
     if (this->circleColor != circleColor)
     {
@@ -566,7 +566,7 @@ void QQtComplexProgressBar::setCircleColor(const QColor& circleColor)
     }
 }
 
-void QQtComplexProgressBar::setCircleImage(const QString& circleImage)
+void QQtCircleEffectProgressBar::setCircleImage(const QString& circleImage)
 {
     if (this->circleImage != circleImage)
     {
@@ -575,7 +575,7 @@ void QQtComplexProgressBar::setCircleImage(const QString& circleImage)
     }
 }
 
-void QQtComplexProgressBar::setTextColor(const QColor& textColor)
+void QQtCircleEffectProgressBar::setTextColor(const QColor& textColor)
 {
     if (this->textColor != textColor)
     {
@@ -584,7 +584,7 @@ void QQtComplexProgressBar::setTextColor(const QColor& textColor)
     }
 }
 
-void QQtComplexProgressBar::setTextFont(QFont font)
+void QQtCircleEffectProgressBar::setTextFont(QFont font)
 {
     if (this->textFont != font)
     {
@@ -595,7 +595,7 @@ void QQtComplexProgressBar::setTextFont(QFont font)
 
 #define TIMER_FIELD 600
 
-void QQtComplexProgressBar::setPercentStyle(QQtComplexProgressBar::PercentStyle percentStyle)
+void QQtCircleEffectProgressBar::setPercentStyle(QQtCircleEffectProgressBar::PercentStyle percentStyle)
 {
     if (this->percentStyle != percentStyle)
     {
@@ -608,7 +608,7 @@ void QQtComplexProgressBar::setPercentStyle(QQtComplexProgressBar::PercentStyle
     }
 }
 
-void QQtComplexProgressBar::setCircleType(QQtComplexProgressBar::CircleType circleType)
+void QQtCircleEffectProgressBar::setCircleType(QQtCircleEffectProgressBar::CircleType circleType)
 {
     if (this->circleType != circleType)
     {
@@ -617,7 +617,7 @@ void QQtComplexProgressBar::setCircleType(QQtComplexProgressBar::CircleType circ
     }
 }
 
-void QQtComplexProgressBar::setWaveDensity(int value)
+void QQtCircleEffectProgressBar::setWaveDensity(int value)
 {
     if (value < 1)
         value = 1;
@@ -628,7 +628,7 @@ void QQtComplexProgressBar::setWaveDensity(int value)
     }
 }
 
-void QQtComplexProgressBar::setWaveHeight(int value)
+void QQtCircleEffectProgressBar::setWaveHeight(int value)
 {
     if (value < 1)
         value = 1;
@@ -639,7 +639,7 @@ void QQtComplexProgressBar::setWaveHeight(int value)
     }
 }
 
-void QQtComplexProgressBar::setWaveDirection(WaveDirection direction)
+void QQtCircleEffectProgressBar::setWaveDirection(WaveDirection direction)
 {
     if (this->waveDirection != direction)
     {
@@ -648,7 +648,7 @@ void QQtComplexProgressBar::setWaveDirection(WaveDirection direction)
     }
 }
 
-void QQtComplexProgressBar::setWaveSpeed(int speed)
+void QQtCircleEffectProgressBar::setWaveSpeed(int speed)
 {
     if (speed < 1)
         speed = 1;
diff --git a/src/exquisite/qqtcomplexprogressbar.h b/src/exquisite/qqtcircleeffectprogressbar.h
similarity index 95%
rename from src/exquisite/qqtcomplexprogressbar.h
rename to src/exquisite/qqtcircleeffectprogressbar.h
index e1e52914..8f91a21d 100644
--- a/src/exquisite/qqtcomplexprogressbar.h
+++ b/src/exquisite/qqtcircleeffectprogressbar.h
@@ -1,5 +1,5 @@
-#ifndef QQTCOMPLEXPROGRESSBAR_H
-#define QQTCOMPLEXPROGRESSBAR_H
+#ifndef QQTCIRCLEEFFECTPROGRESSBAR_H
+#define QQTCIRCLEEFFECTPROGRESSBAR_H
 
 /**
  * T.D.R (QQ:2657635903) mod 2017年10月20日19:10:53
@@ -30,9 +30,9 @@
 #include <QtUiPlugin/QDesignerExportWidget>
 #endif
 
-class QDESIGNER_WIDGET_EXPORT QQtComplexProgressBar : public QWidget
+class QDESIGNER_WIDGET_EXPORT QQtCircleEffectProgressBar : public QWidget
 #else
-class QQTSHARED_EXPORT QQtComplexProgressBar : public QWidget
+class QQTSHARED_EXPORT QQtCircleEffectProgressBar : public QWidget
 #endif
 
 {
@@ -86,8 +86,8 @@ public:
         PercentStyle_Wave = 3,          /*水波纹风格*/
     };
 
-    explicit QQtComplexProgressBar(QWidget* parent = 0);
-    ~QQtComplexProgressBar();
+    explicit QQtCircleEffectProgressBar(QWidget* parent = 0);
+    ~QQtCircleEffectProgressBar();
 
 protected:
     void paintEvent(QPaintEvent*);
@@ -215,4 +215,4 @@ Q_SIGNALS:
     void valueChanged(int value);
 };
 
-#endif //QQTCOMPLEXPROGRESSBAR_H
+#endif //QQTCIRCLEEFFECTPROGRESSBAR_H
diff --git a/src/qqt_source.pri b/src/qqt_source.pri
index 62b67d85..ecd4bb4c 100644
--- a/src/qqt_source.pri
+++ b/src/qqt_source.pri
@@ -31,7 +31,6 @@ SOURCES = \
     $$PWD/exquisite/qqtframelesshelperprivate.cpp \
     $$PWD/exquisite/qqtcustompianokeyboard.cpp \
     $$PWD/exquisite/qqtrippleeffectpushbutton.cpp \
-    $$PWD/exquisite/qqtcomplexprogressbar.cpp \
     $$PWD/exquisite/qqtrulereffectslider.cpp \
     $$PWD/exquisite/qqtflipeffectstackedwidget.cpp \
     $$PWD/exquisite/qqtledbannereffectlabel.cpp \
@@ -39,14 +38,14 @@ SOURCES = \
     $$PWD/exquisite/qqtcustomverificationcode.cpp \
     $$PWD/exquisite/qqtfadeeffectwidget.cpp \
     $$PWD/exquisite/qqtshadoweffectwidget.cpp \
-    $$PWD/exquisite/qqtpopeffectdialog.cpp
+    $$PWD/exquisite/qqtpopeffectdialog.cpp \
+    $$PWD/exquisite/qqtcircleeffectprogressbar.cpp
 HEADERS = \
     $$PWD/exquisite/qqtcustomspeedmeter.h \
     $$PWD/exquisite/qqtframelesshelper.h \
     $$PWD/exquisite/qqtframelesshelperprivate.h \
     $$PWD/exquisite/qqtcustompianokeyboard.h \
     $$PWD/exquisite/qqtrippleeffectpushbutton.h \
-    $$PWD/exquisite/qqtcomplexprogressbar.h \
     $$PWD/exquisite/qqtrulereffectslider.h \
     $$PWD/exquisite/qqtflipeffectstackedwidget.h \
     $$PWD/exquisite/qqtmarqueeeffectlabel.h \
@@ -54,7 +53,8 @@ HEADERS = \
     $$PWD/exquisite/qqtcustomverificationcode.h \
     $$PWD/exquisite/qqtfadeeffectwidget.h \
     $$PWD/exquisite/qqtshadoweffectwidget.h \
-    $$PWD/exquisite/qqtpopeffectdialog.h
+    $$PWD/exquisite/qqtpopeffectdialog.h \
+    $$PWD/exquisite/qqtcircleeffectprogressbar.h
 
 #qrcode
 #DEFINES += __QRENCODE__