LAPTOP-T815PCOQ\25526
2025-01-11 52e82dcdc401782b58ed50bc14ae270b143370a9
1.添加轴设定和细部设定
已修改10个文件
已删除4个文件
932 ■■■■ 文件已修改
SourceCode/Bond/BoounionPLC/BoounionPLC.rc 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj.filters 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/Common.h 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/DBManager/AxisManager.cpp 246 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/DBManager/AxisManager.h 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/FileManager/IOManager.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/FileManager/RecipeManager.cpp 314 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/FileManager/RecipeManager.h 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/IOMonitoringDlg.cpp 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/IOMonitoringDlg.h 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/Resource.h 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/stdafx.h 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/BoounionPLC/BoounionPLC.rc
Binary files differ
SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
@@ -197,9 +197,12 @@
    <ClInclude Include="AlarmMonitor.h" />
    <ClInclude Include="AlarmPopupDlg.h" />
    <ClInclude Include="ApredTreeCtrl.h" />
    <ClInclude Include="AxisDetailSettingsDlg.h" />
    <ClInclude Include="AxisSettingsDlg.h" />
    <ClInclude Include="BlButton.h" />
    <ClInclude Include="BoounionPLC.h" />
    <ClInclude Include="BoounionPLCDlg.h" />
    <ClInclude Include="CBaseDlg.h" />
    <ClInclude Include="CBaseView.h" />
    <ClInclude Include="CMainContainer.h" />
    <ClInclude Include="Common.h" />
@@ -208,13 +211,12 @@
    <ClInclude Include="Context.h" />
    <ClInclude Include="CPageLogcat.h" />
    <ClInclude Include="DBManager\AlarmManager.h" />
    <ClInclude Include="DBManager\AxisManager.h" />
    <ClInclude Include="DBManager\SystemLogManager.h" />
    <ClInclude Include="DBManager\UserManager.h" />
    <ClInclude Include="FileManager\AxisManager.h" />
    <ClInclude Include="FileManager\IOManager.h" />
    <ClInclude Include="FileManager\pugiconfig.hpp" />
    <ClInclude Include="FileManager\pugixml.hpp" />
    <ClInclude Include="FileManager\RecipeManager.h" />
    <ClInclude Include="InputDialog.h" />
    <ClInclude Include="Intent.h" />
    <ClInclude Include="IOMonitoringDlg.h" />
@@ -228,6 +230,7 @@
    <ClInclude Include="PagePlcList.h" />
    <ClInclude Include="PLC.h" />
    <ClInclude Include="PlcView.h" />
    <ClInclude Include="RegexEdit.h" />
    <ClInclude Include="Resource.h" />
    <ClInclude Include="stdafx.h" />
    <ClInclude Include="targetver.h" />
@@ -241,9 +244,12 @@
    <ClCompile Include="AlarmMonitor.cpp" />
    <ClCompile Include="AlarmPopupDlg.cpp" />
    <ClCompile Include="ApredTreeCtrl.cpp" />
    <ClCompile Include="AxisDetailSettingsDlg.cpp" />
    <ClCompile Include="AxisSettingsDlg.cpp" />
    <ClCompile Include="BlButton.cpp" />
    <ClCompile Include="BoounionPLC.cpp" />
    <ClCompile Include="BoounionPLCDlg.cpp" />
    <ClCompile Include="CBaseDlg.cpp" />
    <ClCompile Include="CBaseView.cpp" />
    <ClCompile Include="CMainContainer.cpp" />
    <ClCompile Include="Component.cpp" />
@@ -253,15 +259,14 @@
    <ClCompile Include="DBManager\AlarmManager.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="DBManager\AxisManager.cpp" />
    <ClCompile Include="DBManager\SystemLogManager.cpp" />
    <ClCompile Include="DBManager\UserManager.cpp" />
    <ClCompile Include="FileManager\AxisManager.cpp" />
    <ClCompile Include="FileManager\IOManager.cpp" />
    <ClCompile Include="FileManager\pugixml.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="FileManager\RecipeManager.cpp" />
    <ClCompile Include="InputDialog.cpp" />
    <ClCompile Include="Intent.cpp" />
    <ClCompile Include="IOMonitoringDlg.cpp" />
@@ -275,6 +280,7 @@
    <ClCompile Include="PagePlcList.cpp" />
    <ClCompile Include="PLC.cpp" />
    <ClCompile Include="PlcView.cpp" />
    <ClCompile Include="RegexEdit.cpp" />
    <ClCompile Include="stdafx.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj.filters
@@ -117,9 +117,6 @@
    <ClInclude Include="DBManager\AlarmManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
    <ClInclude Include="DBManager\AxisManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
    <ClInclude Include="DBManager\SystemLogManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
@@ -141,13 +138,25 @@
    <ClInclude Include="FileManager\pugixml.hpp">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="FileManager\RecipeManager.h">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="InputDialog.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="IOMonitoringDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="FileManager\AxisManager.h">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="AxisDetailSettingsDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="AxisSettingsDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="CBaseDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="RegexEdit.h">
      <Filter>头文件</Filter>
    </ClInclude>
  </ItemGroup>
@@ -236,9 +245,6 @@
    <ClCompile Include="DBManager\AlarmManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
    <ClCompile Include="DBManager\AxisManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
    <ClCompile Include="DBManager\SystemLogManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
@@ -257,15 +263,27 @@
    <ClCompile Include="FileManager\pugixml.cpp">
      <Filter>FileManager</Filter>
    </ClCompile>
    <ClCompile Include="FileManager\RecipeManager.cpp">
      <Filter>FileManager</Filter>
    </ClCompile>
    <ClCompile Include="InputDialog.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="IOMonitoringDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="FileManager\AxisManager.cpp">
      <Filter>FileManager</Filter>
    </ClCompile>
    <ClCompile Include="AxisDetailSettingsDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="AxisSettingsDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="CBaseDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="RegexEdit.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="BoounionPLC.rc">
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
@@ -10,9 +10,11 @@
#include "PlcView.h"
#include "Log.h"
#include "InputDialog.h"
#include "AxisManager.h"
#include "IOManager.h"
// æµ‹è¯•
#include "AxisSettingsDlg.h"
#include "IOMonitoringDlg.h"
@@ -502,10 +504,13 @@
        if (!strName.IsEmpty()) {
            theApp.m_model.addPlc((LPTSTR)(LPCTSTR)strName, "192.168.1.188", 1001);
            // æ–°å»ºè½´æ–‡ä»¶
            AxisManager axisManager;
            axisManager.SaveAxis((LPTSTR)(LPCTSTR)strName);
            // æ–°å»ºIO文件
            IOManager io;
            io.DefaultMachineData();
            io.SaveToFile((LPTSTR)(LPCTSTR)strName);
            IOManager ioManager;
            ioManager.SaveToFile((LPTSTR)(LPCTSTR)strName);
        }
    }
    else if (id == IDC_BUTTON_DELETE) {
@@ -518,9 +523,10 @@
        // æµ‹è¯• IO模块
        CPLC* pPLC = theApp.m_model.getCurrentPlc();
        if (pPLC != nullptr) {
            CIOMonitoringDlg dlg;
            dlg.SetPLC(pPLC);
            dlg.SetIOManager(pPLC->getName());
            //CIOMonitoringDlg dlg;
            //dlg.DoModal();
            CAxisSettingsDlg dlg;
            dlg.DoModal();
        }
    }
SourceCode/Bond/BoounionPLC/Common.h
@@ -31,6 +31,8 @@
#define PLC_VIEW_BACKGROUND                RGB(252, 252, 255)
#define LOGCAT_BACKGROUND_COLOR            RGB(252, 252, 255)
/* PLC页面颜色定义 */
/* PLCVIEW按钮 */
#define BTN_PLCVIEW_FRAME_NORMAL    RGB(88, 88, 88)
#define BTN_PLCVIEW_FRAME_HOVER        RGB(88, 88, 88)
@@ -42,6 +44,56 @@
#define BTN_PLCVIEW_ON_BKGND_HOVER        RGB(150, 250, 150)
#define BTN_PLCVIEW_ON_BKGND_PRESS        RGB(50, 150, 50)
/* è½´è®¾å®šé¡µé¢é¢œè‰²å®šä¹‰ */
/* 5个按钮页, æŒ‰é’®èƒŒæ™¯è‰²ï¼Œæ­£å¸¸çŠ¶æ€*/
#define BTN_PAGE_FACE_NORMAL_COLOR        RGB(0, 168, 0)
#define BTN_PAGE_FACE_SELECT_COLOR        RGB(0, 232, 0)
#define BTN_PAGE_TEXT_NORMAL_COLOR        RGB(22, 22, 22)
#define BTN_PAGE_TEXT_SELECT_COLOR        RGB(22, 22, 22)
/* JOG+, JOG-*/
#define BTN_JOG_FRAME_NORMAL            RGB(88, 88, 88)
#define BTN_JOG_FRAME_HOVER                RGB(88, 88, 88)
#define BTN_JOG_FRAME_PRESS                RGB(88, 88, 88)
#define BTN_JOG_BKGND_NORMAL            RGB(0, 232, 0)
#define BTN_JOG_BKGND_HOVER                RGB(0, 222, 0)
#define BTN_JOG_BKGND_PRESS                RGB(0, 168, 0)
/* Sev按钮 */
#define BTN_SEV_FRAME_NORMAL            RGB(88, 88, 88)
#define BTN_SEV_FRAME_HOVER                RGB(88, 88, 88)
#define BTN_SEV_FRAME_PRESS                RGB(88, 88, 88)
#define BTN_SEV_BKGND_NORMAL            RGB(0, 232, 0)
#define BTN_SEV_BKGND_HOVER                RGB(0, 222, 0)
#define BTN_SEV_BKGND_PRESS                RGB(222, 0, 0)
/* Stop按钮 */
#define BTN_STOP_FRAME_NORMAL            RGB(88, 88, 88)
#define BTN_STOP_FRAME_HOVER            RGB(88, 88, 88)
#define BTN_STOP_FRAME_PRESS            RGB(88, 88, 88)
#define BTN_STOP_BKGND_NORMAL            RGB(0, 168, 0)
#define BTN_STOP_BKGND_HOVER            RGB(0, 138, 0)
#define BTN_STOP_BKGND_PRESS            RGB(222, 0, 0)
/* OPR æŒ‰é’® */
#define BTN_OPR_FRAME_NORMAL            RGB(88, 88, 88)
#define BTN_OPR_FRAME_HOVER                RGB(88, 88, 88)
#define BTN_OPR_FRAME_PRESS                RGB(88, 88, 88)
#define BTN_OPR_BKGND_NORMAL            RGB(222, 222, 222)
#define BTN_OPR_BKGND_HOVER                RGB(208, 208, 222)
#define BTN_OPR_BKGND_PRESS                RGB(0, 232, 0)
/* å®šä½æŒ‰é’® */
#define BTN_POINT_FRAME_NORMAL            RGB(88, 88, 88)
#define BTN_POINT_FRAME_HOVER            RGB(88, 88, 88)
#define BTN_POINT_FRAME_PRESS            RGB(88, 88, 88)
#define BTN_POINT_BKGND_NORMAL            RGB(222, 222, 222)
#define BTN_POINT_BKGND_HOVER            RGB(208, 208, 222)
#define BTN_POINT_BKGND_PRESS            RGB(0, 232, 0)
/* æŠ¥è­¦é¡µé¢é¢œè‰²å®šä¹‰ */
/* è§£é™¤è­¦å‘Š æŒ‰é’® */
#define BTN_ALARM_OFF_FRAME_NORMAL        RGB(88, 88, 88)
#define BTN_ALARM_OFF_FRAME_HOVER        RGB(88, 88, 88)
SourceCode/Bond/BoounionPLC/DBManager/AxisManager.cpp
ÎļþÒÑɾ³ý
SourceCode/Bond/BoounionPLC/DBManager/AxisManager.h
ÎļþÒÑɾ³ý
SourceCode/Bond/BoounionPLC/FileManager/IOManager.cpp
@@ -154,6 +154,10 @@
        return;
    }
    if (m_vecMachines.empty()) {
        DefaultMachineData();
    }
    for (const auto& entry : m_vecMachines) {
        file << entry.inputAddress << ","
            << entry.inputDescription << ","
SourceCode/Bond/BoounionPLC/FileManager/RecipeManager.cpp
ÎļþÒÑɾ³ý
SourceCode/Bond/BoounionPLC/FileManager/RecipeManager.h
ÎļþÒÑɾ³ý
SourceCode/Bond/BoounionPLC/IOMonitoringDlg.cpp
@@ -27,6 +27,22 @@
    m_nTotalPages = 1;
    m_nRowsPerPage = 16;
    m_nCols = 6;
    CPLC* pPLC = theApp.m_model.getCurrentPlc();
    if (pPLC != nullptr) {
        m_pPLC = pPLC;
        // åŠ è½½æ•°æ®
        IOManager manager;
        manager.LoadFromFile(pPLC->getName());
        manager.GetMachineData(m_displayData);
        // è®¡ç®—页数
        m_nCurrentPage = 1;
        m_nTotalPages = ((int)m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
    } else {
        m_pPLC = nullptr;
    }
}
CIOMonitoringDlg::~CIOMonitoringDlg()
@@ -46,24 +62,6 @@
{
    CDialogEx::DoDataExchange(pDX);
    DDX_Control(pDX, IDC_STATIC_PAGE_NUMBER, m_staticPageNum);
}
void CIOMonitoringDlg::SetIOManager(const std::string& machineName)
{
    // åŠ è½½æ•°æ®
    IOManager manager;
    manager.LoadFromFile(machineName);
    manager.GetMachineData(m_displayData);
    // è®¡ç®—页数
    m_nCurrentPage = 1;
    m_nTotalPages = ((int)m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
}
void CIOMonitoringDlg::SetPLC(CPLC* pPLC)
{
    ASSERT(pPLC);
    m_pPLC = pPLC;
}
CFont* CIOMonitoringDlg::GetOrCreateFont(int nFontSize)
@@ -568,6 +566,15 @@
    CDialogEx::OnInitDialog();
    // TODO:  åœ¨æ­¤æ·»åŠ é¢å¤–çš„åˆå§‹åŒ–
    if (m_pPLC == nullptr || !m_pPLC->isConnected()) {
        AfxMessageBox(_T("PLC æœªè¿žæŽ¥ï¼"));
        return FALSE;
    }
    CString strTitle;
    strTitle.Format(_T("IO监控页面(PLC: %s)"), m_pPLC->getName().c_str());
    SetWindowText(strTitle);
    CRect screenRect, dlgRect, clientRect;
    SystemParametersInfo(SPI_GETWORKAREA, 0, &screenRect, 0);
SourceCode/Bond/BoounionPLC/IOMonitoringDlg.h
@@ -14,8 +14,6 @@
public:
    CIOMonitoringDlg(CWnd* pParent = nullptr);   // æ ‡å‡†æž„造函数
    virtual ~CIOMonitoringDlg();
    void SetIOManager(const std::string& machineName); // è®¾ç½® IOManager å’Œæœºå™¨å
    void SetPLC(CPLC* pPLC); // è®¾ç½® PLC
// å¯¹è¯æ¡†æ•°æ®
#ifdef AFX_DESIGN_TIME
SourceCode/Bond/BoounionPLC/Resource.h
Binary files differ
SourceCode/Bond/BoounionPLC/stdafx.h
@@ -34,6 +34,24 @@
#include <afxcontrolbars.h>     // åŠŸèƒ½åŒºå’ŒæŽ§ä»¶æ¡çš„ MFC æ”¯æŒ
// æŽ§ä»¶æ ·å¼
static UINT g_nGridFixCellColor = RGB(144, 200, 246);
static UINT g_nGridFixFontColor = RGB(0, 0, 0);
static UINT g_nGridCellColor = RGB(255, 255, 224);
static UINT g_nGridCellColor_NonSelect = RGB(150, 150, 150);
static UINT g_nGridCellReadyColor = RGB(255, 255, 0);
static UINT g_nGridCellOnColor = RGB(255, 69, 0);
static UINT g_nGridCellOffColor = RGB(128, 191, 255);
static UINT g_nPropertyGridFixCellColor = RGB(150, 150, 150);
static UINT g_nPropertyGridFixFontColor = RGB(0, 0, 0);
static UINT g_nSequenceOffColor = RGB(0, 0, 0);
static UINT g_nSequenceOnColor = RGB(0, 180, 0);
static UINT g_nSequenceErrorColor = RGB(255, 0, 0);
static UINT g_nSequenceWarningColor = RGB(255, 255, 0);
static UINT g_nSequenceReadyColor = RGB(0, 0, 255);
static UINT g_nSequenceRunningColor = RGB(0, 255, 255);
static UINT g_nSequencePauseColor = RGB(255, 0, 255);
static UINT g_nSequenceStopColor = RGB(128, 128, 128);
#include "..\RxWindows1.0\include\RxWindowsLib.h"