Merge branch 'dev2' of http://3u015c326.zicp.vip:8111/r/MultiTerminal1 into...

Yao Chunli

2022-06-21 df685a2064abd0fef557c250dcb7bbd38f480826

 MTerm2/MTerm2.vcxproj.filters

@@ -57,45 +57,6 @@
    <ClInclude Include="MTerm2ProgTxt.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CAnsiParser.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDataParser1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogCoilMon.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogCommSet1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogDataMon.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogDateTime.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogEventLog.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogForceIO.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogInfoDisplay.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogProgress.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogStatusShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CDialogSysRegSet.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CPropSysReg1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="HvSerialPort.h">

      <Filter>头文件</Filter>

    </ClInclude>

@@ -144,6 +105,78 @@
    <ClInclude Include="KMachine.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="NavView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="ViewTree.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="AnsiParser.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DataParser1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogCoilMon.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogCommSet1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogDataMon.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogDateTime.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogEventLog.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogForceIO.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogInfoDisplay.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogProgress.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogStatusShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogSysRegSet.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropSysReg1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropMemCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropModeCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropCommCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropInputCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropOutputCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogFactCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CMyFuncKeyToolBar.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyDlgBarFuncKey.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyDlgBarInputShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <ClCompile Include="MainFrm.cpp">

@@ -177,45 +210,6 @@
      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm2ProgTxt.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CAnsiParser.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDataParser1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogCoilMon.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogCommSet1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogDataMon.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogDateTime.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogEventLog.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogForceIO.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogInfoDisplay.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogProgress.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogStatusShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CDialogSysRegSet.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CPropSysReg1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="HvSerialPort.cpp">

@@ -263,6 +257,78 @@
    <ClCompile Include="KMachine.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="NavView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="ViewTree.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogSysRegSet.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogStatusShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogProgress.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogInfoDisplay.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogForceIO.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogEventLog.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogDateTime.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogDataMon.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogCommSet1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogCoilMon.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DataParser1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="AnsiParser.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropSysReg1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropMemCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropModeCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropCommCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropInputCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropOutputCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogFactCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CMyFuncKeyToolBar.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyDlgBarFuncKey.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyDlgBarInputShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ResourceCompile Include="MTerm2.rc">

@@ -273,6 +339,7 @@
    <None Include="res\MTerm2.rc2">

      <Filter>资源文件</Filter>

    </None>

    <None Include="devices.cfg" />

  </ItemGroup>

  <ItemGroup>

    <Image Include="res\Toolbar.bmp">

@@ -311,10 +378,38 @@
    <Image Include="res\toolbar2.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\class_view.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\class_view_hc.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\sort.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\classview.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\classview_hc.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\sort_hc.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\bitmap1.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\toolbar_.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\toolbar_func_key.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\bmp00004.bmp">

      <Filter>资源文件</Filter>

    </Image>

  </ItemGroup>

  <ItemGroup>

    <Text Include="..\MTerm1\Prog.txt">

      <Filter>源文件</Filter>

    </Text>

    <Text Include="design1.txt" />

  </ItemGroup>

</Project>