diff --git a/Doc/项目汇报PPT.pptx b/Doc/项目汇报PPT.pptx new file mode 100644 index 0000000..dbea71d Binary files /dev/null and b/Doc/项目汇报PPT.pptx differ diff --git a/Doc/项目演示视频.mp4 b/Doc/项目演示视频.mp4 new file mode 100755 index 0000000..71b274a Binary files /dev/null and b/Doc/项目演示视频.mp4 differ diff --git a/PPT/项目汇报PPT.pptx b/PPT/项目汇报PPT.pptx new file mode 100644 index 0000000..dbea71d Binary files /dev/null and b/PPT/项目汇报PPT.pptx differ diff --git a/src/ChangShaTour/ChangShaTour.pro.user b/src/ChangShaTour/ChangShaTour.pro.user index 7d51893..a834a52 100644 --- a/src/ChangShaTour/ChangShaTour.pro.user +++ b/src/ChangShaTour/ChangShaTour.pro.user @@ -1,562 +1,317 @@ - - - - - - EnvironmentId - {d82e82d4-1ed7-46a6-9098-5e0a8f0d7fa3} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MSVC2017 32bit - Desktop Qt 5.14.2 MSVC2017 32bit - qt.qt5.5142.win32_msvc2017_kit - 0 - 0 - 0 - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/大三下/软件体系结构/Trip-in-Chang-sha/ChangShaTour/ChangShaTour.pro - D:/大三下/软件体系结构/Trip-in-Chang-sha/ChangShaTour/ChangShaTour.pro - - false - - false - true - true - false - false - true - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MSVC2017 64bit - Desktop Qt 5.14.2 MSVC2017 64bit - qt.qt5.5142.win64_msvc2017_64_kit - 0 - 0 - 0 - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/大三下/软件体系结构/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - + + + + + + EnvironmentId + {5009ac75-b61d-4c91-8540-bc9e10b6e582} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 GCC 64bit + Desktop Qt 5.14.2 GCC 64bit + qt.qt5.5142.gcc_64_kit + 0 + 0 + 0 + + /home/extra/Study/2021SpringTerm/Architecture/TourInChangSha/src/build-ChangShaTour-Desktop_Qt_5_14_2_GCC_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + /home/extra/Study/2021SpringTerm/Architecture/TourInChangSha/src/build-ChangShaTour-Desktop_Qt_5_14_2_GCC_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + /home/extra/Study/2021SpringTerm/Architecture/TourInChangSha/src/build-ChangShaTour-Desktop_Qt_5_14_2_GCC_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:/home/extra/Study/2021SpringTerm/Architecture/TourInChangSha/src/ChangShaTour/ChangShaTour.pro + /home/extra/Study/2021SpringTerm/Architecture/TourInChangSha/src/ChangShaTour/ChangShaTour.pro + + false + + false + true + true + false + false + true + + /home/extra/Study/2021SpringTerm/Architecture/TourInChangSha/src/build-ChangShaTour-Desktop_Qt_5_14_2_GCC_64bit-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/src/ChangShaTour/ChangShaTour.pro.user.0c4c8cc b/src/ChangShaTour/ChangShaTour.pro.user.0c4c8cc deleted file mode 100644 index 08f2061..0000000 --- a/src/ChangShaTour/ChangShaTour.pro.user.0c4c8cc +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {0c4c8ccc-c524-4850-ba23-7e124d5915df} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MSVC2017 64bit - Desktop Qt 5.14.2 MSVC2017 64bit - qt.qt5.5142.win64_msvc2017_64_kit - 0 - 0 - 0 - - F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:F:/QtDemo/ChangShaTour/ChangShaTour.pro - F:/QtDemo/ChangShaTour/ChangShaTour.pro - - false - - false - true - true - false - false - true - - F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/src/ChangShaTour/ChangShaTour.pro.user.4109ff1 b/src/ChangShaTour/ChangShaTour.pro.user.4109ff1 deleted file mode 100644 index 54b70f7..0000000 --- a/src/ChangShaTour/ChangShaTour.pro.user.4109ff1 +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - EnvironmentId - {4109ff11-a646-43d1-9619-aeb32783df6e} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MSVC2017 64bit - Desktop Qt 5.14.2 MSVC2017 64bit - qt.qt5.5142.win64_msvc2017_64_kit - 0 - 0 - 0 - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:E:/ChangShaTour/Trip-in-Chang-sha/ChangShaTour/ChangShaTour.pro - E:/ChangShaTour/Trip-in-Chang-sha/ChangShaTour/ChangShaTour.pro - - false - - false - true - true - false - false - true - - E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/src/ChangShaTour/ChangShaTour.pro.user.61ba832 b/src/ChangShaTour/ChangShaTour.pro.user.61ba832 deleted file mode 100644 index e2c9e33..0000000 --- a/src/ChangShaTour/ChangShaTour.pro.user.61ba832 +++ /dev/null @@ -1,805 +0,0 @@ - - - - - - EnvironmentId - {61ba832e-6c30-4ab6-b0b8-ace44f46ca0c} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - false - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MSVC2017 64bit - Desktop Qt 5.14.2 MSVC2017 64bit - qt.qt5.5142.win64_msvc2017_64_kit - 0 - 0 - 0 - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/ChangShaTour/ChangShaTour.pro - D:/ChangShaTour/ChangShaTour.pro - - false - - false - true - true - false - false - true - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit - 0 - 0 - 0 - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_32_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.TargetCount - 3 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/src/ChangShaTour/ChangShaTour.pro.user.c9f9416 b/src/ChangShaTour/ChangShaTour.pro.user.c9f9416 deleted file mode 100644 index 57a164a..0000000 --- a/src/ChangShaTour/ChangShaTour.pro.user.c9f9416 +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - EnvironmentId - {c9f94164-08c8-4e3c-b552-0ae5039b502e} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MSVC2017 32bit - Desktop Qt 5.14.2 MSVC2017 32bit - qt.qt5.5142.win32_msvc2017_kit - 0 - 0 - 0 - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/kunlin/OneDrive/QT project/ChangShaTour/ChangShaTour.pro - D:/kunlin/OneDrive/QT project/ChangShaTour/ChangShaTour.pro - - false - - false - true - true - false - false - true - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_32bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MSVC2017 64bit - Desktop Qt 5.14.2 MSVC2017 64bit - qt.qt5.5142.win64_msvc2017_64_kit - 1 - 0 - 0 - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/kunlin/OneDrive/QT project/ChangShaTour/ChangShaTour.pro - D:/kunlin/OneDrive/QT project/ChangShaTour/ChangShaTour.pro - - false - - false - true - true - false - false - true - - D:/kunlin/OneDrive/QT project/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/src/ChangShaTour/confirmwidget.cpp b/src/ChangShaTour/confirmwidget.cpp index 3aabb64..420c800 100644 --- a/src/ChangShaTour/confirmwidget.cpp +++ b/src/ChangShaTour/confirmwidget.cpp @@ -6,6 +6,10 @@ ConfirmWidget::ConfirmWidget(QWidget *parent) : ui(new Ui::ConfirmWidget) { ui->setupUi(this); + + background = new QLabel(this); + SetBackground("./softImages/blackHalf.png"); + verLayout = new QVBoxLayout(); setLayout(verLayout); @@ -65,7 +69,7 @@ void ConfirmWidget::initInfoWidget() routeItems=routeItems->next; qDebug()<placeName<startTime<endTime; placeLabelList[i] = new QLabel(routeItems->placeName); - InitLabel(placeLabelList[i], true, false, "#E1B37C"); + InitLabel(placeLabelList[i], true, false, "#8CA8CC"); startTimeLabelList[i] = new QLabel(routeItems->startTime.toString()); InitLabel(startTimeLabelList[i], true, true, "#FFFFFF"); endTimeLabelList[i] = new QLabel(routeItems->endTime.toString()); @@ -218,3 +222,14 @@ void ConfirmWidget::InitLineEdit(QLineEdit * lineEdit) "} "); lineEdit->setFont(QFont("Microsoft YaHei" , 12, QFont::Bold)); } + +void ConfirmWidget::resizeEvent(QResizeEvent *event) +{ + background->resize(QSize(this->width(), this->height())); +} + +void ConfirmWidget::SetBackground(QString url) +{ + background->setPixmap(url); + background->setScaledContents(true); +} diff --git a/src/ChangShaTour/confirmwidget.h b/src/ChangShaTour/confirmwidget.h index ae05e3e..5475053 100644 --- a/src/ChangShaTour/confirmwidget.h +++ b/src/ChangShaTour/confirmwidget.h @@ -42,9 +42,11 @@ public: void trafficInfoChanged(const QString &); Route * genRoute(); + void SetBackground(QString); void InitLabel(QLabel * label, bool isBold, bool isItalic, QString color); void InitComboBox(QComboBox *); void InitLineEdit(QLineEdit *); + void resizeEvent(QResizeEvent *event); private: int size; @@ -69,6 +71,7 @@ private: double *lngs; QComboBox ** trafficCBoxList; Ui::ConfirmWidget *ui; + QLabel * background; }; #endif // CONFIRMWIDGET_H diff --git a/src/ChangShaTour/customizewidget.cpp b/src/ChangShaTour/customizewidget.cpp index 526b04d..9c7d022 100644 --- a/src/ChangShaTour/customizewidget.cpp +++ b/src/ChangShaTour/customizewidget.cpp @@ -349,7 +349,7 @@ void CustomizeWidget::InitLabel(QLabel * label) lbl_font.setPointSize(12); lbl_font.setBold(true); label->setFont(lbl_font); - label->setStyleSheet("color:#FFFFFF"); + label->setStyleSheet("color:#000000"); label->setAlignment(Qt::AlignCenter); } diff --git a/src/ChangShaTour/feedbackwidget.cpp b/src/ChangShaTour/feedbackwidget.cpp index 4ea4f97..a3edd5b 100644 --- a/src/ChangShaTour/feedbackwidget.cpp +++ b/src/ChangShaTour/feedbackwidget.cpp @@ -1,204 +1,204 @@ -#include "feedbackwidget.h" -#include "ui_feedbackwidget.h" - -FeedBackWidget::FeedBackWidget(QWidget *parent) : - QWidget(parent), - ui(new Ui::FeedBackWidget) -{ - ui->setupUi(this); - - this->setWindowModality(Qt::ApplicationModal); - this->setFixedSize(QSize(400,500)); - this->setWindowTitle("反馈"); - - QHBoxLayout * scoreHintLayout = new QHBoxLayout(); - QLabel * scoreHintLabel = new QLabel("（必填部分）\n请给这条路线打个分吧~"); - InitLabel(scoreHintLabel, true, true, "#000000"); - scoreHintLayout->addWidget(scoreHintLabel); - - QHBoxLayout * scoreLayout = new QHBoxLayout(); - QLabel * scoreLable = new QLabel("分数"); - InitLabel(scoreLable, true, false, "#000000"); - scoreLineEdit = new QLineEdit(); - InitLineEdit(scoreLineEdit); - scoreLineEdit->setPlaceholderText("请输入一个1~5之间的整数"); - scoreLineEdit->setValidator(new QIntValidator(scoreLineEdit)); - scoreLayout->addWidget(scoreLable); - scoreLayout->addWidget(scoreLineEdit); - - QHBoxLayout * shareHintLayout = new QHBoxLayout(); - QLabel * shareHintLabel = new QLabel("（选填部分）\n填写下面的信息即可将你的行程分享给其他人哦~"); - InitLabel(shareHintLabel, true, true, "#000000"); - shareHintLayout->addWidget(shareHintLabel); - - QHBoxLayout * dayLayout = new QHBoxLayout(); - QLabel * dayLabel = new QLabel("旅游天数"); - InitLabel(dayLabel, true, false, "#000000"); - dayLineEdit = new QLineEdit(); - InitLineEdit(dayLineEdit); - dayLineEdit->setPlaceholderText("请输入一个1~10之间的整数"); - dayLineEdit->setValidator(new QIntValidator(dayLineEdit)); - dayLayout->addWidget(dayLabel); - dayLayout->addWidget(dayLineEdit); - - QHBoxLayout * numberLayout = new QHBoxLayout(); - QLabel * numberLabel = new QLabel("旅游人数"); - InitLabel(numberLabel, true, false, "#000000"); - numberLineEdit = new QLineEdit(); - InitLineEdit(numberLineEdit); - numberLineEdit->setPlaceholderText("请输入一个1~8之间的整数"); - numberLineEdit->setValidator(new QIntValidator(numberLineEdit)); - numberLayout->addWidget(numberLabel); - numberLayout->addWidget(numberLineEdit); - - QHBoxLayout * budgetLayout = new QHBoxLayout(); - QLabel * budgetLabel = new QLabel("旅游花费"); - InitLabel(budgetLabel, true, false, "#000000"); - budgetLineEdit = new QLineEdit(); - InitLineEdit(budgetLineEdit); - budgetLineEdit->setPlaceholderText("请输入一个1~50000之间的整数"); - budgetLineEdit->setValidator(new QIntValidator(budgetLineEdit)); - budgetLayout->addWidget(budgetLabel); - budgetLayout->addWidget(budgetLineEdit); - - QHBoxLayout * preferenceLayout = new QHBoxLayout(); - QLabel * preferenceLabel = new QLabel("路线重心"); - InitLabel(preferenceLabel, true, false, "#000000"); - preferenceLineEdit = new QLineEdit(); - InitLineEdit(preferenceLineEdit); - preferenceLineEdit->setPlaceholderText("请输入一个1~6之间的整数，数字的含义如下"); - preferenceLineEdit->setValidator(new QIntValidator(preferenceLineEdit)); - preferenceLayout->addWidget(preferenceLabel); - preferenceLayout->addWidget(preferenceLineEdit); - - QHBoxLayout * preferenceHintLayout = new QHBoxLayout(); - QLabel * preferenceHintLabel = new QLabel("1:偏重自然风光 2:偏重人文风俗 3:偏重特色美食\n4:偏重城市夜景 5:偏重休闲娱乐 6:偏重浪漫出游"); - InitLabel(preferenceHintLabel, true, true, "#000000"); - preferenceHintLayout->addWidget(preferenceHintLabel); - - QHBoxLayout * functionButtonLayout = new QHBoxLayout(); - confirmButton = new QPushButton("确认"); - InitButton(confirmButton); - cancelButton = new QPushButton("取消"); - InitButton(cancelButton); - functionButtonLayout->addWidget(confirmButton); - functionButtonLayout->addStretch(); - functionButtonLayout->addWidget(cancelButton); - - verticalLayout = new QVBoxLayout(); - verticalLayout->addLayout(scoreHintLayout); - verticalLayout->addLayout(scoreLayout); - verticalLayout->addLayout(shareHintLayout); - verticalLayout->addLayout(dayLayout); - verticalLayout->addLayout(numberLayout); - verticalLayout->addLayout(budgetLayout); - verticalLayout->addLayout(preferenceLayout); - verticalLayout->addLayout(preferenceHintLayout); - verticalLayout->addLayout(functionButtonLayout); - - this->setLayout(verticalLayout); -} - -FeedBackWidget::~FeedBackWidget() -{ - delete ui; -} - -int FeedBackWidget::getScore() -{ - return (scoreLineEdit->text()).toInt(); -} - -int FeedBackWidget::getDay() -{ - return (dayLineEdit->text()).toInt(); -} - -int FeedBackWidget::getNumber() -{ - return (numberLineEdit->text()).toInt(); -} - -int FeedBackWidget::getBudget() -{ - return (budgetLineEdit->text()).toInt(); -} - -int FeedBackWidget::getPreference() -{ - return (preferenceLineEdit->text()).toInt(); -} - -QPushButton * FeedBackWidget::getConfirmButton() -{ - return confirmButton; -} - -QPushButton * FeedBackWidget::getCancleButton() -{ - return cancelButton; -} - -void FeedBackWidget::InitLabel(QLabel * label, bool isBold, bool isItalic, QString color) -{ - QFont lbl_font("Microsoft YaHei"); - lbl_font.setPointSize(9); - lbl_font.setBold(isBold); - lbl_font.setItalic(isItalic); - label->setFont(lbl_font); - label->setStyleSheet("color:" + color); - //label->setAlignment(Qt::AlignRight); -} - -void FeedBackWidget::InitButton(QPushButton * button) -{ - button->setStyleSheet("QPushButton {" - "color:#ffffff;" - "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #8CA8CC, stop: 1 #8CA8CC);" - "border-style:outset;" - "border-radius:10px;" - "font:bold 16px;" - "font-family: Microsoft YaHei;" - //"min-width:100px;" - //"min-height:20px;" - //"padding:4px;" - "} " - "QPushButton:hover {" - "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #6E8AB2, stop: 1 #6E8AB2);" - "border-style:outset;" - "border-radius:10px;" - "font:bold 16px;" - "font-family: Microsoft YaHei;" - //"min-width:100px;" - //"min-height:20px;" - //"padding:4px;" - "} " - "QPushButton:pressed {" - "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #6783AB, stop: 1 #6783AB);" - "border-style:outset;" - "border-radius:10px;" - "font:bold 16px;" - "font-family: Microsoft YaHei;" - //"min-width:100px;" - //"min-height:20px;" - //"padding:4px;" - "}"); -} - -void FeedBackWidget::InitLineEdit(QLineEdit * lineEdit) -{ - lineEdit->setStyleSheet("QLineEdit {" - " border-radius: 4px; " - " color:rgb(0, 0, 0); " - " background-color: rgb(255, 255, 255);" - "} " - " QLineEdit:focus { " - " border-style:outset; " - //" border-width:4px; " - " border-radius: 4px; " - //" border-color: #C1D7F1; " - " color:#ffffff; " - " background-color: #C1D7F1;" - "} "); - lineEdit->setFont(QFont("Microsoft YaHei" , 9, QFont::Bold)); -} +#include "feedbackwidget.h" +#include "ui_feedbackwidget.h" + +FeedBackWidget::FeedBackWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::FeedBackWidget) +{ + ui->setupUi(this); + + this->setWindowModality(Qt::ApplicationModal); + this->setFixedSize(QSize(400,500)); + this->setWindowTitle("反馈"); + + QHBoxLayout * scoreHintLayout = new QHBoxLayout(); + QLabel * scoreHintLabel = new QLabel("（必填部分）\n请给这条路线打个分吧~"); + InitLabel(scoreHintLabel, true, true, "#000000"); + scoreHintLayout->addWidget(scoreHintLabel); + + QHBoxLayout * scoreLayout = new QHBoxLayout(); + QLabel * scoreLable = new QLabel("分数"); + InitLabel(scoreLable, true, false, "#000000"); + scoreLineEdit = new QLineEdit(); + InitLineEdit(scoreLineEdit); + scoreLineEdit->setPlaceholderText("请输入一个1~5之间的整数"); + scoreLineEdit->setValidator(new QIntValidator(scoreLineEdit)); + scoreLayout->addWidget(scoreLable); + scoreLayout->addWidget(scoreLineEdit); + + QHBoxLayout * shareHintLayout = new QHBoxLayout(); + QLabel * shareHintLabel = new QLabel("（选填部分）\n填写下面的信息即可将你的行程分享给其他人哦~"); + InitLabel(shareHintLabel, true, true, "#000000"); + shareHintLayout->addWidget(shareHintLabel); + + QHBoxLayout * dayLayout = new QHBoxLayout(); + QLabel * dayLabel = new QLabel("旅游天数"); + InitLabel(dayLabel, true, false, "#000000"); + dayLineEdit = new QLineEdit(); + InitLineEdit(dayLineEdit); + dayLineEdit->setPlaceholderText("请输入一个1~10之间的整数"); + dayLineEdit->setValidator(new QIntValidator(dayLineEdit)); + dayLayout->addWidget(dayLabel); + dayLayout->addWidget(dayLineEdit); + + QHBoxLayout * numberLayout = new QHBoxLayout(); + QLabel * numberLabel = new QLabel("旅游人数"); + InitLabel(numberLabel, true, false, "#000000"); + numberLineEdit = new QLineEdit(); + InitLineEdit(numberLineEdit); + numberLineEdit->setPlaceholderText("请输入一个1~8之间的整数"); + numberLineEdit->setValidator(new QIntValidator(numberLineEdit)); + numberLayout->addWidget(numberLabel); + numberLayout->addWidget(numberLineEdit); + + QHBoxLayout * budgetLayout = new QHBoxLayout(); + QLabel * budgetLabel = new QLabel("旅游花费"); + InitLabel(budgetLabel, true, false, "#000000"); + budgetLineEdit = new QLineEdit(); + InitLineEdit(budgetLineEdit); + budgetLineEdit->setPlaceholderText("请输入一个1~50000之间的整数"); + budgetLineEdit->setValidator(new QIntValidator(budgetLineEdit)); + budgetLayout->addWidget(budgetLabel); + budgetLayout->addWidget(budgetLineEdit); + + QHBoxLayout * preferenceLayout = new QHBoxLayout(); + QLabel * preferenceLabel = new QLabel("路线重心"); + InitLabel(preferenceLabel, true, false, "#000000"); + preferenceLineEdit = new QLineEdit(); + InitLineEdit(preferenceLineEdit); + preferenceLineEdit->setPlaceholderText("请输入一个1~6之间的整数，数字的含义如下"); + preferenceLineEdit->setValidator(new QIntValidator(preferenceLineEdit)); + preferenceLayout->addWidget(preferenceLabel); + preferenceLayout->addWidget(preferenceLineEdit); + + QHBoxLayout * preferenceHintLayout = new QHBoxLayout(); + QLabel * preferenceHintLabel = new QLabel("1:偏重自然风光 2:偏重人文风俗 3:偏重特色美食\n4:偏重城市夜景 5:偏重休闲娱乐 6:偏重浪漫出游"); + InitLabel(preferenceHintLabel, true, true, "#000000"); + preferenceHintLayout->addWidget(preferenceHintLabel); + + QHBoxLayout * functionButtonLayout = new QHBoxLayout(); + confirmButton = new QPushButton("确认"); + InitButton(confirmButton); + cancelButton = new QPushButton("取消"); + InitButton(cancelButton); + functionButtonLayout->addWidget(confirmButton); + functionButtonLayout->addStretch(); + functionButtonLayout->addWidget(cancelButton); + + verticalLayout = new QVBoxLayout(); + verticalLayout->addLayout(scoreHintLayout); + verticalLayout->addLayout(scoreLayout); + verticalLayout->addLayout(shareHintLayout); + verticalLayout->addLayout(dayLayout); + verticalLayout->addLayout(numberLayout); + verticalLayout->addLayout(budgetLayout); + verticalLayout->addLayout(preferenceLayout); + verticalLayout->addLayout(preferenceHintLayout); + verticalLayout->addLayout(functionButtonLayout); + + this->setLayout(verticalLayout); +} + +FeedBackWidget::~FeedBackWidget() +{ + delete ui; +} + +int FeedBackWidget::getScore() +{ + return (scoreLineEdit->text()).toInt(); +} + +int FeedBackWidget::getDay() +{ + return (dayLineEdit->text()).toInt(); +} + +int FeedBackWidget::getNumber() +{ + return (numberLineEdit->text()).toInt(); +} + +int FeedBackWidget::getBudget() +{ + return (budgetLineEdit->text()).toInt(); +} + +int FeedBackWidget::getPreference() +{ + return (preferenceLineEdit->text()).toInt(); +} + +QPushButton * FeedBackWidget::getConfirmButton() +{ + return confirmButton; +} + +QPushButton * FeedBackWidget::getCancleButton() +{ + return cancelButton; +} + +void FeedBackWidget::InitLabel(QLabel * label, bool isBold, bool isItalic, QString color) +{ + QFont lbl_font("Microsoft YaHei"); + lbl_font.setPointSize(9); + lbl_font.setBold(isBold); + lbl_font.setItalic(isItalic); + label->setFont(lbl_font); + label->setStyleSheet("color:" + color); + //label->setAlignment(Qt::AlignRight); +} + +void FeedBackWidget::InitButton(QPushButton * button) +{ + button->setStyleSheet("QPushButton {" + "color:#ffffff;" + "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #8CA8CC, stop: 1 #8CA8CC);" + "border-style:outset;" + "border-radius:10px;" + "font:bold 16px;" + "font-family: Microsoft YaHei;" + //"min-width:100px;" + //"min-height:20px;" + //"padding:4px;" + "} " + "QPushButton:hover {" + "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #6E8AB2, stop: 1 #6E8AB2);" + "border-style:outset;" + "border-radius:10px;" + "font:bold 16px;" + "font-family: Microsoft YaHei;" + //"min-width:100px;" + //"min-height:20px;" + //"padding:4px;" + "} " + "QPushButton:pressed {" + "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #6783AB, stop: 1 #6783AB);" + "border-style:outset;" + "border-radius:10px;" + "font:bold 16px;" + "font-family: Microsoft YaHei;" + //"min-width:100px;" + //"min-height:20px;" + //"padding:4px;" + "}"); +} + +void FeedBackWidget::InitLineEdit(QLineEdit * lineEdit) +{ + lineEdit->setStyleSheet("QLineEdit {" + " border-radius: 4px; " + " color:rgb(0, 0, 0); " + " background-color: rgb(255, 255, 255);" + "} " + " QLineEdit:focus { " + " border-style:outset; " + //" border-width:4px; " + " border-radius: 4px; " + //" border-color: #C1D7F1; " + " color:#ffffff; " + " background-color: #C1D7F1;" + "} "); + lineEdit->setFont(QFont("Microsoft YaHei" , 9, QFont::Bold)); +} diff --git a/src/ChangShaTour/feedbackwidget.h b/src/ChangShaTour/feedbackwidget.h index 95809ac..006bb27 100644 --- a/src/ChangShaTour/feedbackwidget.h +++ b/src/ChangShaTour/feedbackwidget.h @@ -1,52 +1,52 @@ -#ifndef FEEDBACKWIDGET_H -#define FEEDBACKWIDGET_H - -#include -#include -#include -#include -#include -#include - -#if _MSC_VER >= 1600 -#pragma execution_character_set("utf-8") -#endif - -namespace Ui { -class FeedBackWidget; -} - -class FeedBackWidget : public QWidget -{ - Q_OBJECT - -public: - explicit FeedBackWidget(QWidget *parent = nullptr); - ~FeedBackWidget(); - - int getScore(); - int getDay(); - int getNumber(); - int getBudget(); - int getPreference(); - QPushButton * getConfirmButton(); - QPushButton * getCancleButton(); - - void InitLabel(QLabel * label, bool isBold, bool isItalic, QString color); - void InitButton(QPushButton *); - void InitLineEdit(QLineEdit *); - -private: - Ui::FeedBackWidget *ui; - - QVBoxLayout * verticalLayout; - QLineEdit * scoreLineEdit; - QLineEdit * dayLineEdit; - QLineEdit * numberLineEdit; - QLineEdit * budgetLineEdit; - QLineEdit * preferenceLineEdit; - QPushButton * confirmButton; - QPushButton * cancelButton; -}; - -#endif // FEEDBACKWIDGET_H +#ifndef FEEDBACKWIDGET_H +#define FEEDBACKWIDGET_H + +#include +#include +#include +#include +#include +#include + +#if _MSC_VER >= 1600 +#pragma execution_character_set("utf-8") +#endif + +namespace Ui { +class FeedBackWidget; +} + +class FeedBackWidget : public QWidget +{ + Q_OBJECT + +public: + explicit FeedBackWidget(QWidget *parent = nullptr); + ~FeedBackWidget(); + + int getScore(); + int getDay(); + int getNumber(); + int getBudget(); + int getPreference(); + QPushButton * getConfirmButton(); + QPushButton * getCancleButton(); + + void InitLabel(QLabel * label, bool isBold, bool isItalic, QString color); + void InitButton(QPushButton *); + void InitLineEdit(QLineEdit *); + +private: + Ui::FeedBackWidget *ui; + + QVBoxLayout * verticalLayout; + QLineEdit * scoreLineEdit; + QLineEdit * dayLineEdit; + QLineEdit * numberLineEdit; + QLineEdit * budgetLineEdit; + QLineEdit * preferenceLineEdit; + QPushButton * confirmButton; + QPushButton * cancelButton; +}; + +#endif // FEEDBACKWIDGET_H diff --git a/src/ChangShaTour/feedbackwidget.ui b/src/ChangShaTour/feedbackwidget.ui index b0da9da..90d76c9 100644 --- a/src/ChangShaTour/feedbackwidget.ui +++ b/src/ChangShaTour/feedbackwidget.ui @@ -1,21 +1,21 @@ - - - - - FeedBackWidget - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - + + + + + FeedBackWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + diff --git a/src/ChangShaTour/listwidget.cpp b/src/ChangShaTour/listwidget.cpp index 06278f3..a985a81 100644 --- a/src/ChangShaTour/listwidget.cpp +++ b/src/ChangShaTour/listwidget.cpp @@ -184,7 +184,7 @@ void ListWidget::setMinorityList() QString imgPath = "./images/minoritylist" + QString::number(id) + ".png"; imgDownload->downloadFileFromUrl(img, imgPath); btn = setBtn(btn, imgPath, name, val); - InitButton(btn, "#E7A70B", "#FBE4AD"); + InitButton(btn, "#FBE4AD", "#FBE4AD"); connect(btn, &QToolButton::clicked, this, [=](){web->loadPage(name, img, url, cate); subWidget->setVisible(false); web->setVisible(true);}); line->addWidget(rank, 1); diff --git a/src/ChangShaTour/planwidget.cpp b/src/ChangShaTour/planwidget.cpp index 79ac15d..7461514 100644 --- a/src/ChangShaTour/planwidget.cpp +++ b/src/ChangShaTour/planwidget.cpp @@ -651,6 +651,7 @@ void PlanWidget::addRoute() query.next(); int routeId = query.value(0).toInt(); routeId = routeId+1; + qDebug() << "routeId" << routeId; //int size = routeFav->getPlaceSize(); while(routeItemsFav->next != NULL) { diff --git a/src/ChangShaTour/showrouteinfowidget.cpp b/src/ChangShaTour/showrouteinfowidget.cpp index 238413d..86f1920 100644 --- a/src/ChangShaTour/showrouteinfowidget.cpp +++ b/src/ChangShaTour/showrouteinfowidget.cpp @@ -6,9 +6,11 @@ ShowRouteInfoWidget::ShowRouteInfoWidget(QWidget *parent) : ui(new Ui::ShowRouteInfoWidget) { ui->setupUi(this); - verLayout = new QVBoxLayout(); + background = new QLabel(this); + SetBackground("./softImages/blackHalf.png"); + verLayout = new QVBoxLayout(); setLayout(verLayout); routeToShow = new Route(); @@ -56,7 +58,7 @@ void ShowRouteInfoWidget::initInfoWidget() routeItems=routeItems->next; placeLabelList[i] = new QLabel(routeItems->placeName); - InitLabel(placeLabelList[i], true, false, "#E1B37C"); + InitLabel(placeLabelList[i], true, false, "#8CA8CC"); startTimeLabelList[i] = new QLabel(routeItems->startTime.toString()); InitLabel(startTimeLabelList[i], true, true, "#FFFFFF"); endTimeLabelList[i] = new QLabel(routeItems->endTime.toString()); @@ -114,3 +116,14 @@ void ShowRouteInfoWidget::InitLabel(QLabel * label, bool isBold, bool isItalic, label->setStyleSheet("color:" + color); //label->setAlignment(Qt::AlignRight); } + +void ShowRouteInfoWidget::resizeEvent(QResizeEvent *event) +{ + background->resize(QSize(this->width(), this->height())); +} + +void ShowRouteInfoWidget::SetBackground(QString url) +{ + background->setPixmap(url); + background->setScaledContents(true); +} diff --git a/src/ChangShaTour/showrouteinfowidget.h b/src/ChangShaTour/showrouteinfowidget.h index 879d0cf..ad6f00d 100644 --- a/src/ChangShaTour/showrouteinfowidget.h +++ b/src/ChangShaTour/showrouteinfowidget.h @@ -33,9 +33,12 @@ public: void setRouteToShow(Route * route); Route * getRouteToShow(); void InitLabel(QLabel * label, bool isBold, bool isItalic, QString color); + void SetBackground(QString); + void resizeEvent(QResizeEvent *event); private: Ui::ShowRouteInfoWidget *ui; + QLabel * background; Route * routeToShow; int size; QLabel * routeNameLabel; diff --git a/src/Wait.rar b/src/Wait.zip old mode 100755 new mode 100644 similarity index 59% rename from src/Wait.rar rename to src/Wait.zip index 7cbb528..ba8daae Binary files a/src/Wait.rar and b/src/Wait.zip differ diff --git a/src/softImages.zip b/src/softImages.zip new file mode 100644 index 0000000..3bfee85 Binary files /dev/null and b/src/softImages.zip differ diff --git a/src/softImages/LoginImage.jpg b/src/softImages/LoginImage.jpg deleted file mode 100644 index 9b05d29..0000000 Binary files a/src/softImages/LoginImage.jpg and /dev/null differ diff --git a/src/softImages/MainImage.jpg b/src/softImages/MainImage.jpg deleted file mode 100644 index 222bf9c..0000000 Binary files a/src/softImages/MainImage.jpg and /dev/null differ diff --git a/src/softImages/Mao.jpg b/src/softImages/Mao.jpg deleted file mode 100644 index 0ad4a9f..0000000 Binary files a/src/softImages/Mao.jpg and /dev/null differ diff --git a/src/softImages/MaoClear.jpg b/src/softImages/MaoClear.jpg deleted file mode 100644 index e1054b2..0000000 Binary files a/src/softImages/MaoClear.jpg and /dev/null differ diff --git a/src/softImages/MaoHead.jpg b/src/softImages/MaoHead.jpg deleted file mode 100644 index eb8acab..0000000 Binary files a/src/softImages/MaoHead.jpg and /dev/null differ diff --git a/src/softImages/RegisterImage.jpg b/src/softImages/RegisterImage.jpg deleted file mode 100644 index 06cdf53..0000000 Binary files a/src/softImages/RegisterImage.jpg and /dev/null differ diff --git a/src/softImages/School.jpg b/src/softImages/School.jpg deleted file mode 100644 index 3a256d5..0000000 Binary files a/src/softImages/School.jpg and /dev/null differ diff --git a/src/softImages/SexyTea.jpg b/src/softImages/SexyTea.jpg deleted file mode 100644 index a04af8c..0000000 Binary files a/src/softImages/SexyTea.jpg and /dev/null differ diff --git a/src/softImages/SexyTeaClear.jpg b/src/softImages/SexyTeaClear.jpg deleted file mode 100644 index 609bcff..0000000 Binary files a/src/softImages/SexyTeaClear.jpg and /dev/null differ diff --git a/src/softImages/WorldWindow.jpg b/src/softImages/WorldWindow.jpg deleted file mode 100644 index ce973a9..0000000 Binary files a/src/softImages/WorldWindow.jpg and /dev/null differ diff --git a/src/softImages/WorldWindowClear.jpg b/src/softImages/WorldWindowClear.jpg deleted file mode 100644 index bed6bd3..0000000 Binary files a/src/softImages/WorldWindowClear.jpg and /dev/null differ diff --git a/src/softImages/WuyiSquare.jpg b/src/softImages/WuyiSquare.jpg deleted file mode 100644 index 6f742a1..0000000 Binary files a/src/softImages/WuyiSquare.jpg and /dev/null differ diff --git a/src/softImages/WuyiSquareClear.jpg b/src/softImages/WuyiSquareClear.jpg deleted file mode 100644 index 453d220..0000000 Binary files a/src/softImages/WuyiSquareClear.jpg and /dev/null differ diff --git a/src/softImages/autumn-hotlist.jpg b/src/softImages/autumn-hotlist.jpg deleted file mode 100644 index 0fbec82..0000000 Binary files a/src/softImages/autumn-hotlist.jpg and /dev/null differ diff --git a/src/softImages/blackHalf.png b/src/softImages/blackHalf.png deleted file mode 100644 index 1e3b11f..0000000 Binary files a/src/softImages/blackHalf.png and /dev/null differ diff --git a/src/softImages/favoriteWidget/whiteHalf.png b/src/softImages/favoriteWidget/whiteHalf.png deleted file mode 100644 index 5a44046..0000000 Binary files a/src/softImages/favoriteWidget/whiteHalf.png and /dev/null differ diff --git a/src/softImages/historyWidget/brownHalf.png b/src/softImages/historyWidget/brownHalf.png deleted file mode 100644 index 17bbf32..0000000 Binary files a/src/softImages/historyWidget/brownHalf.png and /dev/null differ diff --git a/src/softImages/homeWidget/homeWidgetBrownHalf.png b/src/softImages/homeWidget/homeWidgetBrownHalf.png deleted file mode 100644 index 9c7e25d..0000000 Binary files a/src/softImages/homeWidget/homeWidgetBrownHalf.png and /dev/null differ diff --git a/src/softImages/homeWidget/listBtn.jpg b/src/softImages/homeWidget/listBtn.jpg deleted file mode 100644 index 2f75b6f..0000000 Binary files a/src/softImages/homeWidget/listBtn.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/listBtnBlur.jpg b/src/softImages/homeWidget/listBtnBlur.jpg deleted file mode 100644 index 5aec3e9..0000000 Binary files a/src/softImages/homeWidget/listBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/planBtn.jpg b/src/softImages/homeWidget/planBtn.jpg deleted file mode 100644 index 708ccbe..0000000 Binary files a/src/softImages/homeWidget/planBtn.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/planBtnBlur.jpg b/src/softImages/homeWidget/planBtnBlur.jpg deleted file mode 100644 index a5663ce..0000000 Binary files a/src/softImages/homeWidget/planBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/recommendBtn.jpg b/src/softImages/homeWidget/recommendBtn.jpg deleted file mode 100644 index 8bb9083..0000000 Binary files a/src/softImages/homeWidget/recommendBtn.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/recommendBtnBlur.jpg b/src/softImages/homeWidget/recommendBtnBlur.jpg deleted file mode 100644 index 07fdbf1..0000000 Binary files a/src/softImages/homeWidget/recommendBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/sortBtn.jpg b/src/softImages/homeWidget/sortBtn.jpg deleted file mode 100644 index d84e8b5..0000000 Binary files a/src/softImages/homeWidget/sortBtn.jpg and /dev/null differ diff --git a/src/softImages/homeWidget/sortBtnBlur.jpg b/src/softImages/homeWidget/sortBtnBlur.jpg deleted file mode 100644 index a62b4ee..0000000 Binary files a/src/softImages/homeWidget/sortBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/listWidget/blackHalf.png b/src/softImages/listWidget/blackHalf.png deleted file mode 100644 index cfb3a8a..0000000 Binary files a/src/softImages/listWidget/blackHalf.png and /dev/null differ diff --git a/src/softImages/listWidget/blueHalf.png b/src/softImages/listWidget/blueHalf.png deleted file mode 100644 index bc5e904..0000000 Binary files a/src/softImages/listWidget/blueHalf.png and /dev/null differ diff --git a/src/softImages/listWidget/favorable-list.jpg b/src/softImages/listWidget/favorable-list.jpg deleted file mode 100644 index a7a6a88..0000000 Binary files a/src/softImages/listWidget/favorable-list.jpg and /dev/null differ diff --git a/src/softImages/listWidget/hot-list.jpg b/src/softImages/listWidget/hot-list.jpg deleted file mode 100644 index c218b09..0000000 Binary files a/src/softImages/listWidget/hot-list.jpg and /dev/null differ diff --git a/src/softImages/listWidget/minority-list.jpg b/src/softImages/listWidget/minority-list.jpg deleted file mode 100644 index 9e51e61..0000000 Binary files a/src/softImages/listWidget/minority-list.jpg and /dev/null differ diff --git a/src/softImages/planWidget/blueHalf.png b/src/softImages/planWidget/blueHalf.png deleted file mode 100644 index d48a787..0000000 Binary files a/src/softImages/planWidget/blueHalf.png and /dev/null differ diff --git a/src/softImages/planWidget/customizeRoute.jpg b/src/softImages/planWidget/customizeRoute.jpg deleted file mode 100644 index fe25f12..0000000 Binary files a/src/softImages/planWidget/customizeRoute.jpg and /dev/null differ diff --git a/src/softImages/planWidget/customizeRouteBlur.jpg b/src/softImages/planWidget/customizeRouteBlur.jpg deleted file mode 100644 index 757c5e0..0000000 Binary files a/src/softImages/planWidget/customizeRouteBlur.jpg and /dev/null differ diff --git a/src/softImages/planWidget/recommendRoute.jpg b/src/softImages/planWidget/recommendRoute.jpg deleted file mode 100644 index b6ab614..0000000 Binary files a/src/softImages/planWidget/recommendRoute.jpg and /dev/null differ diff --git a/src/softImages/planWidget/recommendRouteBlur.jpg b/src/softImages/planWidget/recommendRouteBlur.jpg deleted file mode 100644 index 765ed2f..0000000 Binary files a/src/softImages/planWidget/recommendRouteBlur.jpg and /dev/null differ diff --git a/src/softImages/recommendWidget/brownHalf.png b/src/softImages/recommendWidget/brownHalf.png deleted file mode 100644 index 03849e2..0000000 Binary files a/src/softImages/recommendWidget/brownHalf.png and /dev/null differ diff --git a/src/softImages/sortWidget/blueHalf.png b/src/softImages/sortWidget/blueHalf.png deleted file mode 100644 index d48a787..0000000 Binary files a/src/softImages/sortWidget/blueHalf.png and /dev/null differ diff --git a/src/softImages/summer-good.jpg b/src/softImages/summer-good.jpg deleted file mode 100644 index fd29d82..0000000 Binary files a/src/softImages/summer-good.jpg and /dev/null differ diff --git a/src/softImages/userInfoWidget/blueHalf.png b/src/softImages/userInfoWidget/blueHalf.png deleted file mode 100644 index b2351bd..0000000 Binary files a/src/softImages/userInfoWidget/blueHalf.png and /dev/null differ diff --git a/src/softImages/userWidget/favoriteBtn.jpg b/src/softImages/userWidget/favoriteBtn.jpg deleted file mode 100644 index 1e72a57..0000000 Binary files a/src/softImages/userWidget/favoriteBtn.jpg and /dev/null differ diff --git a/src/softImages/userWidget/favoriteBtnBlur.jpg b/src/softImages/userWidget/favoriteBtnBlur.jpg deleted file mode 100644 index e341cd4..0000000 Binary files a/src/softImages/userWidget/favoriteBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/userWidget/historyBtn.jpg b/src/softImages/userWidget/historyBtn.jpg deleted file mode 100644 index c71e242..0000000 Binary files a/src/softImages/userWidget/historyBtn.jpg and /dev/null differ diff --git a/src/softImages/userWidget/historyBtnBlur.jpg b/src/softImages/userWidget/historyBtnBlur.jpg deleted file mode 100644 index 06e7f49..0000000 Binary files a/src/softImages/userWidget/historyBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/userWidget/journeyBtn.jpg b/src/softImages/userWidget/journeyBtn.jpg deleted file mode 100644 index f8aacec..0000000 Binary files a/src/softImages/userWidget/journeyBtn.jpg and /dev/null differ diff --git a/src/softImages/userWidget/journeyBtnBlur.jpg b/src/softImages/userWidget/journeyBtnBlur.jpg deleted file mode 100644 index 000a2c2..0000000 Binary files a/src/softImages/userWidget/journeyBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/userWidget/userInfoBtn.jpg b/src/softImages/userWidget/userInfoBtn.jpg deleted file mode 100644 index cb4fc10..0000000 Binary files a/src/softImages/userWidget/userInfoBtn.jpg and /dev/null differ diff --git a/src/softImages/userWidget/userInfoBtnBlur.jpg b/src/softImages/userWidget/userInfoBtnBlur.jpg deleted file mode 100644 index fab262c..0000000 Binary files a/src/softImages/userWidget/userInfoBtnBlur.jpg and /dev/null differ diff --git a/src/softImages/userWidget/userWidgetBrownHalf.png b/src/softImages/userWidget/userWidgetBrownHalf.png deleted file mode 100644 index 9c7e25d..0000000 Binary files a/src/softImages/userWidget/userWidgetBrownHalf.png and /dev/null differ diff --git a/src/softImages/waitGirl.gif b/src/softImages/waitGirl.gif deleted file mode 100644 index 828d757..0000000 Binary files a/src/softImages/waitGirl.gif and /dev/null differ diff --git a/src/softImages/webWidget/glueHalf.png b/src/softImages/webWidget/glueHalf.png deleted file mode 100644 index cf7aedd..0000000 Binary files a/src/softImages/webWidget/glueHalf.png and /dev/null differ diff --git a/src/softImages/winter-less.jpg b/src/softImages/winter-less.jpg deleted file mode 100644 index 854cd92..0000000 Binary files a/src/softImages/winter-less.jpg and /dev/null differ