From bf3eaae68b576dfbebfa2f3aaa5a84509fd84b45 Mon Sep 17 00:00:00 2001 From: Irony <892768447@qq.com> Date: Fri, 2 Nov 2018 13:38:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .settings/org.eclipse.core.resources.prefs | 16 ++++++------- .../ChartView/ChartView.py | 0 .../ChartView/ChatWidget.py | 0 .../ChartView/loading.gif | Bin .../ChartView/分类/折线图/堆叠折线图.json | 0 .../ChartView/分类/柱状图/堆叠柱状图.json | 0 图表/{PyQtChart练习 => PyQtChart}/README.md | 0 .../charts/bar/BarStack.py | 0 .../charts/bar/ScreenShot/BarStack.gif | Bin .../charts/line/LineStack.py | 0 .../charts/line/ScreenShot/LineStack.gif | Bin .../test => PyQtChart/demo}/LineChart.py | 0 .../demo}/LineChart自定义xy轴.py | 0 .../demo/ScreenShot/LineChart.png} | Bin .../demo/ScreenShot/LineChart自定义xy轴.png} | Bin .../demo/ScreenShot/ToolTip.gif} | Bin .../demo/ScreenShot/ToolTip2.gif} | Bin .../test => PyQtChart/demo}/ToolTip.py | 0 .../test => PyQtChart/demo}/ToolTip2.py | 0 图表/PyQtChart练习/charts/README.md | 11 --------- 图表/PyQtChart练习/charts/bar/README.md | 5 ---- 图表/PyQtChart练习/charts/line/README.md | 5 ---- 图表/PyQtChart练习/test/README.md | 13 ----------- 图表/README.md | 22 ++++++++++++++++++ .../QTreeWidget/Json生成QTreeWidget/README.md | 8 ------- .../ScreenShot/{1.png => Json生成树形结构.png} | Bin 树结构/README.md | 8 +++++++ .../1.gif => ScreenShot/简单查找文字并高亮.gif} | Bin 输入框/QTextEdit/文本高亮/README.md | 4 ---- .../{文本高亮 => }/简单查找文字并高亮.py | 0 输入框/README.md | 8 +++++++ 31 files changed, 46 insertions(+), 54 deletions(-) rename 图表/{PyQtChart练习 => PyQtChart}/ChartView/ChartView.py (100%) rename 图表/{PyQtChart练习 => PyQtChart}/ChartView/ChatWidget.py (100%) rename 图表/{PyQtChart练习 => PyQtChart}/ChartView/loading.gif (100%) rename 图表/{PyQtChart练习 => PyQtChart}/ChartView/分类/折线图/堆叠折线图.json (100%) rename 图表/{PyQtChart练习 => PyQtChart}/ChartView/分类/柱状图/堆叠柱状图.json (100%) rename 图表/{PyQtChart练习 => PyQtChart}/README.md (100%) rename 图表/{PyQtChart练习 => PyQtChart}/charts/bar/BarStack.py (100%) rename 图表/{PyQtChart练习 => PyQtChart}/charts/bar/ScreenShot/BarStack.gif (100%) rename 图表/{PyQtChart练习 => PyQtChart}/charts/line/LineStack.py (100%) rename 图表/{PyQtChart练习 => PyQtChart}/charts/line/ScreenShot/LineStack.gif (100%) rename 图表/{PyQtChart练习/test => PyQtChart/demo}/LineChart.py (100%) rename 图表/{PyQtChart练习/test => PyQtChart/demo}/LineChart自定义xy轴.py (100%) rename 图表/{PyQtChart练习/test/ScreenShot/1.png => PyQtChart/demo/ScreenShot/LineChart.png} (100%) rename 图表/{PyQtChart练习/test/ScreenShot/2.png => PyQtChart/demo/ScreenShot/LineChart自定义xy轴.png} (100%) rename 图表/{PyQtChart练习/test/ScreenShot/3.gif => PyQtChart/demo/ScreenShot/ToolTip.gif} (100%) rename 图表/{PyQtChart练习/test/ScreenShot/4.gif => PyQtChart/demo/ScreenShot/ToolTip2.gif} (100%) rename 图表/{PyQtChart练习/test => PyQtChart/demo}/ToolTip.py (100%) rename 图表/{PyQtChart练习/test => PyQtChart/demo}/ToolTip2.py (100%) delete mode 100644 图表/PyQtChart练习/charts/README.md delete mode 100644 图表/PyQtChart练习/charts/bar/README.md delete mode 100644 图表/PyQtChart练习/charts/line/README.md delete mode 100644 图表/PyQtChart练习/test/README.md create mode 100644 图表/README.md delete mode 100644 树结构/QTreeWidget/Json生成QTreeWidget/README.md rename 树结构/QTreeWidget/Json生成QTreeWidget/ScreenShot/{1.png => Json生成树形结构.png} (100%) create mode 100644 树结构/README.md rename 输入框/QTextEdit/{文本高亮/ScreenShot/1.gif => ScreenShot/简单查找文字并高亮.gif} (100%) delete mode 100644 输入框/QTextEdit/文本高亮/README.md rename 输入框/QTextEdit/{文本高亮 => }/简单查找文字并高亮.py (100%) create mode 100644 输入框/README.md diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index e1c182d..1d8fd02 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -50,14 +50,14 @@ encoding//\u56FE\u7247/\u663E\u793A.9\u683C\u5F0F\u56FE\u7247/\u7EAFpython\u7248 encoding//\u56FE\u7247/\u663E\u793A.9\u683C\u5F0F\u56FE\u7247/\u7EAFpython\u7248\u672C1/testNinePatch.py=utf-8 encoding//\u56FE\u7247/\u663E\u793A.9\u683C\u5F0F\u56FE\u7247/\u7EAFpython\u7248\u672C2/QtNinePatch.py=utf-8 encoding//\u56FE\u7247/\u663E\u793A.9\u683C\u5F0F\u56FE\u7247/\u7EAFpython\u7248\u672C2/testQtNinePatch.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/ChartView/ChartView.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/ChartView/ChatWidget.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/charts/bar/BarStack.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/charts/line/LineStack.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/test/LineChart.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/test/LineChart\u81EA\u5B9A\u4E49xy\u8F74.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/test/ToolTip.py=utf-8 -encoding//\u56FE\u8868/PyQtChart\u7EC3\u4E60/test/ToolTip2.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/ChartView/ChartView.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/ChartView/ChatWidget.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/charts/bar/BarStack.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/charts/line/LineStack.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/demo/LineChart.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/demo/LineChart\u81EA\u5B9A\u4E49xy\u8F74.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/demo/ToolTip.py=utf-8 +encoding//\u56FE\u8868/PyQtChart/demo/ToolTip2.py=utf-8 encoding//\u591A\u7EBF\u7A0B/moveToThread.py=utf-8 encoding//\u591A\u7EBF\u7A0B/\u7EE7\u627FQThread.py=utf-8 encoding//\u591A\u9875\u9762/QScrollArea/\u4EFFQQ\u8BBE\u7F6E\u9762\u677F/SettingUi.py=utf-8 diff --git a/图表/PyQtChart练习/ChartView/ChartView.py b/图表/PyQtChart/ChartView/ChartView.py similarity index 100% rename from 图表/PyQtChart练习/ChartView/ChartView.py rename to 图表/PyQtChart/ChartView/ChartView.py diff --git a/图表/PyQtChart练习/ChartView/ChatWidget.py b/图表/PyQtChart/ChartView/ChatWidget.py similarity index 100% rename from 图表/PyQtChart练习/ChartView/ChatWidget.py rename to 图表/PyQtChart/ChartView/ChatWidget.py diff --git a/图表/PyQtChart练习/ChartView/loading.gif b/图表/PyQtChart/ChartView/loading.gif similarity index 100% rename from 图表/PyQtChart练习/ChartView/loading.gif rename to 图表/PyQtChart/ChartView/loading.gif diff --git a/图表/PyQtChart练习/ChartView/分类/折线图/堆叠折线图.json b/图表/PyQtChart/ChartView/分类/折线图/堆叠折线图.json similarity index 100% rename from 图表/PyQtChart练习/ChartView/分类/折线图/堆叠折线图.json rename to 图表/PyQtChart/ChartView/分类/折线图/堆叠折线图.json diff --git a/图表/PyQtChart练习/ChartView/分类/柱状图/堆叠柱状图.json b/图表/PyQtChart/ChartView/分类/柱状图/堆叠柱状图.json similarity index 100% rename from 图表/PyQtChart练习/ChartView/分类/柱状图/堆叠柱状图.json rename to 图表/PyQtChart/ChartView/分类/柱状图/堆叠柱状图.json diff --git a/图表/PyQtChart练习/README.md b/图表/PyQtChart/README.md similarity index 100% rename from 图表/PyQtChart练习/README.md rename to 图表/PyQtChart/README.md diff --git a/图表/PyQtChart练习/charts/bar/BarStack.py b/图表/PyQtChart/charts/bar/BarStack.py similarity index 100% rename from 图表/PyQtChart练习/charts/bar/BarStack.py rename to 图表/PyQtChart/charts/bar/BarStack.py diff --git a/图表/PyQtChart练习/charts/bar/ScreenShot/BarStack.gif b/图表/PyQtChart/charts/bar/ScreenShot/BarStack.gif similarity index 100% rename from 图表/PyQtChart练习/charts/bar/ScreenShot/BarStack.gif rename to 图表/PyQtChart/charts/bar/ScreenShot/BarStack.gif diff --git a/图表/PyQtChart练习/charts/line/LineStack.py b/图表/PyQtChart/charts/line/LineStack.py similarity index 100% rename from 图表/PyQtChart练习/charts/line/LineStack.py rename to 图表/PyQtChart/charts/line/LineStack.py diff --git a/图表/PyQtChart练习/charts/line/ScreenShot/LineStack.gif b/图表/PyQtChart/charts/line/ScreenShot/LineStack.gif similarity index 100% rename from 图表/PyQtChart练习/charts/line/ScreenShot/LineStack.gif rename to 图表/PyQtChart/charts/line/ScreenShot/LineStack.gif diff --git a/图表/PyQtChart练习/test/LineChart.py b/图表/PyQtChart/demo/LineChart.py similarity index 100% rename from 图表/PyQtChart练习/test/LineChart.py rename to 图表/PyQtChart/demo/LineChart.py diff --git a/图表/PyQtChart练习/test/LineChart自定义xy轴.py b/图表/PyQtChart/demo/LineChart自定义xy轴.py similarity index 100% rename from 图表/PyQtChart练习/test/LineChart自定义xy轴.py rename to 图表/PyQtChart/demo/LineChart自定义xy轴.py diff --git a/图表/PyQtChart练习/test/ScreenShot/1.png b/图表/PyQtChart/demo/ScreenShot/LineChart.png similarity index 100% rename from 图表/PyQtChart练习/test/ScreenShot/1.png rename to 图表/PyQtChart/demo/ScreenShot/LineChart.png diff --git a/图表/PyQtChart练习/test/ScreenShot/2.png b/图表/PyQtChart/demo/ScreenShot/LineChart自定义xy轴.png similarity index 100% rename from 图表/PyQtChart练习/test/ScreenShot/2.png rename to 图表/PyQtChart/demo/ScreenShot/LineChart自定义xy轴.png diff --git a/图表/PyQtChart练习/test/ScreenShot/3.gif b/图表/PyQtChart/demo/ScreenShot/ToolTip.gif similarity index 100% rename from 图表/PyQtChart练习/test/ScreenShot/3.gif rename to 图表/PyQtChart/demo/ScreenShot/ToolTip.gif diff --git a/图表/PyQtChart练习/test/ScreenShot/4.gif b/图表/PyQtChart/demo/ScreenShot/ToolTip2.gif similarity index 100% rename from 图表/PyQtChart练习/test/ScreenShot/4.gif rename to 图表/PyQtChart/demo/ScreenShot/ToolTip2.gif diff --git a/图表/PyQtChart练习/test/ToolTip.py b/图表/PyQtChart/demo/ToolTip.py similarity index 100% rename from 图表/PyQtChart练习/test/ToolTip.py rename to 图表/PyQtChart/demo/ToolTip.py diff --git a/图表/PyQtChart练习/test/ToolTip2.py b/图表/PyQtChart/demo/ToolTip2.py similarity index 100% rename from 图表/PyQtChart练习/test/ToolTip2.py rename to 图表/PyQtChart/demo/ToolTip2.py diff --git a/图表/PyQtChart练习/charts/README.md b/图表/PyQtChart练习/charts/README.md deleted file mode 100644 index f4d9354..0000000 --- a/图表/PyQtChart练习/charts/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# PyQtChart练习 - -[百度 echarts 折线图demo](http://echarts.baidu.com/examples.html#chart-type-line) - -### [Python3.5 or latter][PyQt5 PyQtChart] - -### [1.折线图](line/) - - [1.1 折线图堆叠](line/LineStack.py) - -### [2.柱状图](bar/) - - [2.1 柱状图堆叠](bar/BarStack.py) \ No newline at end of file diff --git a/图表/PyQtChart练习/charts/bar/README.md b/图表/PyQtChart练习/charts/bar/README.md deleted file mode 100644 index 10070c1..0000000 --- a/图表/PyQtChart练习/charts/bar/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# 折线图 - -### [1.柱状图堆叠](BarStack.py) -like [bar-stack](http://echarts.baidu.com/demo.html#bar-stack) -![柱状图堆叠](ScreenShot/BarStack.gif) \ No newline at end of file diff --git a/图表/PyQtChart练习/charts/line/README.md b/图表/PyQtChart练习/charts/line/README.md deleted file mode 100644 index 4c0d6be..0000000 --- a/图表/PyQtChart练习/charts/line/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# 折线图 - -### [1.折线图堆叠](LineStack.py) -like [line-stack](http://echarts.baidu.com/demo.html#line-stack) -![折线图堆叠](ScreenShot/LineStack.gif) \ No newline at end of file diff --git a/图表/PyQtChart练习/test/README.md b/图表/PyQtChart练习/test/README.md deleted file mode 100644 index c21e457..0000000 --- a/图表/PyQtChart练习/test/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# PyQtChart练习-测试 - -### [1.LineChart](LineChart.py) -![LineChart](ScreenShot/1.png) - -### [2.LineChart自定义xy轴](LineChart自定义xy轴.py) -![LineChart](ScreenShot/2.png) - -### [3.QChart ToolTip](ToolTip.py) -![QChart ToolTip](ScreenShot/3.gif) - -### [4.QChart ToolTip 鼠标跟随](ToolTip2.py) -![QChart ToolTip 鼠标跟随](ScreenShot/4.gif) \ No newline at end of file diff --git a/图表/README.md b/图表/README.md new file mode 100644 index 0000000..364b611 --- /dev/null +++ b/图表/README.md @@ -0,0 +1,22 @@ +# 图表 + +## [1、PyQtChart](PyQtChart/) + +### 1. [折线图](PyQtChart/charts/line/LineStack.py) +仿照 [line-stack](http://echarts.baidu.com/demo.html#line-stack) + +![截图](PyQtChart/charts/line/ScreenShot/LineStack.gif) + +### 2. [柱状图](PyQtChart/charts/bar/BarStack.py) +仿照 [bar-stack](http://echarts.baidu.com/demo.html#bar-stack) + +![截图](PyQtChart/charts/bar/ScreenShot/BarStack.gif) + +### 3. [LineChart](PyQtChart/demo/LineChart.py) +![截图](PyQtChart/demo/ScreenShot/LineChart.png) + +### 4. [LineChart自定义xy轴](PyQtChart/demo/LineChart自定义xy轴.py) +![截图](PyQtChart/demo/ScreenShot/LineChart自定义xy轴.png) + +### 5. [ToolTip提示](PyQtChart/demo/ToolTip.py) +![截图](PyQtChart/demo/ScreenShot/ToolTip.gif) \ No newline at end of file diff --git a/树结构/QTreeWidget/Json生成QTreeWidget/README.md b/树结构/QTreeWidget/Json生成QTreeWidget/README.md deleted file mode 100644 index fd8a3b6..0000000 --- a/树结构/QTreeWidget/Json生成QTreeWidget/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# 通过json数据生成QTreeWidget树形结构 - -### [Python3.4.4 or Python3.5][PyQt5] - -emmmmmm,原理就是那样,,解析每一层json数据中的list,美化就不想弄了. - -# 截图 -![截图1](ScreenShot/1.png) \ No newline at end of file diff --git a/树结构/QTreeWidget/Json生成QTreeWidget/ScreenShot/1.png b/树结构/QTreeWidget/Json生成QTreeWidget/ScreenShot/Json生成树形结构.png similarity index 100% rename from 树结构/QTreeWidget/Json生成QTreeWidget/ScreenShot/1.png rename to 树结构/QTreeWidget/Json生成QTreeWidget/ScreenShot/Json生成树形结构.png diff --git a/树结构/README.md b/树结构/README.md new file mode 100644 index 0000000..44a13a5 --- /dev/null +++ b/树结构/README.md @@ -0,0 +1,8 @@ +# 树结构 + +## [1、QTreeWidget](QTreeWidget/) + +### 1.通过json数据生成树形结构 +emmmmmm,原理就是那样,,解析每一层json数据中的list,美化就不想弄了. + +![截图](QTreeWidget/Json生成QTreeWidget/ScreenShot/Json生成树形结构.png) \ No newline at end of file diff --git a/输入框/QTextEdit/文本高亮/ScreenShot/1.gif b/输入框/QTextEdit/ScreenShot/简单查找文字并高亮.gif similarity index 100% rename from 输入框/QTextEdit/文本高亮/ScreenShot/1.gif rename to 输入框/QTextEdit/ScreenShot/简单查找文字并高亮.gif diff --git a/输入框/QTextEdit/文本高亮/README.md b/输入框/QTextEdit/文本高亮/README.md deleted file mode 100644 index 40de0e1..0000000 --- a/输入框/QTextEdit/文本高亮/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# QTextEdit mergeCurrentCharFormat函数 - - -![1](ScreenShot/1.gif) \ No newline at end of file diff --git a/输入框/QTextEdit/文本高亮/简单查找文字并高亮.py b/输入框/QTextEdit/简单查找文字并高亮.py similarity index 100% rename from 输入框/QTextEdit/文本高亮/简单查找文字并高亮.py rename to 输入框/QTextEdit/简单查找文字并高亮.py diff --git a/输入框/README.md b/输入框/README.md new file mode 100644 index 0000000..1f93fea --- /dev/null +++ b/输入框/README.md @@ -0,0 +1,8 @@ +# 输入框 + +## [1、QTextEdit](QTextEdit/) + +### 1. [文本查找高亮](QTextEdit/简单查找文字并高亮.py) +主要用到`mergeCurrentCharFormat`函数 + +![截图](QTextEdit/ScreenShot/简单查找文字并高亮.gif) \ No newline at end of file