diff --git a/Multichannel Analyzer.sln b/MCA.sln similarity index 53% rename from Multichannel Analyzer.sln rename to MCA.sln index a51a5b7..f55d63a 100644 --- a/Multichannel Analyzer.sln +++ b/MCA.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Multichannel Analyzer", "Multichannel Analyzer\Multichannel Analyzer.vcxproj", "{5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Multichannel Analyzer", "MCA\MCA.vcxproj", "{F76A58F6-156A-4C3C-955D-ABDB16E1C498}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,19 +13,19 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Debug|x64.ActiveCfg = Debug|x64 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Debug|x64.Build.0 = Debug|x64 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Debug|x86.ActiveCfg = Debug|Win32 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Debug|x86.Build.0 = Debug|Win32 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Release|x64.ActiveCfg = Release|x64 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Release|x64.Build.0 = Release|x64 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Release|x86.ActiveCfg = Release|Win32 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33}.Release|x86.Build.0 = Release|Win32 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Debug|x64.ActiveCfg = Debug|x64 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Debug|x64.Build.0 = Debug|x64 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Debug|x86.ActiveCfg = Debug|Win32 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Debug|x86.Build.0 = Debug|Win32 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Release|x64.ActiveCfg = Release|x64 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Release|x64.Build.0 = Release|x64 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Release|x86.ActiveCfg = Release|Win32 + {F76A58F6-156A-4C3C-955D-ABDB16E1C498}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4A5742E4-18AA-4E43-AB5F-E9D3F78BC307} + SolutionGuid = {61149A51-3E2D-4892-AD1C-676087352EE4} EndGlobalSection EndGlobal diff --git a/Multichannel Analyzer/Multichannel Analyzer.cpp b/MCA/MCA.cpp similarity index 84% rename from Multichannel Analyzer/Multichannel Analyzer.cpp rename to MCA/MCA.cpp index 3c7e16a..cbe513f 100644 --- a/Multichannel Analyzer/Multichannel Analyzer.cpp +++ b/MCA/MCA.cpp @@ -6,10 +6,10 @@ #include "framework.h" #include "afxwinappex.h" #include "afxdialogex.h" -#include "Multichannel Analyzer.h" +#include "MCA.h" #include "MainFrm.h" -#include "Multichannel AnalyzerDoc.h" +#include "MCADoc.h" #include "MCAView.h" #ifdef _DEBUG @@ -17,10 +17,10 @@ #endif -// CMultichannelAnalyzerApp +// CMCAApp -BEGIN_MESSAGE_MAP(CMultichannelAnalyzerApp, CWinApp) - ON_COMMAND(ID_APP_ABOUT, &CMultichannelAnalyzerApp::OnAppAbout) +BEGIN_MESSAGE_MAP(CMCAApp, CWinApp) + ON_COMMAND(ID_APP_ABOUT, &CMCAApp::OnAppAbout) // 基于文件的标准文档命令 ON_COMMAND(ID_FILE_NEW, &CWinApp::OnFileNew) ON_COMMAND(ID_FILE_OPEN, &CWinApp::OnFileOpen) @@ -29,9 +29,9 @@ BEGIN_MESSAGE_MAP(CMultichannelAnalyzerApp, CWinApp) END_MESSAGE_MAP() -// CMultichannelAnalyzerApp 构造 +// CMCAApp 构造 -CMultichannelAnalyzerApp::CMultichannelAnalyzerApp() noexcept +CMCAApp::CMCAApp() noexcept { // 支持重新启动管理器 @@ -51,14 +51,14 @@ CMultichannelAnalyzerApp::CMultichannelAnalyzerApp() noexcept // 将所有重要的初始化放置在 InitInstance 中 } -// 唯一的 CMultichannelAnalyzerApp 对象 +// 唯一的 CMCAApp 对象 -CMultichannelAnalyzerApp theApp; +CMCAApp theApp; -// CMultichannelAnalyzerApp 初始化 +// CMCAApp 初始化 -BOOL CMultichannelAnalyzerApp::InitInstance() +BOOL CMCAApp::InitInstance() { // 如果一个运行在 Windows XP 上的应用程序清单指定要 // 使用 ComCtl32.dll 版本 6 或更高版本来启用可视化方式, @@ -103,9 +103,9 @@ BOOL CMultichannelAnalyzerApp::InitInstance() CSingleDocTemplate* pDocTemplate; pDocTemplate = new CSingleDocTemplate( IDR_MAINFRAME, - RUNTIME_CLASS(CMultichannelAnalyzerDoc), + RUNTIME_CLASS(CMCADoc), RUNTIME_CLASS(CMainFrame), // 主 SDI 框架窗口 - RUNTIME_CLASS(MCAView)); + RUNTIME_CLASS(CMCAView)); if (!pDocTemplate) return FALSE; AddDocTemplate(pDocTemplate); @@ -128,7 +128,7 @@ BOOL CMultichannelAnalyzerApp::InitInstance() return TRUE; } -int CMultichannelAnalyzerApp::ExitInstance() +int CMCAApp::ExitInstance() { //TODO: 处理可能已添加的附加资源 AfxOleTerm(FALSE); @@ -136,7 +136,7 @@ int CMultichannelAnalyzerApp::ExitInstance() return CWinApp::ExitInstance(); } -// CMultichannelAnalyzerApp 消息处理程序 +// CMCAApp 消息处理程序 // 用于应用程序“关于”菜单项的 CAboutDlg 对话框 @@ -172,13 +172,13 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialogEx) END_MESSAGE_MAP() // 用于运行对话框的应用程序命令 -void CMultichannelAnalyzerApp::OnAppAbout() +void CMCAApp::OnAppAbout() { CAboutDlg aboutDlg; aboutDlg.DoModal(); } -// CMultichannelAnalyzerApp 消息处理程序 +// CMCAApp 消息处理程序 diff --git a/Multichannel Analyzer/Multichannel Analyzer.h b/MCA/MCA.h similarity index 74% rename from Multichannel Analyzer/Multichannel Analyzer.h rename to MCA/MCA.h index 6fdfef5..719fe03 100644 --- a/Multichannel Analyzer/Multichannel Analyzer.h +++ b/MCA/MCA.h @@ -10,14 +10,14 @@ #include "resource.h" // 主符号 -// CMultichannelAnalyzerApp: +// CMCAApp: // 有关此类的实现,请参阅 Multichannel Analyzer.cpp // -class CMultichannelAnalyzerApp : public CWinApp +class CMCAApp : public CWinApp { public: - CMultichannelAnalyzerApp() noexcept; + CMCAApp() noexcept; // 重写 @@ -30,4 +30,4 @@ public: DECLARE_MESSAGE_MAP() }; -extern CMultichannelAnalyzerApp theApp; +extern CMCAApp theApp; diff --git a/Multichannel Analyzer/MultichannelAnalyzer.rc b/MCA/MCA.rc similarity index 100% rename from Multichannel Analyzer/MultichannelAnalyzer.rc rename to MCA/MCA.rc diff --git a/Multichannel Analyzer/Multichannel Analyzer.vcxproj b/MCA/MCA.vcxproj similarity index 95% rename from Multichannel Analyzer/Multichannel Analyzer.vcxproj rename to MCA/MCA.vcxproj index baaf665..b364ed3 100644 --- a/Multichannel Analyzer/Multichannel Analyzer.vcxproj +++ b/MCA/MCA.vcxproj @@ -20,7 +20,7 @@ 17.0 - {5FBBA58E-0A8F-4B23-B1D5-1CCCEF35FE33} + {F76A58F6-156A-4C3C-955D-ABDB16E1C498} MFCProj MultichannelAnalyzer 10.0 @@ -185,18 +185,18 @@ + - - + + - - + Create Create @@ -205,14 +205,14 @@ - + - + - - + + diff --git a/Multichannel Analyzer/Multichannel Analyzer.vcxproj.filters b/MCA/MCA.vcxproj.filters similarity index 83% rename from Multichannel Analyzer/Multichannel Analyzer.vcxproj.filters rename to MCA/MCA.vcxproj.filters index c40f90d..8c17f46 100644 --- a/Multichannel Analyzer/Multichannel Analyzer.vcxproj.filters +++ b/MCA/MCA.vcxproj.filters @@ -15,7 +15,7 @@ - + 头文件 @@ -27,7 +27,7 @@ 头文件 - + 头文件 @@ -41,13 +41,13 @@ - + 源文件 源文件 - + 源文件 @@ -58,20 +58,20 @@ - + 资源文件 - + 资源文件 - + 资源文件 - + 资源文件 diff --git a/Multichannel Analyzer/Multichannel AnalyzerDoc.cpp b/MCA/MCADoc.cpp similarity index 66% rename from Multichannel Analyzer/Multichannel AnalyzerDoc.cpp rename to MCA/MCADoc.cpp index 958bc5c..cbd4af7 100644 --- a/Multichannel Analyzer/Multichannel AnalyzerDoc.cpp +++ b/MCA/MCADoc.cpp @@ -1,5 +1,5 @@  -// Multichannel AnalyzerDoc.cpp: CMultichannelAnalyzerDoc 类的实现 +// MCADoc.cpp: CMCADoc 类的实现 // #include "pch.h" @@ -7,10 +7,10 @@ // SHARED_HANDLERS 可以在实现预览、缩略图和搜索筛选器句柄的 // ATL 项目中进行定义,并允许与该项目共享文档代码。 #ifndef SHARED_HANDLERS -#include "Multichannel Analyzer.h" +#include "MCA.h" #endif -#include "Multichannel AnalyzerDoc.h" +#include "MCADoc.h" #include @@ -18,27 +18,27 @@ #define new DEBUG_NEW #endif -// CMultichannelAnalyzerDoc +// CMCADoc -IMPLEMENT_DYNCREATE(CMultichannelAnalyzerDoc, CDocument) +IMPLEMENT_DYNCREATE(CMCADoc, CDocument) -BEGIN_MESSAGE_MAP(CMultichannelAnalyzerDoc, CDocument) +BEGIN_MESSAGE_MAP(CMCADoc, CDocument) END_MESSAGE_MAP() -// CMultichannelAnalyzerDoc 构造/析构 +// CMCADoc 构造/析构 -CMultichannelAnalyzerDoc::CMultichannelAnalyzerDoc() noexcept +CMCADoc::CMCADoc() noexcept { // TODO: 在此添加一次性构造代码 } -CMultichannelAnalyzerDoc::~CMultichannelAnalyzerDoc() +CMCADoc::~CMCADoc() { } -BOOL CMultichannelAnalyzerDoc::OnNewDocument() +BOOL CMCADoc::OnNewDocument() { if (!CDocument::OnNewDocument()) return FALSE; @@ -52,9 +52,9 @@ BOOL CMultichannelAnalyzerDoc::OnNewDocument() -// CMultichannelAnalyzerDoc 序列化 +// CMCADoc 序列化 -void CMultichannelAnalyzerDoc::Serialize(CArchive& ar) +void CMCADoc::Serialize(CArchive& ar) { if (ar.IsStoring()) { @@ -69,7 +69,7 @@ void CMultichannelAnalyzerDoc::Serialize(CArchive& ar) #ifdef SHARED_HANDLERS // 缩略图的支持 -void CMultichannelAnalyzerDoc::OnDrawThumbnail(CDC& dc, LPRECT lprcBounds) +void CMCADoc::OnDrawThumbnail(CDC& dc, LPRECT lprcBounds) { // 修改此代码以绘制文档数据 dc.FillSolidRect(lprcBounds, RGB(255, 255, 255)); @@ -90,7 +90,7 @@ void CMultichannelAnalyzerDoc::OnDrawThumbnail(CDC& dc, LPRECT lprcBounds) } // 搜索处理程序的支持 -void CMultichannelAnalyzerDoc::InitializeSearchContent() +void CMCADoc::InitializeSearchContent() { CString strSearchContent; // 从文档数据设置搜索内容。 @@ -100,7 +100,7 @@ void CMultichannelAnalyzerDoc::InitializeSearchContent() SetSearchContent(strSearchContent); } -void CMultichannelAnalyzerDoc::SetSearchContent(const CString& value) +void CMCADoc::SetSearchContent(const CString& value) { if (value.IsEmpty()) { @@ -120,19 +120,19 @@ void CMultichannelAnalyzerDoc::SetSearchContent(const CString& value) #endif // SHARED_HANDLERS -// CMultichannelAnalyzerDoc 诊断 +// CMCADoc 诊断 #ifdef _DEBUG -void CMultichannelAnalyzerDoc::AssertValid() const +void CMCADoc::AssertValid() const { CDocument::AssertValid(); } -void CMultichannelAnalyzerDoc::Dump(CDumpContext& dc) const +void CMCADoc::Dump(CDumpContext& dc) const { CDocument::Dump(dc); } #endif //_DEBUG -// CMultichannelAnalyzerDoc 命令 +// CMCADoc 命令 diff --git a/Multichannel Analyzer/Multichannel AnalyzerDoc.h b/MCA/MCADoc.h similarity index 74% rename from Multichannel Analyzer/Multichannel AnalyzerDoc.h rename to MCA/MCADoc.h index 1db113e..e15aeeb 100644 --- a/Multichannel Analyzer/Multichannel AnalyzerDoc.h +++ b/MCA/MCADoc.h @@ -1,16 +1,16 @@  -// Multichannel AnalyzerDoc.h: CMultichannelAnalyzerDoc 类的接口 +// MCADoc.h: CMCADoc 类的接口 // #pragma once -class CMultichannelAnalyzerDoc : public CDocument +class CMCADoc : public CDocument { protected: // 仅从序列化创建 - CMultichannelAnalyzerDoc() noexcept; - DECLARE_DYNCREATE(CMultichannelAnalyzerDoc) + CMCADoc() noexcept; + DECLARE_DYNCREATE(CMCADoc) // 特性 public: @@ -29,7 +29,7 @@ public: // 实现 public: - virtual ~CMultichannelAnalyzerDoc(); + virtual ~CMCADoc(); #ifdef _DEBUG virtual void AssertValid() const; virtual void Dump(CDumpContext& dc) const; diff --git a/Multichannel Analyzer/MCAView.cpp b/MCA/MCAView.cpp similarity index 52% rename from Multichannel Analyzer/MCAView.cpp rename to MCA/MCAView.cpp index 85ddf21..029e0b7 100644 --- a/Multichannel Analyzer/MCAView.cpp +++ b/MCA/MCAView.cpp @@ -1,5 +1,5 @@  -// MCAView.cpp: MCAView 类的实现 +// MCAView.cpp: CMCAView 类的实现 // #include "pch.h" @@ -7,10 +7,10 @@ // SHARED_HANDLERS 可以在实现预览、缩略图和搜索筛选器句柄的 // ATL 项目中进行定义,并允许与该项目共享文档代码。 #ifndef SHARED_HANDLERS -#include "Multichannel Analyzer.h" +#include "MCA.h" #endif -#include "Multichannel AnalyzerDoc.h" +#include "MCADoc.h" #include "MCAView.h" #ifdef _DEBUG @@ -18,30 +18,30 @@ #endif -// MCAView +// CMCAView -IMPLEMENT_DYNCREATE(MCAView, CView) +IMPLEMENT_DYNCREATE(CMCAView, CView) -BEGIN_MESSAGE_MAP(MCAView, CView) +BEGIN_MESSAGE_MAP(CMCAView, CView) // 标准打印命令 ON_COMMAND(ID_FILE_PRINT, &CView::OnFilePrint) ON_COMMAND(ID_FILE_PRINT_DIRECT, &CView::OnFilePrint) ON_COMMAND(ID_FILE_PRINT_PREVIEW, &CView::OnFilePrintPreview) END_MESSAGE_MAP() -// MCAView 构造/析构 +// CMCAView 构造/析构 -MCAView::MCAView() noexcept +CMCAView::CMCAView() noexcept { // TODO: 在此处添加构造代码 } -MCAView::~MCAView() +CMCAView::~CMCAView() { } -BOOL MCAView::PreCreateWindow(CREATESTRUCT& cs) +BOOL CMCAView::PreCreateWindow(CREATESTRUCT& cs) { // TODO: 在此处通过修改 // CREATESTRUCT cs 来修改窗口类或样式 @@ -49,11 +49,11 @@ BOOL MCAView::PreCreateWindow(CREATESTRUCT& cs) return CView::PreCreateWindow(cs); } -// MCAView 绘图 +// CMCAView 绘图 -void MCAView::OnDraw(CDC* /*pDC*/) +void CMCAView::OnDraw(CDC* /*pDC*/) { - CMultichannelAnalyzerDoc* pDoc = GetDocument(); + CMCADoc* pDoc = GetDocument(); ASSERT_VALID(pDoc); if (!pDoc) return; @@ -62,44 +62,44 @@ void MCAView::OnDraw(CDC* /*pDC*/) } -// MCAView 打印 +// CMCAView 打印 -BOOL MCAView::OnPreparePrinting(CPrintInfo* pInfo) +BOOL CMCAView::OnPreparePrinting(CPrintInfo* pInfo) { // 默认准备 return DoPreparePrinting(pInfo); } -void MCAView::OnBeginPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) +void CMCAView::OnBeginPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) { // TODO: 添加额外的打印前进行的初始化过程 } -void MCAView::OnEndPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) +void CMCAView::OnEndPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) { // TODO: 添加打印后进行的清理过程 } -// MCAView 诊断 +// CMCAView 诊断 #ifdef _DEBUG -void MCAView::AssertValid() const +void CMCAView::AssertValid() const { CView::AssertValid(); } -void MCAView::Dump(CDumpContext& dc) const +void CMCAView::Dump(CDumpContext& dc) const { CView::Dump(dc); } -CMultichannelAnalyzerDoc* MCAView::GetDocument() const // 非调试版本是内联的 +CMCADoc* CMCAView::GetDocument() const // 非调试版本是内联的 { - ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CMultichannelAnalyzerDoc))); - return (CMultichannelAnalyzerDoc*)m_pDocument; + ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CMCADoc))); + return (CMCADoc*)m_pDocument; } #endif //_DEBUG -// MCAView 消息处理程序 +// CMCAView 消息处理程序 diff --git a/Multichannel Analyzer/MCAView.h b/MCA/MCAView.h similarity index 67% rename from Multichannel Analyzer/MCAView.h rename to MCA/MCAView.h index 577e74f..1390fd6 100644 --- a/Multichannel Analyzer/MCAView.h +++ b/MCA/MCAView.h @@ -1,19 +1,19 @@  -// MCAView.h: MCAView 类的接口 +// MCAView.h: CMCAView 类的接口 // #pragma once -class MCAView : public CView +class CMCAView : public CView { protected: // 仅从序列化创建 - MCAView() noexcept; - DECLARE_DYNCREATE(MCAView) + CMCAView() noexcept; + DECLARE_DYNCREATE(CMCAView) // 特性 public: - CMultichannelAnalyzerDoc* GetDocument() const; + CMCADoc* GetDocument() const; // 操作 public: @@ -29,7 +29,7 @@ protected: // 实现 public: - virtual ~MCAView(); + virtual ~CMCAView(); #ifdef _DEBUG virtual void AssertValid() const; virtual void Dump(CDumpContext& dc) const; @@ -43,7 +43,7 @@ protected: }; #ifndef _DEBUG // MCAView.cpp 中的调试版本 -inline CMultichannelAnalyzerDoc* MCAView::GetDocument() const - { return reinterpret_cast(m_pDocument); } +inline CMCADoc* CMCAView::GetDocument() const + { return reinterpret_cast(m_pDocument); } #endif diff --git a/Multichannel Analyzer/MainFrm.cpp b/MCA/MainFrm.cpp similarity index 98% rename from Multichannel Analyzer/MainFrm.cpp rename to MCA/MainFrm.cpp index 7b485e1..91d8d4e 100644 --- a/Multichannel Analyzer/MainFrm.cpp +++ b/MCA/MainFrm.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "framework.h" -#include "Multichannel Analyzer.h" +#include "MCA.h" #include "MainFrm.h" diff --git a/Multichannel Analyzer/MainFrm.h b/MCA/MainFrm.h similarity index 100% rename from Multichannel Analyzer/MainFrm.h rename to MCA/MainFrm.h diff --git a/Multichannel Analyzer/Resource.h b/MCA/Resource.h similarity index 100% rename from Multichannel Analyzer/Resource.h rename to MCA/Resource.h diff --git a/Multichannel Analyzer/framework.h b/MCA/framework.h similarity index 100% rename from Multichannel Analyzer/framework.h rename to MCA/framework.h diff --git a/Multichannel Analyzer/pch.cpp b/MCA/pch.cpp similarity index 100% rename from Multichannel Analyzer/pch.cpp rename to MCA/pch.cpp diff --git a/Multichannel Analyzer/pch.h b/MCA/pch.h similarity index 100% rename from Multichannel Analyzer/pch.h rename to MCA/pch.h diff --git a/Multichannel Analyzer/res/Multichannel Analyzer.ico b/MCA/res/MCA.ico similarity index 100% rename from Multichannel Analyzer/res/Multichannel Analyzer.ico rename to MCA/res/MCA.ico diff --git a/Multichannel Analyzer/res/MultichannelAnalyzer.rc2 b/MCA/res/MCA.rc2 similarity index 100% rename from Multichannel Analyzer/res/MultichannelAnalyzer.rc2 rename to MCA/res/MCA.rc2 diff --git a/Multichannel Analyzer/res/Multichannel AnalyzerDoc.ico b/MCA/res/MCADoc.ico similarity index 100% rename from Multichannel Analyzer/res/Multichannel AnalyzerDoc.ico rename to MCA/res/MCADoc.ico diff --git a/Multichannel Analyzer/res/Toolbar.bmp b/MCA/res/Toolbar.bmp similarity index 100% rename from Multichannel Analyzer/res/Toolbar.bmp rename to MCA/res/Toolbar.bmp diff --git a/Multichannel Analyzer/targetver.h b/MCA/targetver.h similarity index 100% rename from Multichannel Analyzer/targetver.h rename to MCA/targetver.h