Skip to content

Commit f17372e

Browse files
LeonezzLeonezz
committed
📝 add some docs
1 parent ce5985e commit f17372e

34 files changed

+53
-69
lines changed

‎GeneratedFiles/qrc_openchart.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
** Resource object code
33
**
4-
** Created by: The Resource Compiler for Qt version 5.14.0
4+
** Created by: The Resource Compiler for Qt version 5.15.0
55
**
66
** WARNING! All changes made in this file will be lost!
77
*****************************************************************************/

‎GeneratedFiles/qrc_openchart_demo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/****************************************************************************
22
** Resource object code
33
**
4-
** Created by: The Resource Compiler for Qt version 5.13.1
4+
** Created by: The Resource Compiler for Qt version 5.15.0
55
**
66
** WARNING! All changes made in this file will be lost!
77
*****************************************************************************/
88

99
static const unsigned char qt_resource_data[] = {
10-
// C:/Users/zhuWenQ/Desktop/Study/C++/Qt/OpenChart_mainWindow/OPENCHART/UI/openchart_widget.ui
10+
// C:/Users/zhuWenQ/Desktop/GithubResource/OPENCHART/UI/openchart_widget.ui
1111
0x0,0x0,0x6,0x1f,
1212
0x3c,
1313
0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,

‎GeneratedFiles/ui_openchart.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/********************************************************************************
22
** Form generated from reading UI file 'openchart.ui'
33
**
4-
** Created by: Qt User Interface Compiler version 5.13.0
4+
** Created by: Qt User Interface Compiler version 5.15.0
55
**
66
** WARNING! All changes made in this file will be lost when recompiling UI file!
77
********************************************************************************/

‎OPENCHART.vcxproj

+31-15
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7070
<ClCompile>
7171
<MultiProcessorCompilation>true</MultiProcessorCompilation>
72-
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
73-
<AdditionalIncludeDirectories>C:\Users\zhuWenQ\Desktop\Study\C++\Qt\OpenChart_mainWindow\OPENCHART\include;.\GeneratedFiles;.;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72+
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
73+
<AdditionalIncludeDirectories>C:\Users\zhuWenQ\Desktop\Study\C++\Qt\OpenChart_mainWindow\OPENCHART\include;.\GeneratedFiles;.;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7474
<Optimization>Disabled</Optimization>
7575
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
7676
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -81,13 +81,13 @@
8181
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
8282
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
8383
<GenerateDebugInformation>true</GenerateDebugInformation>
84-
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5WebChanneld.lib;Qt5WebSocketsd.lib;Qt5WebEngined.lib;Qt5WebEngineCored.lib;Qt5WebEngineWidgetsd.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5AxContainerd.lib;Qt5AxBased.lib;%(AdditionalDependencies)</AdditionalDependencies>
84+
<AdditionalDependencies>qtmaind.lib;Qt5AxBase.lib;Qt5WebEngine.lib;Qt5WebEngineCore.lib;Qt5WebEngineWidgets.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5WebChanneld.lib;Qt5WebSocketsd.lib;Qt5WebEngined.lib;Qt5WebEngineCored.lib;Qt5WebEngineWidgetsd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
8585
</Link>
8686
<QtMoc>
8787
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
8888
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
89-
<IncludePath>C:\Users\zhuWenQ\Desktop\Study\C++\Qt\OpenChart_mainWindow\OPENCHART\include;.\GeneratedFiles;.;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtNetwork</IncludePath>
90-
<Define>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)</Define>
89+
<IncludePath>C:\Users\zhuWenQ\Desktop\Study\C++\Qt\OpenChart_mainWindow\OPENCHART\include;.\GeneratedFiles;.;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</IncludePath>
90+
<Define>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
9191
</QtMoc>
9292
<QtUic>
9393
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
@@ -101,8 +101,8 @@
101101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
102102
<ClCompile>
103103
<MultiProcessorCompilation>true</MultiProcessorCompilation>
104-
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105-
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\ActiveQt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104+
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105+
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106106
<DebugInformationFormat />
107107
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
108108
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -112,13 +112,13 @@
112112
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
113113
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114114
<GenerateDebugInformation>false</GenerateDebugInformation>
115-
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5WebChannel.lib;Qt5WebSockets.lib;Qt5WebEngine.lib;Qt5WebEngineCore.lib;Qt5WebEngineWidgets.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5AxContainer.lib;Qt5AxBase.lib;%(AdditionalDependencies)</AdditionalDependencies>
115+
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5WebChannel.lib;Qt5WebSockets.lib;Qt5WebEngine.lib;Qt5WebEngineCore.lib;Qt5WebEngineWidgets.lib;Qt5Widgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
116116
</Link>
117117
<QtMoc>
118118
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
119119
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
120-
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\ActiveQt</IncludePath>
121-
<Define>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)</Define>
120+
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</IncludePath>
121+
<Define>UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
122122
</QtMoc>
123123
<QtUic>
124124
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
@@ -131,19 +131,35 @@
131131
</ItemDefinitionGroup>
132132
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
133133
<QtMoc>
134-
<IncludePath />
134+
<IncludePath>$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</IncludePath>
135135
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
136136
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
137-
<Define>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</Define>
137+
<Define>QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
138138
</QtMoc>
139+
<Link />
140+
<ClCompile>
141+
<PreprocessorDefinitions>QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142+
<AdditionalIncludeDirectories>$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
143+
</ClCompile>
144+
<Link>
145+
<AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5WebChannel.lib;Qt5WebSockets.lib;Qt5WebEngine.lib;Qt5WebEngineCore.lib;Qt5WebEngineWidgets.lib;Qt5Widgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
146+
</Link>
139147
</ItemDefinitionGroup>
140148
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
141149
<QtMoc>
142-
<IncludePath />
150+
<IncludePath>$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</IncludePath>
143151
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
144152
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
145-
<Define>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</Define>
153+
<Define>QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
146154
</QtMoc>
155+
<Link />
156+
<ClCompile>
157+
<PreprocessorDefinitions>QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WEBCHANNEL_LIB;QT_WEBSOCKETS_LIB;QT_WEBENGINE_LIB;QT_WEBENGINECORE_LIB;QT_WEBENGINEWIDGETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158+
<AdditionalIncludeDirectories>$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWebEngine;$(QTDIR)\include\QtWebEngineCore;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159+
</ClCompile>
160+
<Link>
161+
<AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5WebChannel.lib;Qt5WebSockets.lib;Qt5WebEngine.lib;Qt5WebEngineCore.lib;Qt5WebEngineWidgets.lib;Qt5Widgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
162+
</Link>
147163
</ItemDefinitionGroup>
148164
<ItemGroup>
149165
<QtRcc Include="UI\openchart.qrc" />
@@ -214,7 +230,7 @@
214230
</ImportGroup>
215231
<ProjectExtensions>
216232
<VisualStudio>
217-
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="msvc2017_64" MocOptions="" />
233+
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="msvc2019_64" MocOptions="" />
218234
</VisualStudio>
219235
</ProjectExtensions>
220236
</Project>

‎OPENCHART.vcxproj.user

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup />
44
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5-
<QTDIR>C:\Qt\5.14.0\msvc2017_64</QTDIR>
5+
<QTDIR>C:\Qt\5.15.0\msvc2019_64</QTDIR>
66
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
9-
<QTDIR>C:\Qt\5.14.0\msvc2017_64</QTDIR>
9+
<QTDIR>C:\Qt\5.15.0\msvc2019_64</QTDIR>
1010
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
1111
</PropertyGroup>
1212
</Project>

‎Resources/boxplot.xlsx

-9.85 KB
Binary file not shown.

‎Resources/calendar.xlsx

-8.86 KB
Binary file not shown.

‎Resources/flow.xlsx

-546 KB
Binary file not shown.

‎Resources/funnul.xlsx

-8.71 KB
Binary file not shown.

‎Resources/heartLine.xlsx

-12 KB
Binary file not shown.

‎Resources/heatmap.xlsx

-235 KB
Binary file not shown.

‎Resources/history_A_stock_k_data.xlsx

-34.5 KB
Binary file not shown.

‎Resources/line.xlsx

-9.69 KB
Binary file not shown.

‎Resources/pie.xlsx

-9.25 KB
Binary file not shown.

‎Resources/radar.xlsx

-9.76 KB
Binary file not shown.

‎Resources/river.xlsx

-9.9 KB
Binary file not shown.

‎Resources/sankey.xlsx

-10.5 KB
Binary file not shown.

‎Resources/sankey1.xlsx

-9.4 KB
Binary file not shown.

‎Resources/scatter.xlsx

-30.1 KB
Binary file not shown.

‎Resources/scatter3d.xlsx

-40.6 KB
Binary file not shown.

‎Resources/平行.xlsx

-10 KB
Binary file not shown.

‎Resources/高斯分布.xlsx

-108 KB
Binary file not shown.

‎header/brige.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Brige :public QObject
2121
}
2222

2323
/*
24-
this signal will emit from c++ side and be recieved on the HTML side.
24+
this signal will emit from c++ side and recieved by the HTML side.
2525
*/
2626
signals:
2727
void sendMsg(const QString& text);

‎header/charttypestring.h

-31
This file was deleted.

‎header/filedataprocess.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace DataProcess
1414
/*
1515
1616
*/
17-
typedef std::size_t sizetype;
17+
using sizetype = std::size_t;
1818
void dataForLine(const QList<QList<QVariant> >&, JsonObject*);
1919
void dataForBar(const QList<QList<QVariant> >&, JsonObject*);
2020
void dataForPie(const QList<QList<QVariant> >&, JsonObject*);

‎header/filestream.h

+3-11
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,11 @@
55
#include <QVariant>
66
#include <ActiveQt/QAxObject>
77

8-
namespace FileStream
9-
{
10-
inline bool readExcel(const QString& filepath, QList<QList<QVariant> >* dataList);
11-
inline QJsonObject readJson(const QString& filepath);
12-
inline bool readJson(const QString& filepath, QJsonObject* jsonObj);
13-
inline QList<QList<QVariant> > readCsv(const QString& filepath);
14-
inline QList<QList<QVariant> > readTxt(const QString& filepath);
15-
inline void writeFile(const QString& fileName);
16-
};
178
namespace FileStream
189
{
1910
bool readExcel(const QString& filepath, QList<QList<QVariant> >* dataList)
2011
{
21-
bool fileError = true;
12+
bool fileError = false;
2213
if (!filepath.isEmpty())
2314
{
2415
QAxObject* excel=new QAxObject(); //
@@ -84,9 +75,10 @@ namespace FileStream
8475
delete workBook;
8576
delete workBooks;
8677
delete excel;
87-
return fileError;
78+
fileError = true;
8879
}
8980
}
81+
return fileError;
9082
}
9183
QJsonObject readJson(const QString& filepath)
9284
{

‎resource.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//{{NO_DEPENDENCIES}}
2-
// Microsoft Visual C++ 生成的包含文件。
3-
// 供 OPENCHART.rc 使用
2+
// Microsoft Visual C++ ���ɵİ����ļ���
3+
// �� OPENCHART.rc ʹ��
44
//
55
#define IDI_ICON1 108
66

‎source/filedataprocess.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ namespace DataProcess
189189
//for (sizetype i = 0; i < xAxisDataList.length(); ++i)
190190
//{
191191
// xAxisDataArr.append(xAxisDataList[i]);
192-
// //yAxisDataArr.append(yAxisDataList[i]);
192+
// yAxisDataArr.append(yAxisDataList[i]);
193193
//}
194194

195195
json->replace(OptionIdentity::series::data, data);

0 commit comments

Comments
 (0)