diff --git a/PhaseMeasure.pro.user b/PhaseMeasure.pro.user deleted file mode 100644 index ad530f9..0000000 --- a/PhaseMeasure.pro.user +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseMeasure.pro.user b/PhaseMeasure.pro.user deleted file mode 100644 index ad530f9..0000000 --- a/PhaseMeasure.pro.user +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseMeasure.pro.user.b371502 b/PhaseMeasure.pro.user.b371502 deleted file mode 100644 index 89c42e4..0000000 --- a/PhaseMeasure.pro.user.b371502 +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseMeasure.pro.user b/PhaseMeasure.pro.user deleted file mode 100644 index ad530f9..0000000 --- a/PhaseMeasure.pro.user +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseMeasure.pro.user.b371502 b/PhaseMeasure.pro.user.b371502 deleted file mode 100644 index 89c42e4..0000000 --- a/PhaseMeasure.pro.user.b371502 +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseWindow.cpp b/PhaseWindow.cpp index 05273d7..27b481e 100644 --- a/PhaseWindow.cpp +++ b/PhaseWindow.cpp @@ -40,8 +40,8 @@ ui->endButt->move(screenRect.width() - 260, 10); ui->startButt->move(screenRect.width() - 320, 10); ui->line->setGeometry(0, 89, screenRect.width(), 1); - ui->pointsList->setGeometry(250,30,screenRect.width()-600,40); - ui->labelsList->setGeometry(250,60,screenRect.width()-600,30); + ui->pointsList->setGeometry(250,20,screenRect.width()-600,40); + ui->labelsList->setGeometry(250,50,screenRect.width()-600,30); // 设置主体区域的大小和位置 ui->scrollArea->setGeometry(0, 90, screenRect.width(), screenRect.height() - 90); @@ -97,7 +97,7 @@ label->setPixmap(QPixmap(":/points/images/white.png")); QGroupBox * group = new QGroupBox(ui->scrollContents); - group->setTitle(QString("通道 - %1").arg(i + 1)); + group->setTitle(QString::fromLocal8Bit("通道 - %1").arg(i + 1)); group->setFont(QFont("微软雅黑", 12)); group->setGeometry(20, i * 160 + 10, screenRect.width() - 40, 160); this->channelGroupList.append(group); diff --git a/PhaseMeasure.pro.user b/PhaseMeasure.pro.user deleted file mode 100644 index ad530f9..0000000 --- a/PhaseMeasure.pro.user +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseMeasure.pro.user.b371502 b/PhaseMeasure.pro.user.b371502 deleted file mode 100644 index 89c42e4..0000000 --- a/PhaseMeasure.pro.user.b371502 +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {b3715025-e290-4df4-afaa-42a38b3e40c1} - - - 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 - 0 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.8 MinGW 64-bit - Desktop Qt 5.12.8 MinGW 64-bit - qt.qt5.5128.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_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 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - D:/Workspace Qt/PhaseMeasure/PhaseMeasure.pro - - false - - false - true - true - false - false - true - - D:/Workspace Qt/build-PhaseMeasure-Desktop_Qt_5_12_8_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/PhaseWindow.cpp b/PhaseWindow.cpp index 05273d7..27b481e 100644 --- a/PhaseWindow.cpp +++ b/PhaseWindow.cpp @@ -40,8 +40,8 @@ ui->endButt->move(screenRect.width() - 260, 10); ui->startButt->move(screenRect.width() - 320, 10); ui->line->setGeometry(0, 89, screenRect.width(), 1); - ui->pointsList->setGeometry(250,30,screenRect.width()-600,40); - ui->labelsList->setGeometry(250,60,screenRect.width()-600,30); + ui->pointsList->setGeometry(250,20,screenRect.width()-600,40); + ui->labelsList->setGeometry(250,50,screenRect.width()-600,30); // 设置主体区域的大小和位置 ui->scrollArea->setGeometry(0, 90, screenRect.width(), screenRect.height() - 90); @@ -97,7 +97,7 @@ label->setPixmap(QPixmap(":/points/images/white.png")); QGroupBox * group = new QGroupBox(ui->scrollContents); - group->setTitle(QString("通道 - %1").arg(i + 1)); + group->setTitle(QString::fromLocal8Bit("通道 - %1").arg(i + 1)); group->setFont(QFont("微软雅黑", 12)); group->setGeometry(20, i * 160 + 10, screenRect.width() - 40, 160); this->channelGroupList.append(group); diff --git a/PhaseWindow.ui b/PhaseWindow.ui index 749b3ae..d25b82b 100644 --- a/PhaseWindow.ui +++ b/PhaseWindow.ui @@ -400,8 +400,20 @@ + + 0 + + + 0 + + + + 0 + 30 + + 微软雅黑 @@ -421,6 +433,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -440,6 +458,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -459,6 +483,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -478,6 +508,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -497,6 +533,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -516,6 +558,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -535,6 +583,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -554,6 +608,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -573,6 +633,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -592,6 +658,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -611,6 +683,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -630,6 +708,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -649,6 +733,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -668,6 +758,12 @@ + + + 0 + 30 + + 微软雅黑 @@ -687,6 +783,12 @@ + + + 0 + 30 + + 微软雅黑