Compare commits

...

4 Commits

Author SHA1 Message Date
朱子楚\zhuzi
78ee7258ce update 2024-06-17 17:45:40 +08:00
朱子楚\zhuzi
b11fccd758 add qcustomplot 2024-06-17 16:42:54 +08:00
zhuzichu
a3fa54a02b
Merge pull request #529 from Jesse205/update-readme
update README
2024-06-17 10:16:41 +08:00
Jesse205
97af2d7126 update README 2024-06-17 06:59:56 +08:00
27 changed files with 45437 additions and 139 deletions

View File

@ -1,23 +1,21 @@
<div align=center>
<img width=64 src="doc/preview/fluent_design.svg">
</div>
<img width=64 src="doc/preview/fluent_design.svg">
<h1 align="center">
QML FluentUI
</h1>
<p align="center">
A fluent design component library for Qt QML You need Pyside6 <a href="https://github.com/zhuzichu520/PySide6-FluentUI-QML">PySide6-FluentUI-QML</a>
</p>
# QML FluentUI
A Fluent Design component library for Qt QML, You need PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML).
</div>
![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
<p align="center">
English | <a href="README_zh_CN.md">简体中文</a>
</p>
<div align=center>
<img src="doc/preview/demo_large.png">
</div>
English | [简体中文](README_zh_CN.md)
<img src="doc/preview/demo_large.png">
</div>
[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
@ -31,7 +29,6 @@ English | <a href="README_zh_CN.md">简体中文</a>
[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
<p align=center>
This is a beautiful FluentUI component library based on Qt QML. Currently the main branch supports Qt 6. If you want to use it in Qt 5, checkout the Qt 5 branch.
</p>
@ -50,17 +47,17 @@ Use [Qt Online Installers](https://download.qt.io/archive/online_installers/) to
+ run `example` program.
or
or
+ Clone the repository.
```SHELL
```bash
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
```
+ Build
```
```bash
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
cd FluentUI
mkdir build
@ -79,38 +76,35 @@ cmake --build . --config Release --target all --parallel
+ Great! Now you are ready to write your first QML FluentUI program! Check the documentations for more details.
## 📑 Documentations
(Work in progress...🚀)
## Supported components
|Catalog|Detail|Notes / Demos|
|:----:|:----:|:----:|
|FluApp|The initial entry of the program|Router supported(SPA)|
|FluWindow|Frameless Window|*This only works on windows|
|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
|FluText|Common text||
|FluButton|Common button|![btn](doc/preview/demo_standardbtn.png) |
|FluFilledButton|Filled button|![filledbtn](doc/preview/demo_filledbtn.png)|
|FluTextButton|Text button|![textbtn](doc/preview/demo_textbtn.png)|
|FluToggleButton|Toggle buttons|![togglebtn](doc/preview/demo_toggle_btn.png)|
|FluIcon|Common icon|![icons](doc/preview/demo_icon.png)|
|FluRadioButton|radio button|![radiobtn](doc/preview/demo_radiobtn.png)|
|FluTextBox|Single-line input box|![textbox](doc/preview/demo_textbox.png)|
|FluMultiLineTextBox|Multi-lines input area|![textarea](doc/preview/demo_multiline_textbox.png)|
|FluToggleSwitch|toggle switch|![toggleswitch](doc/preview/demo_toggle_switch.png)|
| Catalog | Detail | Notes / Demos |
| :-----------------: | :------------------------------: | :-------------------------------------------------: |
| FluApp | The initial entry of the program | Router supported(SPA) |
| FluWindow | Frameless Window | *This only works on windows |
| FluAppBar | Title bar on top of the window | Drag, minimize, maximize and close are supported. |
| FluText | Common text | |
| FluButton | Common button | ![btn](doc/preview/demo_standardbtn.png) |
| FluFilledButton | Filled button | ![filledbtn](doc/preview/demo_filledbtn.png) |
| FluTextButton | Text button | ![textbtn](doc/preview/demo_textbtn.png) |
| FluToggleButton | Toggle buttons | ![togglebtn](doc/preview/demo_toggle_btn.png) |
| FluIcon | Common icon | ![icons](doc/preview/demo_icon.png) |
| FluRadioButton | radio button | ![radiobtn](doc/preview/demo_radiobtn.png) |
| FluTextBox | Single-line input box | ![textbox](doc/preview/demo_textbox.png) |
| FluMultiLineTextBox | Multi-lines input area | ![textarea](doc/preview/demo_multiline_textbox.png) |
| FluToggleSwitch | toggle switch | ![toggleswitch](doc/preview/demo_toggle_switch.png) |
View more [`here`](doc/md/all_components.md)!
## Reference
+ [**Windows design**: Design guidelines and toolkits of Microsoft.](https://learn.microsoft.com/en-us/windows/apps/design/)
+ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
## License
This FluentUI library currently licensed under [MIT License](./License)
@ -120,4 +114,5 @@ This FluentUI library currently licensed under [MIT License](./License)
[![Star History Chart](https://api.star-history.com/svg?repos=zhuzichu520/FluentUI&type=Date)](https://star-history.com/#zhuzichu520/FluentUI&Date)
## ⚡ Visitor count
![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
![Visitor count](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

View File

@ -1,99 +1,118 @@
# FluentUI
<div align=center>
<img width=64 src="doc/preview/fluent_design.svg">
## 简介
# QML FluentUI
这是一个漂亮的Fluent组件库使用QML插件开发的。main分支是Qt6.4.3<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8" target="_blank">如何使用?</a>。如果需要qt5的请切换至qt5分支<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8%EF%BC%881.2.7%E4%BB%A5%E5%8F%8A%E4%B9%8B%E5%89%8D%E7%89%88%E6%9C%AC%EF%BC%89" target="_blank">如何使用?</a>
一个 Qt QML 的 Fluent Design 组件库,需要 PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML)。
## 编译状态
| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
|---------------|---------------|-----------------|
| ![win-badge] | ![ubuntu-badge] | ![macos-badge] |
</div>
![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
<div align=center>
[English](README.md) | 简体中文
<img src="doc/preview/demo_large.png">
</div>
[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
[ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
[ubuntu-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Ubuntu/badge.svg "Ubuntu"
[macos-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AMacOS "MacOSAction"
[macos-badge]: https://github.com/zhuzichu520/FluentUI/workflows/MacOS/badge.svg "MacOS"
## 发布
|[已发布][release-link]|[下载][download-link]|下载次数|
|:--:|:--:|:--:|
|![release-badge] |![download-badge]|![download-latest]|
[release-link]: https://github.com/zhuzichu520/FluentUI/releases "Release status"
[release-badge]: https://img.shields.io/github/release/zhuzichu520/FluentUI.svg?style=flat-square "Release status"
[download-link]: https://github.com/zhuzichu520/FluentUI/releases/latest "Download status"
[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
<p align=center>
这是一个基于 Qt QML 的漂亮 FluentUI 组件库。目前主分支支持 Qt 6。如果您想在 Qt 5 中使用它,请切换至 Qt 5 分支。
</p>
## 必要条件
+ Qt Core、Qt Quick、Qt QML、Qt ShaderTool、Qt 5 Compatibility Module.**重要**
+ Qt LinguistTool可选用于翻译
+ Qt Svg可选但对于 Qt 5 来说必不可少)
在使用库之前使用 [Qt 在线安装程序](https://download.qt.io/archive/online_installers/) 获取模块(**推荐**),或先编译模块。
## ⚽ 快速开始
+ 下载 [预编译版本](https://github.com/zhuzichu520/FluentUI/releases)。(请注意您的平台和编译器)。
+ 运行 `example` 程序。
或者
+ 克隆此仓库
```bash
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
```
+ 构建
```bash
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
cd FluentUI
mkdir build
cd build
cmake -DCMAKE_PREFIX_PATH=<YOUR_QT_SDK_DIR_PATH> -DCMAKE_BUILD_TYPE=Release -GNinja <仓库路径>
cmake --build . --config Release --target all --parallel
```
+ 使用 IDE`Qt Creator` 或者 `CLion`)打开项目。(仅支持 **CMake**)。
<div align=center>
<img src="doc/preview/qt_creator_project.png">
</div>
+ 编译项目。然后尝试执行 `example` 演示程序。
+ 太好了!现在您可以编写第一个 QML FluentUI 程序了!查看文档了解更多详情。
## 📑 文档
(正在进行中...🚀)
## 支持的组件
|目录|说明|备注|
|----|----|----|
|FluApp|初始化入口|支持路由跳转|
|FluWindow|无边框窗口|解决windows拖动闪烁问题|
|FluAppBar|窗口顶部标题栏|支持拖动窗口,最小化、最大化、关闭窗口|
|FluText|Text文本||
|FluButton|按钮||
|FluFilledButton|实心按钮||
|FluIconButton|图标按钮||
|FluTextButton|文本按钮||
|FluIcon|图标||
|FluRadioButton|单选按钮||
|FluTextBox|单行输入框||
|FluMultiLineTextBox|多行输入框||
|FluToggleSwitch|开关按钮||
|FluSlider|拖动条||
|FluInfoBar|提示Toast||
|FluContentDialog|对话框||
|FluProgressBar|条形进度条||
|FluProgressRing|圆形进度条||
|FluRectangle|矩形|支持部分圆角、clip|
|FluMenu|菜单框||
|FluTooltip|tooltip提示框||
|FluTreeView|树控件||
|FluTheme|主题设置|支持主题颜色切换,夜间模式|
|FluCarousel|轮播图组件|支持无限轮播|
|FluTimePicker|时间选择器||
|FluDatePicker|日期选择器||
|FluMenu|菜单Popup||
|FluNavigationView|响应式导航布局||
|FluScrollbar|滚动条||
|FluToggleButton|开关按钮||
|FluPagination|分页组件||
|FluTableView|表格组件||
|FluMediaPlayer|播放器||
|FluFlipView|FlipView||
| 目录 | 详情 | 备注 / Demos |
| :-----------------: | :--------------: | :-------------------------------------------------: |
| FluApp | 程序初始入口 | 支持路由SPA |
| FluWindow | 无框窗口 | *仅适用于 Windows |
| FluAppBar | 窗口顶部的标题栏 | 支持拖动、最小化、最大化和关闭。 |
| FluText | 通用文本 | |
| FluButton | 通用按钮 | ![btn](doc/preview/demo_standardbtn.png) |
| FluFilledButton | Filled 按钮 | ![filledbtn](doc/preview/demo_filledbtn.png) |
| FluTextButton | 文本按钮 | ![textbtn](doc/preview/demo_textbtn.png) |
| FluToggleButton | 切换按钮 | ![togglebtn](doc/preview/demo_toggle_btn.png) |
| FluIcon | 通用图标 | ![icons](doc/preview/demo_icon.png) |
| FluRadioButton | 单选框 | ![radiobtn](doc/preview/demo_radiobtn.png) |
| FluTextBox | 单行输入框 | ![textbox](doc/preview/demo_textbox.png) |
| FluMultiLineTextBox | 多行输入框 | ![textarea](doc/preview/demo_multiline_textbox.png) |
| FluToggleSwitch | 开关 | ![toggleswitch](doc/preview/demo_toggle_switch.png) |
# 部分效果预览
在 [`这里`](doc/md/all_components.md) 查看更多!
## 首页
## 参考
![](doc/preview/home.png)
+ [**Windows 设计**Microsoft 的设计指南和工具包。](https://learn.microsoft.com/zh-CN/windows/apps/design/)
+ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
## 各种Button按钮
## 许可
![](doc/preview/buttons.png)
本 FluentUI 库目前采用 [MIT License](./License) 许可。
## 主题颜色切换、夜间模式
## 星标历史
![](doc/preview/theme.png)
[![星标历史图表](https://api.star-history.com/svg?repos=zhuzichu520/FluentUI&type=Date)](https://star-history.com/#zhuzichu520/FluentUI&Date)
## TableView表格组件
## ⚡ 游客数量
![](doc/preview/tableview.png)
## FluTreeView树组件
![](doc/preview/treeview.png)
## 轮播图组件
![](doc/preview/carousel.png)
### ⚡ Visitor count
![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
![游客数量](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

View File

@ -344,4 +344,683 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
************************************************************************************
QmlQCustomPlot
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

View File

@ -210,6 +210,7 @@
<file>qml/page/T_OpenGL.qml</file>
<file>qml/page/T_Icons.qml</file>
<file>qml/window/HotkeyWindow.qml</file>
<file>qml/page/T_CustomPlot.qml</file>
</qresource>
<qresource prefix="/"/>
</RCC>

View File

@ -536,41 +536,46 @@
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="436"/>
<source>QRCode</source>
<source>QCustomPlot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="442"/>
<source>Tour</source>
<source>QRCode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="448"/>
<source>Timeline</source>
<source>Tour</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="454"/>
<source>Captcha</source>
<source>Timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="460"/>
<source>Captcha</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="466"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="467"/>
<location filename="qml/global/ItemsOriginal.qml" line="473"/>
<source>Remote Loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="481"/>
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
<source>Hot Loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
<location filename="qml/global/ItemsOriginal.qml" line="493"/>
<source>Test Crash</source>
<translation type="unfinished"></translation>
</message>
@ -1149,6 +1154,14 @@ Updated content:
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>T_CustomPlot</name>
<message>
<location filename="qml/page/T_CustomPlot.qml" line="10"/>
<source>QCustomPlot</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>T_DatePicker</name>
<message>

View File

@ -536,36 +536,41 @@
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="436"/>
<source>QCustomPlot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="442"/>
<source>QRCode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="442"/>
<location filename="qml/global/ItemsOriginal.qml" line="448"/>
<source>Tour</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="448"/>
<location filename="qml/global/ItemsOriginal.qml" line="454"/>
<source>Timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="454"/>
<location filename="qml/global/ItemsOriginal.qml" line="460"/>
<source>Captcha</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="460"/>
<location filename="qml/global/ItemsOriginal.qml" line="466"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="467"/>
<location filename="qml/global/ItemsOriginal.qml" line="473"/>
<source>Remote Loader</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="481"/>
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
<source>Hot Loader</source>
<translation type="unfinished"></translation>
</message>
@ -574,7 +579,7 @@
<translation type="obsolete">3D</translation>
</message>
<message>
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
<location filename="qml/global/ItemsOriginal.qml" line="493"/>
<source>Test Crash</source>
<translation type="unfinished"></translation>
</message>
@ -1208,6 +1213,46 @@ Updated content:
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>T_CustomPlot</name>
<message>
<source>MultiWindow</source>
<translation type="obsolete"></translation>
</message>
<message>
<source>&lt;font color=&apos;red&apos;&gt;Standard&lt;/font&gt; mode windowa new window is created every time</source>
<translation type="obsolete">&lt;font color=&apos;red&apos;&gt;Standard&lt;/font&gt; </translation>
</message>
<message>
<source>Create Window</source>
<translation type="obsolete"></translation>
</message>
<message>
<source>&lt;font color=&apos;red&apos;&gt;SingleTask&lt;/font&gt; mode windowIf a window exists, this activates the window</source>
<translation type="obsolete">&lt;font color=&apos;red&apos;&gt;SingleTask&lt;/font&gt; </translation>
</message>
<message>
<source>&lt;font color=&apos;red&apos;&gt;SingleInstance&lt;/font&gt; mode windowIf the window exists, destroy the window and create a new window</source>
<translation type="obsolete">&lt;font color=&apos;red&apos;&gt;SingleInstance&lt;/font&gt; </translation>
</message>
<message>
<source>Create the window without carrying any parameters</source>
<translation type="obsolete"></translation>
</message>
<message>
<source>Create a window with the parameter username: zhuzichu</source>
<translation type="obsolete">zhuzichu</translation>
</message>
<message>
<source>Login Window Returned Password - &gt;</source>
<translation type="obsolete"> - &gt;</translation>
</message>
<message>
<location filename="qml/page/T_CustomPlot.qml" line="10"/>
<source>QCustomPlot</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>T_DatePicker</name>
<message>

View File

@ -432,6 +432,12 @@ FluObject{
url: "qrc:/example/qml/page/T_OpenGL.qml"
onTap: { navigationView.push(url) }
}
FluPaneItem{
title: qsTr("QCustomPlot")
menuDelegate: paneItemMenu
url: "qrc:/example/qml/page/T_CustomPlot.qml"
onTap: { navigationView.push(url) }
}
FluPaneItem{
title: qsTr("QRCode")
menuDelegate: paneItemMenu

View File

@ -0,0 +1,49 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import "../component"
FluPage{
title: qsTr("QCustomPlot")
TimePlot {
id: timePlot
anchors.fill: parent
plotTimeRangeInMilliseconds: 10
xAxis.visible: true
yAxis.visible: true
x1Axis.visible: false
y1Axis.visible: false
yAxis.ticker.tickCount: 6
yAxis.ticker.ticks: false
yAxis.ticker.subTicks: false
yAxis.ticker.baseColor: "transparent"
yAxis.grid.lineColor: "mediumaquamarine"
xAxis.ticker.baseColor: "midnightblue"
xAxis.ticker.baseWidth: 2
xAxis.grid.lineColor: "transparent"
backgroundColor: "mistyrose"
Component.onCompleted: {
yAxis.setRange(0, 100)
addGraph("1")
graphs["1"].graphColor = "slategrey"
}
}
Timer {
running: true
repeat: true
interval: 20
property int data: 60
onTriggered: {
data = data - 1
if(data == 20) {
data = 60
}
timePlot.addCurrentTimeValue("1", data)
}
}
}

View File

@ -1,4 +1,4 @@
#include <QGuiApplication>
#include <QApplication>
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QDir>
@ -51,25 +51,25 @@ int main(int argc, char *argv[])
//fix bug UOSv20 v-sync does not work
qputenv("QSG_RENDER_LOOP","basic");
#endif
QGuiApplication::setOrganizationName("ZhuZiChu");
QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
QGuiApplication::setApplicationName("FluentUI");
QGuiApplication::setApplicationDisplayName("FluentUI Example");
QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
QGuiApplication::setQuitOnLastWindowClosed(false);
QApplication::setOrganizationName("ZhuZiChu");
QApplication::setOrganizationDomain("https://zhuzichu520.github.io");
QApplication::setApplicationName("FluentUI");
QApplication::setApplicationDisplayName("FluentUI Example");
QApplication::setApplicationVersion(APPLICATION_VERSION);
QApplication::setQuitOnLastWindowClosed(false);
SettingsHelper::getInstance()->init(argv);
Log::setup(argv,uri);
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
#endif
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
#endif
QGuiApplication app(argc, argv);
QApplication app(argc, argv);
//@uri example
qmlRegisterType<CircularReveal>(uri, major, minor, "CircularReveal");
qmlRegisterType<FileWatcher>(uri, major, minor, "FileWatcher");
@ -96,7 +96,7 @@ int main(int argc, char *argv[])
QCoreApplication::exit(-1);
}, Qt::QueuedConnection);
engine.load(url);
const int exec = QGuiApplication::exec();
const int exec = QApplication::exec();
if (exec == 931) {
QProcess::startDetached(qApp->applicationFilePath(), qApp->arguments());
}

View File

@ -30,8 +30,8 @@ endif ()
option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
#Qt
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Widgets PrintSupport)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick Widgets PrintSupport)
set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../..")
cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
@ -196,6 +196,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Quick
Qt${QT_VERSION_MAJOR}::Qml
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::PrintSupport
)
if(APPLE)
find_library(CARBON_LIBRARY Carbon)
@ -216,6 +218,10 @@ elseif(UNIX)
target_link_libraries(${PROJECT_NAME} PRIVATE X11)
endif()
target_include_directories(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/qmlcustomplot
)
if ((${QT_VERSION_MAJOR} LESS_EQUAL 6) AND (CMAKE_BUILD_TYPE MATCHES "Release"))
find_program(QML_PLUGIN_DUMP NAMES qmlplugindump)
add_custom_target(Script-Generate-QmlTypes

View File

@ -17,4 +17,4 @@ public:
explicit FluRectangle(QQuickItem *parent = nullptr);
void paint(QPainter *painter) override;
};
};

View File

@ -17,6 +17,11 @@
#include "FluFrameless.h"
#include "FluTableModel.h"
#include "FluHotkey.h"
#include "qmlcustomplot/TimePlot.h"
#include "qmlcustomplot/baseplot.h"
#include "qmlcustomplot/axis.h"
#include "qmlcustomplot/ticker.h"
#include "qmlcustomplot/grid.h"
void FluentUI::registerTypes(QQmlEngine *engine) {
initializeEngine(engine, _uri);
@ -40,6 +45,13 @@ void FluentUI::registerTypes(const char *uri) const {
qmlRegisterType<FluHotkey>(uri, major, minor, "FluHotkey");
qmlRegisterType<FluTableSortProxyModel>(uri, major, minor, "FluTableSortProxyModel");
qmlRegisterType<QmlQCustomPlot::TimePlot>(uri, major, minor, "TimePlot");
qmlRegisterType<QmlQCustomPlot::BasePlot>(uri, major, minor, "BasePlot");
qmlRegisterUncreatableType<QmlQCustomPlot::Axis>(uri, major, minor, "Axis", "");
qmlRegisterUncreatableType<QmlQCustomPlot::Ticker>(uri, major, minor, "Ticker", "");
qmlRegisterUncreatableType<QmlQCustomPlot::Grid>(uri, major, minor, "PlotGrid", "");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAcrylic.qml"), uri, major, minor, "FluAcrylic");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAppBar.qml"), uri, major, minor, "FluAppBar");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluFrame.qml"), uri, major, minor, "FluFrame");

View File

@ -0,0 +1,88 @@
#include "TimePlot.h"
#include "graph.h"
#include "axis.h"
#include "qcustomplot.h"
#include <QTimer>
namespace QmlQCustomPlot
{
TimePlot::TimePlot(QQuickItem *parent)
: BasePlot(parent)
, m_timer(new QTimer(this))
{
xAxis()->setTickerType(Axis::Time);
connect(m_timer, &QTimer::timeout, this, &TimePlot::onTimeOut);
m_timer->start(5);
startTimer(25);
m_plotTimeRangeInMilliseconds = 60;
}
TimePlot::~TimePlot()
{
}
void TimePlot::set_plotTimeRangeInMilliseconds(int value) noexcept
{
if(m_plotTimeRangeInMilliseconds != value) {
m_plotTimeRangeInMilliseconds = value;
emit plotTimeRangeInMillisecondsChanged(value);
}
}
Q_INVOKABLE void TimePlot::setTimeFormat(const QString &format) noexcept
{
if(xAxis()) {
QSharedPointer<QCPAxisTickerTime> timeTicker(new QCPAxisTickerTime);
timeTicker->setTimeFormat(format);
xAxis()->setTicker(timeTicker);
}
}
Q_INVOKABLE void TimePlot::addCurrentTimeValue(const QString &name, double value) noexcept
{
auto graph = getGraph(name);
if(graph) {
graph->addData(m_currentTimeKey, value);
}
}
Q_INVOKABLE void TimePlot::addCurrentTimeValues(QVariantMap values) noexcept
{
for(auto it = values.begin(); it != values.end(); ++it) {
addCurrentTimeValue(it.key(), it.value().toDouble());
}
}
void TimePlot::onTimeOut() noexcept
{
auto todayString = QDateTime::currentDateTime().toString("yyyy-MM-dd") + " 00:00:00";
auto todayTime = QDateTime::fromString(todayString, "yyyy-MM-dd hh:mm:ss");
m_currentTimeKey = todayTime.msecsTo(QDateTime::currentDateTime()) / 1000.0;
if(m_currentTimeKey - m_lastClearTime > m_plotTimeRangeInMilliseconds || m_currentTimeKey < m_lastClearTime) {
auto map = graphsMap();
std::for_each(map.begin(), map.end(), [this](auto graph) {
if(graph) graph->removeDataBefore(m_currentTimeKey - m_plotTimeRangeInMilliseconds);
});
m_lastClearTime = m_currentTimeKey;
}
// if(m_currentTimeKey - m_lastAddedTime > 0.002 || m_currentTimeKey < m_lastAddedTime) {
// auto map = graphsMap();
// std::for_each(map.begin(), map.end(), [this](auto graph) {
// if(graph) graph->addData(m_currentTimeKey, 4.0);
// });
// m_lastAddedTime = m_currentTimeKey;
// }
if(xAxis())
xAxis()->setRange(m_currentTimeKey - m_plotTimeRangeInMilliseconds, m_currentTimeKey);
// QCP::MarginSide s = &static_cast<QCP::MarginSide*>((customPlot()->axisRect()->autoMargins()));
// qDebug() << s;
}
void TimePlot::timerEvent(QTimerEvent *event)
{
customPlot()->replot();
}
} // namespace QmlQCustomPlot

View File

@ -0,0 +1,113 @@
#pragma once
#include "baseplot.h"
#include <QElapsedTimer>
class QTimer;
namespace QmlQCustomPlot
{
/*
* @class TimePlot
* @brief A class for dynamically updating the x-axis and curves with the current time in milliseconds.
*
* This class extends the BasePlot and provides functionalities to dynamically update
* a plot with time values. It allows adding time values either individually or in bulk.
* The x-axis is based on the current time of the day, displaying values within a specified time range.
*/
class TimePlot : public BasePlot
{
Q_OBJECT
QML_ELEMENT
QML_READ_WRITE_NOTIFY_PROPERTY(int, plotTimeRangeInMilliseconds) // Property to hold the time range for the plot display in milliseconds.
public:
/*
* @brief Constructor for the TimePlot class.
*
* This constructor initializes the TimePlot object, setting the parent QQuickItem and
* initializing the internal timer and elapsed time tracker.
*
* @param parent The parent QQuickItem, default is nullptr.
*/
TimePlot(QQuickItem *parent = nullptr);
~TimePlot();
/*
* @brief Sets the time range for the plot display in milliseconds.
*
* This function allows the user to specify the range of time (in milliseconds) that the
* plot should display on the x-axis. For example, setting this to 60000 will display the
* last 60 seconds of data on the plot.
* Default is 60 seconds
*
* @param value The time range in milliseconds.
*/
void set_plotTimeRangeInMilliseconds(int value) noexcept;
/*
* @brief Sets the time format for the x-axis labels.
*
* This function allows the user to specify the format of the time labels on the x-axis.
* The format should be a valid QDateTime format string, such as "hh:mm:ss" or "hh:mm:ss.zzz".
* Default is "hh:mm:ss".
*
* @param format The format string for the time labels.
*/
Q_INVOKABLE void setTimeFormat(const QString &format) noexcept;
/*
* @brief Adds a current time value to the plot.
*
* This function adds a single data point to the plot. The x-axis value is the current
* elapsed time in milliseconds since the timer started, and the y-axis value is provided
* by the user. The data point is associated with a specific series name (curve name).
*
* @param name The name of the data series (curve name).
* @param value The value to be added to the plot.
*/
Q_INVOKABLE void addCurrentTimeValue(const QString& name, double value) noexcept;
/*
* @brief Adds multiple current time values to the plot.
*
* This function allows adding multiple data points to the plot at once. The values are
* provided as a QVariantMap, where each key is the name of a data series (curve name)
* and the corresponding value is the data point to be added. The x-axis value for all
* data points is the current elapsed time in milliseconds.
*
* @param values A map of series names (curve names) and their corresponding values to be added to the plot.
*/
Q_INVOKABLE void addCurrentTimeValues(QVariantMap values) noexcept;
protected:
/*
* @brief Function called when the timer times out.
*
* This function is intended to be overridden by subclasses to define custom behavior
* when the timer expires. By default, it does nothing, but it can be used to update
* the plot or perform other actions at regular intervals.
*/
virtual void onTimeOut() noexcept;
/*
* @brief Handles timer events.
*
* This function is called automatically by the Qt framework when a timer event occurs.
* It updates the plot by adding a new time value if necessary and handles any other
* timer-related functionality.
*
* @param event The timer event containing information about the timer that triggered the event.
*/
void timerEvent(QTimerEvent *event) override;
private:
QTimer *m_timer = nullptr; ///< Pointer to the QTimer object used to trigger regular updates.
double m_currentTimeKey = 0; ///< Current time key (x-axis value) in seconds.
// double m_lastAddedTime = 0; ///< Time (in milliseconds) of the last added data point.
double m_lastClearTime = 0; ///< Time (in milliseconds) of the last clear operation.
};
} // namespace QmlQCustomPlot

132
src/qmlcustomplot/axis.cpp Normal file
View File

@ -0,0 +1,132 @@
#include "axis.h"
#include "grid.h"
#include "ticker.h"
#include "qcustomplot.h"
#include <stdexcept>
namespace QmlQCustomPlot
{
Axis::Axis(QObject *parent) : QObject(parent)
{
}
Axis::Axis(QCPAxis* axis, QCustomPlot *parentPlot, QObject *parent)
: m_parentPlot(parentPlot), m_axis(axis), QObject(parent)
{
if(parentPlot == nullptr || axis == nullptr)
throw std::invalid_argument(nullptr);
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Axis::updateProperty);
connect(axis, &QCPAxis::destroyed, this, &Axis::deleteLater);
m_ticker = new Ticker(axis, m_parentPlot, this);
m_grid = new Grid(axis->grid(), m_parentPlot, this);
updateProperty();
}
Axis::~Axis()
{
}
void Axis::setTickerType(TickerType type)
{
QSharedPointer<QCPAxisTicker> ticker;
switch (type)
{
default:
case Fixed:
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerFixed);
break;
case Log:
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerLog);
break;
case Pi:
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerPi);
break;
case Text:
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerText);
break;
case DateTime:
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerDateTime);
break;
case Time:
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerTime);
break;
}
m_axis->setTicker(ticker);
m_parentPlot->replot();
}
void Axis::setRange(float position, float size, Qt::AlignmentFlag align) noexcept
{
m_axis->setRange(position, size, align);
m_parentPlot->replot();
}
Q_INVOKABLE void Axis::setRange(float lower, float upper) noexcept
{
m_axis->setRange(lower, upper);
}
void Axis::setTicker(QSharedPointer<QCPAxisTicker> ticker) noexcept
{
m_axis->setTicker(ticker);
m_parentPlot->replot();
}
void Axis::set_visible(bool value) noexcept
{
m_visible = m_axis->visible();
if(m_visible == value) return;
m_visible = value;
m_axis->setVisible(value);
Q_EMIT visibleChanged(m_visible);
m_parentPlot->replot();
}
void Axis::set_label(const QString &value) noexcept
{
m_label = m_axis->label();
if(m_label == value) return;
m_label = value;
m_axis->setLabel(value);
Q_EMIT labelChanged(m_label);
m_parentPlot->replot();
}
void Axis::set_upper(float value) noexcept
{
m_upper = m_axis->range().upper;
if(m_upper == value) return;
m_upper = value;
m_axis->setRangeLower(value);
Q_EMIT upperChanged(m_upper);
m_parentPlot->replot();
}
void Axis::set_lower(float value) noexcept
{
m_lower = m_axis->range().lower;
if(m_lower == value) return;
m_lower = value;
m_axis->setRangeUpper(value);
Q_EMIT lowerChanged(m_lower);
m_parentPlot->replot();
}
void Axis::updateProperty() noexcept
{
m_visible = m_axis->visible();
m_label = m_axis->label();
m_upper = m_axis->range().upper;
m_lower = m_axis->range().lower;
Q_EMIT visibleChanged(m_visible);
Q_EMIT labelChanged(m_label);
Q_EMIT upperChanged(m_upper);
Q_EMIT lowerChanged(m_lower);
}
} // namespace QmlQCustomPlot

56
src/qmlcustomplot/axis.h Normal file
View File

@ -0,0 +1,56 @@
#pragma once
#include "macros.h"
#include <QtCore/QObject>
#include <QtQml/qqml.h>
#include "grid.h"
#include "ticker.h"
class QCPAxis;
class QCPAxisTicker;
class QCustomPlot;
namespace QmlQCustomPlot
{
class Grid;
class Ticker;
class Axis : public QObject
{
Q_OBJECT
QML_READ_WRITE_NOTIFY_PROPERTY(bool , visible)
QML_READ_WRITE_NOTIFY_PROPERTY(QString , label)
QML_READ_WRITE_NOTIFY_PROPERTY(float , upper)
QML_READ_WRITE_NOTIFY_PROPERTY(float , lower)
QML_READ_CONSTANT(QmlQCustomPlot::Grid*, grid)
QML_READ_CONSTANT(QmlQCustomPlot::Ticker*, ticker)
QML_ELEMENT
QML_UNCREATABLE("")
public:
explicit Axis(QObject *parent = nullptr);
Axis(QCPAxis* axis, QCustomPlot *parentPlot, QObject *parent = nullptr);
~Axis();
Q_ENUMS(TickerType)
enum TickerType { Fixed, Log, Pi, Text, DateTime, Time };
Q_INVOKABLE void setTickerType(TickerType type);
Q_INVOKABLE void setRange(float position, float size, Qt::AlignmentFlag align) noexcept;
Q_INVOKABLE void setRange(float lower, float upper) noexcept;
void setTicker(QSharedPointer<QCPAxisTicker> ticker) noexcept;
void set_visible(bool value) noexcept;
void set_label(const QString &value) noexcept;
void set_upper(float value) noexcept;
void set_lower(float value) noexcept;
private:
void updateProperty() noexcept;
private:
QCustomPlot *m_parentPlot = nullptr;
QCPAxis* m_axis = nullptr;
};
} // namespace QmlQCustomPlot

View File

@ -0,0 +1,138 @@
#include "baseplot.h"
#include "axis.h"
#include "graph.h"
#include "qcustomplot.h"
#include <stdexcept>
namespace QmlQCustomPlot
{
BasePlot::BasePlot(QQuickItem *parent)
: QQuickPaintedItem(parent)
, m_customPlot(new QCustomPlot())
{
setFlag(QQuickItem::ItemHasContents, true);
setAcceptedMouseButtons(Qt::AllButtons);
setAcceptHoverEvents(true);
connect(this, &QQuickPaintedItem::widthChanged, this, &BasePlot::onChartViewSizeChanged);
connect(this, &QQuickPaintedItem::heightChanged, this, &BasePlot::onChartViewSizeChanged);
connect(m_customPlot, &QCustomPlot::afterReplot, this, &BasePlot::onChartViewReplot, Qt::UniqueConnection);
try {
m_xAxis = new Axis(m_customPlot->xAxis, m_customPlot, this);
m_x1Axis = new Axis(m_customPlot->xAxis2, m_customPlot, this);
m_yAxis = new Axis(m_customPlot->yAxis, m_customPlot, this);
m_y1Axis = new Axis(m_customPlot->yAxis2, m_customPlot, this);
connect(m_xAxis, &Axis::destroyed, this, [this]{ m_xAxis = nullptr; Q_EMIT xAxisChanged(nullptr); });
connect(m_x1Axis, &Axis::destroyed, this, [this]{ m_x1Axis = nullptr; Q_EMIT x1AxisChanged(nullptr);});
connect(m_yAxis, &Axis::destroyed, this, [this]{ m_yAxis = nullptr; Q_EMIT yAxisChanged(nullptr); });
connect(m_y1Axis, &Axis::destroyed, this, [this]{ m_y1Axis = nullptr; Q_EMIT y1AxisChanged(nullptr);});
connect(m_customPlot->xAxis, SIGNAL(rangeChanged(QCPRange)), m_customPlot->xAxis2, SLOT(setRange(QCPRange)));
connect(m_customPlot->yAxis, SIGNAL(rangeChanged(QCPRange)), m_customPlot->yAxis2, SLOT(setRange(QCPRange)));
}
catch(const std::exception &e) {
qCritical() << e.what();
m_xAxis = nullptr;
m_x1Axis = nullptr;
m_yAxis = nullptr;
m_y1Axis = nullptr;
}
update();
}
BasePlot::~BasePlot()
{
delete m_customPlot;
}
void BasePlot::set_backgroundColor(const QColor &value)
{
// m_backgroundColor = m_customPlot->background().toImage().pixelColor(0, 0);
if(m_backgroundColor == value) return;
m_backgroundColor = value;
m_customPlot->setBackground(QBrush(m_backgroundColor));
// m_customPlot->axisRect()->setBackground(QBrush(m_backgroundColor));
emit backgroundColorChanged(m_backgroundColor);
m_customPlot->replot();
}
QVariantMap BasePlot::graphs() const
{
QVariantMap map;
for(auto it = m_graphs.begin(); it != m_graphs.end(); ++it) {
map.insert(it.key(), QVariant::fromValue(it.value()));
}
return map;
}
Q_INVOKABLE void BasePlot::addGraph(const QString &key)
{
if(m_graphs.contains(key)) return;
auto g = m_customPlot->addGraph();
if(g == nullptr) return;
g->setName(key);
auto graph = new Graph(g, m_customPlot, this);
m_graphs.insert(key, graph);
emit graphsChanged();
}
Q_INVOKABLE void BasePlot::removeGraph(const QString &key)
{
if(m_graphs.contains(key)) {
auto graph = m_graphs.take(key);
delete graph;
emit graphsChanged();
}
}
Q_INVOKABLE void BasePlot::rescaleAxes(bool onlyVisiblePlottables)
{
m_customPlot->rescaleAxes(onlyVisiblePlottables);
}
Graph *BasePlot::getGraph(const QString &key) const
{
if(m_graphs.contains(key)) {
return m_graphs.value(key);
}
return nullptr;
}
void BasePlot::paint(QPainter *painter)
{
if (!painter->isActive())
return;
QPixmap picture( boundingRect().size().toSize() );
QCPPainter qcpPainter( &picture );
m_customPlot->toPainter(&qcpPainter);
painter->drawPixmap(QPoint(), picture);
}
void BasePlot::onChartViewSizeChanged()
{
m_customPlot->setGeometry(0, 0, (int)width(), (int)height());
m_customPlot->setViewport(QRect(0, 0, (int)width(), (int)height()));
m_customPlot->axisRect()->setOuterRect(QRect(0, 0, (int)width(), (int)height()));
m_customPlot->axisRect()->setMinimumMargins (QMargins(0, 0, 0, 0));
m_customPlot->axisRect()->setMargins(QMargins(0, 0, 0, 0));
}
void BasePlot::routeMouseEvents(QMouseEvent *event)
{
QMouseEvent* newEvent = new QMouseEvent(event->type(), event->localPos(), event->button(), event->buttons(), event->modifiers());
QCoreApplication::postEvent(m_customPlot, newEvent);
}
void BasePlot::routeWheelEvents(QWheelEvent *event)
{
QWheelEvent* newEvent = new QWheelEvent(event->position(), event->globalPosition(),
event->pixelDelta(), event->angleDelta(),
event->buttons(), event->modifiers(),
event->phase(), event->inverted());
QCoreApplication::postEvent(m_customPlot, newEvent);
}
} // namespace QmlQCustomPlot

View File

@ -0,0 +1,60 @@
#pragma once
#include "macros.h"
#include <QtGui/QColor>
#include <QtCore/QVariantMap>
#include <QtCore/QString>
#include <QtQuick/QQuickPaintedItem>
class QCustomPlot;
namespace QmlQCustomPlot
{
class Axis;
class Graph;
class BasePlot : public QQuickPaintedItem
{
Q_OBJECT
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, backgroundColor)
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, xAxis)
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, x1Axis)
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, yAxis)
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, y1Axis)
QML_ELEMENT
Q_PROPERTY(QVariantMap graphs READ graphs NOTIFY graphsChanged)
public:
BasePlot(QQuickItem *parent = nullptr);
~BasePlot();
void set_backgroundColor(const QColor &value);
QVariantMap graphs() const;
Q_SIGNAL void graphsChanged();
Q_INVOKABLE void addGraph(const QString &key);
Q_INVOKABLE void removeGraph(const QString &key);
Q_INVOKABLE void rescaleAxes(bool onlyVisiblePlottables=false);
void paint(QPainter *painter);
QCustomPlot *customPlot() const { return m_customPlot; }
const QMap<QString, Graph *> &graphsMap() const { return m_graphs; }
Graph* getGraph(const QString &key) const;
protected:
virtual void onChartViewReplot() { update(); }
virtual void onChartViewSizeChanged();
virtual void hoverMoveEvent(QHoverEvent *event) override { Q_UNUSED(event) }
virtual void mousePressEvent(QMouseEvent *event) override { routeMouseEvents(event); }
virtual void mouseReleaseEvent(QMouseEvent *event) override { routeMouseEvents(event); }
virtual void mouseMoveEvent(QMouseEvent *event) override { routeMouseEvents(event); }
virtual void mouseDoubleClickEvent(QMouseEvent *event) override { routeMouseEvents(event); }
virtual void wheelEvent(QWheelEvent *event) override { routeWheelEvents(event); }
void routeMouseEvents(QMouseEvent *event);
void routeWheelEvents(QWheelEvent *event);
private:
QCustomPlot *m_customPlot = nullptr;
QMap<QString, Graph *> m_graphs;
};
} // namespace QmlQCustomPlot

128
src/qmlcustomplot/graph.cpp Normal file
View File

@ -0,0 +1,128 @@
#include "graph.h"
#include "qcustomplot.h"
#include <QPen>
#include <stdexcept>
namespace QmlQCustomPlot
{
Graph::Graph(QCPGraph* graph, QCustomPlot *parentPlot, QObject *parent)
: m_graph(graph), m_parentPlot(parentPlot), QObject(parent)
{
if(parentPlot == nullptr || graph == nullptr)
throw std::invalid_argument(nullptr);
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Graph::updateProperty);
updateProperty();
}
Graph::~Graph()
{
}
void Graph::setData(const QVector<double> &keys, const QVector<double> &values) noexcept
{
m_graph->setData(keys, values);
m_parentPlot->replot();
}
void Graph::addData(double key, double value) noexcept
{
m_graph->addData(key, value);
m_parentPlot->replot();
}
void Graph::removeDataBefore(double key) noexcept
{
m_graph->data()->removeBefore(key);
m_parentPlot->replot();
}
void Graph::clearData() noexcept
{
m_graph->data()->clear();
m_parentPlot->replot();
}
void Graph::set_visible(bool value) noexcept
{
m_visible = m_graph->visible();
if(m_visible == value) return;
m_visible = value;
m_graph->setVisible(value);
Q_EMIT visibleChanged(m_visible);
m_parentPlot->replot();
}
void Graph::set_antialiased(bool value) noexcept
{
m_antialiased = m_graph->antialiased();
if(m_antialiased == value) return;
m_antialiased = value;
m_graph->setAntialiased(value);
Q_EMIT antialiasedChanged(m_antialiased);
m_parentPlot->replot();
}
void Graph::set_name(const QString &value) noexcept
{
m_name = m_graph->name();
if(m_name == value) return;
m_name = value;
m_graph->setName(value);
Q_EMIT nameChanged(m_name);
m_parentPlot->replot();
}
void Graph::set_lineStyle(LineStyle value) noexcept
{
m_lineStyle = static_cast<Graph::LineStyle>(m_graph->lineStyle());
if(m_lineStyle == value) return;
m_lineStyle = value;
m_graph->setLineStyle(static_cast<QCPGraph::LineStyle>(value));
Q_EMIT lineStyleChanged(m_lineStyle);
m_parentPlot->replot();
}
void Graph::set_graphWidth(int value) noexcept
{
m_graphWidth = m_graph->pen().width();
if(m_graphWidth == value) return;
m_graphWidth = value;
QPen pen = m_graph->pen();
pen.setWidth(value);
m_graph->setPen(pen);
Q_EMIT graphWidthChanged(m_graphWidth);
m_parentPlot->replot();
}
void Graph::set_graphColor(const QColor &value) noexcept
{
m_graphColor = m_graph->pen().color();
if(m_graphColor == value) return;
m_graphColor = value;
QPen pen = m_graph->pen();
pen.setColor(value);
m_graph->setPen(pen);
Q_EMIT graphColorChanged(m_graphColor);
m_parentPlot->replot();
}
void Graph::updateProperty() noexcept
{
m_visible = m_graph->visible();
m_antialiased = m_graph->antialiased();
m_name = m_graph->name();
m_lineStyle = static_cast<Graph::LineStyle>(m_graph->lineStyle());
m_graphWidth = m_graph->pen().width();
m_graphColor = m_graph->pen().color();
Q_EMIT visibleChanged(m_visible);
Q_EMIT antialiasedChanged(m_antialiased);
Q_EMIT nameChanged(m_name);
Q_EMIT lineStyleChanged(m_lineStyle);
Q_EMIT graphWidthChanged(m_graphWidth);
Q_EMIT graphColorChanged(m_graphColor);
}
}

58
src/qmlcustomplot/graph.h Normal file
View File

@ -0,0 +1,58 @@
#pragma once
#include "macros.h"
#include <QtCore/QObject>
#include <QtGui/QColor>
class QCPGraph;
class QCustomPlot;
namespace QmlQCustomPlot
{
class Graph : public QObject
{
Q_OBJECT
Q_ENUMS(LineType)
public:
enum LineStyle
{
lsNone,
lsLine,
lsStepLeft,
lsStepRight,
lsStepCenter,
lsImpulse
};
private:
QML_READ_WRITE_NOTIFY_PROPERTY(bool, visible)
QML_READ_WRITE_NOTIFY_PROPERTY(bool, antialiased)
QML_READ_WRITE_NOTIFY_PROPERTY(QString, name)
QML_READ_WRITE_NOTIFY_PROPERTY(LineStyle, lineStyle)
QML_READ_WRITE_NOTIFY_PROPERTY(int, graphWidth)
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, graphColor)
public:
Graph(QCPGraph *graph, QCustomPlot *parentPlot, QObject *parent = nullptr);
~Graph();
Q_INVOKABLE void setData(const QVector<double> &keys, const QVector<double> &values) noexcept;
Q_INVOKABLE void addData(double key, double value) noexcept;
Q_INVOKABLE void removeDataBefore(double key) noexcept;
Q_INVOKABLE void clearData() noexcept;
void set_visible(bool value) noexcept;
void set_antialiased(bool value) noexcept;
void set_name(const QString &value) noexcept;
void set_lineStyle(LineStyle value) noexcept;
void set_graphWidth(int value) noexcept;
void set_graphColor(const QColor &value) noexcept;
private:
void updateProperty() noexcept;
private:
QCustomPlot *m_parentPlot = nullptr;
QCPGraph *m_graph = nullptr;
};
} // namespace QmlQCustomPlot

136
src/qmlcustomplot/grid.cpp Normal file
View File

@ -0,0 +1,136 @@
#include "grid.h"
#include "qcustomplot.h"
#include <QPen>
#include <stdexcept>
namespace QmlQCustomPlot
{
Grid::Grid(QCPGrid* grid, QCustomPlot *parentPlot, QObject *parent)
: m_qcpgrid(grid), m_parentPlot(parentPlot), QObject(parent)
{
if(parentPlot == nullptr || grid == nullptr)
throw std::invalid_argument(nullptr);
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Grid::updateProperty);
updateProperty();
}
Grid::~Grid()
{
}
void Grid::set_visible(bool value) noexcept
{
m_visible = m_qcpgrid->visible();
if(m_visible == value) return;
m_visible = value;
m_qcpgrid->setVisible(value);
Q_EMIT visibleChanged(m_visible);
m_parentPlot->replot();
}
void Grid::set_subVisible(bool value) noexcept
{
m_subVisible = m_qcpgrid->subGridVisible();
if(m_subVisible == value) return;
m_subVisible = value;
m_qcpgrid->setSubGridVisible(value);
Q_EMIT subVisibleChanged(m_subVisible);
m_parentPlot->replot();
}
void Grid::set_lineWidth(int value) noexcept
{
m_lineWidth = m_qcpgrid->pen().width();
if(m_lineWidth == value) return;
m_lineWidth = value;
QPen pen = m_qcpgrid->pen();
pen.setWidth(value);
m_qcpgrid->setPen(pen);
Q_EMIT lineWidthChanged(m_lineWidth);
m_parentPlot->replot();
}
void Grid::set_lineColor(const QColor &value) noexcept
{
m_lineColor = m_qcpgrid->pen().color();
if(m_lineColor == value) return;
m_lineColor = value;
QPen pen = m_qcpgrid->pen();
pen.setColor(value);
m_qcpgrid->setPen(pen);
Q_EMIT lineColorChanged(m_lineColor);
m_parentPlot->replot();
}
void Grid::set_lineType(LineType value) noexcept
{
m_lineType = static_cast<LineType>(m_qcpgrid->pen().style());
if(m_lineType == value) return;
m_lineType = value;
QPen pen = m_qcpgrid->pen();
pen.setStyle(static_cast<Qt::PenStyle>(value));
m_qcpgrid->setPen(pen);
Q_EMIT lineTypeChanged(m_lineType);
m_parentPlot->replot();
}
void Grid::set_subLineWidth(int value) noexcept
{
m_subLineWidth = m_qcpgrid->subGridPen().width();
if(m_subLineWidth == value) return;
m_subLineWidth = value;
QPen pen = m_qcpgrid->subGridPen();
pen.setWidth(value);
m_qcpgrid->setSubGridPen(pen);
Q_EMIT subLineWidthChanged(m_subLineWidth);
m_parentPlot->replot();
}
void Grid::set_subLineColor(const QColor &value) noexcept
{
m_subLineColor = m_qcpgrid->subGridPen().color();
if(m_subLineColor == value) return;
m_subLineColor = value;
QPen pen = m_qcpgrid->subGridPen();
pen.setColor(value);
m_qcpgrid->setSubGridPen(pen);
Q_EMIT subLineColorChanged(m_subLineColor);
m_parentPlot->replot();
}
void Grid::set_subLineType(LineType value) noexcept
{
m_subLineType = static_cast<LineType>(m_qcpgrid->subGridPen().style());
if(m_subLineType == value) return;
m_subLineType = value;
QPen pen = m_qcpgrid->subGridPen();
pen.setStyle(static_cast<Qt::PenStyle>(value));
m_qcpgrid->setSubGridPen(pen);
Q_EMIT subLineTypeChanged(m_subLineType);
m_parentPlot->replot();
}
void Grid::updateProperty() noexcept
{
m_visible = m_qcpgrid->visible();
m_subVisible = m_qcpgrid->subGridVisible();
m_lineWidth = m_qcpgrid->pen().width();
m_lineColor = m_qcpgrid->pen().color();
m_lineType = static_cast<LineType>(m_qcpgrid->pen().style());
m_subLineWidth = m_qcpgrid->subGridPen().width();
m_subLineColor = m_qcpgrid->subGridPen().color();
m_subLineType = static_cast<LineType>(m_qcpgrid->subGridPen().style());
Q_EMIT visibleChanged(m_visible);
Q_EMIT subVisibleChanged(m_subVisible);
Q_EMIT lineWidthChanged(m_lineWidth);
Q_EMIT lineColorChanged(m_lineColor);
Q_EMIT lineTypeChanged(m_lineType);
Q_EMIT subLineWidthChanged(m_subLineWidth);
Q_EMIT subLineColorChanged(m_subLineColor);
Q_EMIT subLineTypeChanged(m_subLineType);
}
}

61
src/qmlcustomplot/grid.h Normal file
View File

@ -0,0 +1,61 @@
#pragma once
#include "macros.h"
#include <QtCore/QObject>
#include <QtGui/QColor>
#include <QtQml/qqml.h>
class QCPGrid;
class QCustomPlot;
namespace QmlQCustomPlot
{
class Grid : public QObject
{
Q_OBJECT
Q_ENUMS(LineType)
QML_NAMED_ELEMENT(PlotGrid)
QML_UNCREATABLE("")
public:
enum LineType
{
NoPen,
SolidLine,
DashLine,
DotLine,
DashDotLine,
DashDotDotLine
};
private:
QML_READ_WRITE_NOTIFY_PROPERTY(bool, visible)
QML_READ_WRITE_NOTIFY_PROPERTY(bool, subVisible)
QML_READ_WRITE_NOTIFY_PROPERTY(int, lineWidth)
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, lineColor)
QML_READ_WRITE_NOTIFY_PROPERTY(LineType, lineType)
QML_READ_WRITE_NOTIFY_PROPERTY(int, subLineWidth)
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, subLineColor)
QML_READ_WRITE_NOTIFY_PROPERTY(LineType, subLineType)
public:
Grid(QCPGrid* grid, QCustomPlot *parentPlot, QObject *parent = nullptr);
~Grid();
void set_visible(bool value) noexcept;
void set_subVisible(bool value) noexcept;
void set_lineWidth(int value) noexcept;
void set_lineColor(const QColor &value) noexcept;
void set_lineType(LineType value) noexcept;
void set_subLineWidth(int value) noexcept;
void set_subLineColor(const QColor &value) noexcept;
void set_subLineType(LineType value) noexcept;
private:
void updateProperty() noexcept;
private:
QCustomPlot *m_parentPlot = nullptr;
QCPGrid *m_qcpgrid = nullptr;
};
} // namespace QmlQCustomPlot

View File

@ -0,0 +1,33 @@
#pragma once
namespace QmlQCustomPlot
{
#define QML_READ_WRITE_NOTIFY_PROPERTY(TYPE, NAME) \
Q_PROPERTY(TYPE NAME READ NAME WRITE set_##NAME NOTIFY NAME##Changed) \
public: \
TYPE NAME() const { return m_##NAME; } \
Q_SIGNAL void NAME##Changed(TYPE); \
private: \
TYPE m_##NAME {};
#define QML_READ_NOTIFY_PROPERTY(TYPE, NAME) \
Q_PROPERTY(TYPE NAME READ NAME NOTIFY NAME##Changed) \
public: \
TYPE NAME() const { return m_##NAME; } \
Q_SIGNAL void NAME##Changed(TYPE); \
private: \
TYPE m_##NAME {};
#define QML_READ_CONSTANT(TYPE, NAME) \
Q_PROPERTY(TYPE NAME READ NAME CONSTANT) \
public: \
TYPE NAME() const { return m_##NAME; } \
Q_SIGNAL void NAME##Changed(TYPE); \
private: \
TYPE m_##NAME {};
} // namespace QmlQCustomPlot

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,120 @@
#include "ticker.h"
#include "qcustomplot.h"
#include <QPen>
#include <stdexcept>
namespace QmlQCustomPlot
{
Ticker::Ticker(QCPAxis* parentAxis, QCustomPlot *parentPlot, QObject *parent)
: m_parentAxis(parentAxis), m_parentPlot(parentPlot), QObject(parent)
{
if(parentPlot == nullptr || parentAxis == nullptr)
throw std::invalid_argument(nullptr);
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Ticker::updateProperty);
updateProperty();
}
Ticker::~Ticker()
{
}
void Ticker::set_ticks(bool value) noexcept
{
m_ticks = m_parentAxis->ticks();
if(m_ticks == value) return;
m_ticks = value;
m_parentAxis->setTicks(value);
Q_EMIT ticksChanged(m_ticks);
m_parentPlot->replot();
}
void Ticker::set_subTicks(bool value) noexcept
{
m_subTicks = m_parentAxis->subTicks();
if(m_subTicks == value) return;
m_subTicks = value;
m_parentAxis->setSubTicks(value);
Q_EMIT subTicksChanged(m_subTicks);
m_parentPlot->replot();
}
void Ticker::set_tickCount(int value) noexcept
{
m_tickCount = m_parentAxis->ticker()->tickCount();
if(m_tickCount == value) return;
m_tickCount = value;
m_parentAxis->ticker()->setTickCount(value);
Q_EMIT tickCountChanged(m_tickCount);
m_parentPlot->replot();
}
void Ticker::set_baseWidth(int value) noexcept
{
m_baseWidth = m_parentAxis->basePen().width();
if(m_baseWidth == value) return;
m_baseWidth = value;
QPen pen = m_parentAxis->basePen();
pen.setWidth(value);
m_parentAxis->setBasePen(pen);
Q_EMIT baseWidthChanged(m_baseWidth);
m_parentPlot->replot();
}
void Ticker::set_baseColor(const QColor &value) noexcept
{
m_baseColor = m_parentAxis->basePen().color();
if(m_baseColor == value) return;
m_baseColor = value;
QPen pen = m_parentAxis->basePen();
pen.setColor(value);
m_parentAxis->setBasePen(pen);
Q_EMIT baseColorChanged(m_baseColor);
m_parentPlot->replot();
}
void Ticker::set_tickColor(const QColor &value) noexcept
{
m_tickColor = m_parentAxis->tickPen().color();
if(m_tickColor == value) return;
m_tickColor = value;
QPen pen = m_parentAxis->tickPen();
pen.setColor(value);
m_parentAxis->setTickPen(pen);
Q_EMIT tickColorChanged(m_tickColor);
m_parentPlot->replot();
}
void Ticker::set_subTickColor(const QColor &value) noexcept
{
m_subTickColor = m_parentAxis->subTickPen().color();
if(m_subTickColor == value) return;
m_subTickColor = value;
QPen pen = m_parentAxis->subTickPen();
pen.setColor(value);
m_parentAxis->setSubTickPen(pen);
Q_EMIT subTickColorChanged(m_subTickColor);
m_parentPlot->replot();
}
void Ticker::updateProperty() noexcept
{
m_ticks = m_parentAxis->ticks();
m_subTicks = m_parentAxis->subTicks();
m_tickCount = m_parentAxis->ticker()->tickCount();
m_baseWidth = m_parentAxis->basePen().width();
m_baseColor = m_parentAxis->basePen().color();
m_tickColor = m_parentAxis->tickPen().color();
m_subTickColor = m_parentAxis->subTickPen().color();
Q_EMIT ticksChanged(m_ticks);
Q_EMIT subTicksChanged(m_subTicks);
Q_EMIT tickCountChanged(m_tickCount);
Q_EMIT baseWidthChanged(m_baseWidth);
Q_EMIT baseColorChanged(m_baseColor);
Q_EMIT tickColorChanged(m_tickColor);
Q_EMIT subTickColorChanged(m_subTickColor);
}
}

View File

@ -0,0 +1,47 @@
#pragma once
#include "macros.h"
#include <QtCore/QObject>
#include <QtGui/QColor>
#include <QtQml/qqml.h>
class QCPAxis;
class QCustomPlot;
namespace QmlQCustomPlot
{
class Ticker : public QObject
{
Q_OBJECT
QML_READ_WRITE_NOTIFY_PROPERTY(bool, ticks)
QML_READ_WRITE_NOTIFY_PROPERTY(bool, subTicks)
QML_READ_WRITE_NOTIFY_PROPERTY(int, tickCount)
QML_READ_WRITE_NOTIFY_PROPERTY(int, baseWidth)
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, baseColor)
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, tickColor)
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, subTickColor)
QML_ELEMENT
QML_UNCREATABLE("")
public:
Ticker(QCPAxis* parentAxis, QCustomPlot *parentPlot, QObject *parent = nullptr);
~Ticker();
void set_ticks(bool value) noexcept;
void set_subTicks(bool value) noexcept;
void set_tickCount(int value) noexcept;
void set_baseWidth(int value) noexcept;
void set_baseColor(const QColor &value) noexcept;
void set_tickColor(const QColor &value) noexcept;
void set_subTickColor(const QColor &value) noexcept;
private:
void updateProperty() noexcept;
private:
QCustomPlot *m_parentPlot = nullptr;
QCPAxis* m_parentAxis = nullptr;
};
} // namespace QmlQCustomPlot