Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-11-15 106787bbf3418e9199043bcea81d29161fdada8f

Merge branch 'liuyang' into clh

 SourceCode/Bond/BLControlsSDK/include/BLJogBtn2Parent.h

@@ -1,7 +1,24 @@
#if !defined(AFX_BLJOGBTN2PARENT_H__5A9433C1_E8A9_4393_9E0D_B7A996B9AF3F__INCLUDED_)
#define AFX_BLJOGBTN2PARENT_H__5A9433C1_E8A9_4393_9E0D_B7A996B9AF3F__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// BLJogBtn2Parent.h : header file
//

/////////////////////////////////////////////////////////////////////////////
// by ChaeBL

typedef struct _BLJOGBTN2PARENT
{
    virtual BOOL SendMessageToParent(LPCTSTR message) = 0;
    virtual BOOL SendMessageToParent(int nMsg) = 0;
} BLJogBtn2Parent, *pBLJogBtn2Parent;
} BLJogBtn2Parent, *pBLJogBtn2Parent;

/////////////////////////////////////////////////////////////////////////////

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

#endif // !defined(AFX_BLJOGBTN2PARENT_H__5A9433C1_E8A9_4393_9E0D_B7A996B9AF3F__INCLUDED_)

 SourceCode/Bond/BLControlsSDK/include/FontStatic.h

@@ -1,5 +1,13 @@
#pragma once
#if !defined(AFX_FONTSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
#define AFX_FONTSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// FontStatic.h : header file
//

/////////////////////////////////////////////////////////////////////////////
// Defines for the font style
#define FS_NORMAL            0x00
#define FS_BOLD                0x01
@@ -66,4 +74,10 @@
    afx_msg void OnPaint();
};

/////////////////////////////////////////////////////////////////////////////

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

#endif // !defined(AFX_FONTSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)


 SourceCode/Bond/BLControlsSDK/include/GradientStatic.h

@@ -1,6 +1,13 @@
#if !defined(AFX_GRADIENSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
#define AFX_GRADIENSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// FontStatic.h : header file
//


/////////////////////////////////////////////////////////////////////////////
// CGradientStatic
typedef UINT (CALLBACK* LPFNDLLFUNC1)(HDC,CONST PTRIVERTEX,DWORD,CONST PVOID,DWORD,DWORD);

@@ -146,4 +153,9 @@
public:
};

/////////////////////////////////////////////////////////////////////////////

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

#endif // !defined(AFX_GRADIENSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)

 SourceCode/Bond/BLControlsSDK/include/LogCtrl.h

@@ -1,5 +1,4 @@
//LogCtrl.h
//LogCtrl.h
#ifndef __LOGCTRL_H
#define __LOGCTRL_H
#define __LOGCTRL_LIB_H
@@ -46,18 +45,18 @@

typedef struct tagLOGCELL
{
    BYTE        m_nLine; //惑窍谅快 扼牢 
    UINT        m_nState;//促弗伎苞 捍钦灯绰瘤 ..
    UINT        m_nFormat;//沥纺葛靛
    RECT        m_rect;  //伎狼 康开
    COLORREF    m_txtclr;//臂磊祸
    COLORREF    m_bkgclr;//硅版祸
    CString        m_strTxt;//臂磊
    CFont*        m_pfont; //迄飘
    CBitmap*    m_pBitmap;//厚飘甘
    BYTE        m_nLine; //惑窍谅快 扼牢 
    UINT        m_nState;//促弗伎苞 捍钦灯绰瘤 ..
    UINT        m_nFormat;//沥纺葛靛
    RECT        m_rect;  //伎狼 康开
    COLORREF    m_txtclr;//臂磊祸
    COLORREF    m_bkgclr;//硅版祸
    CString        m_strTxt;//臂磊
    CFont*        m_pfont; //迄飘
    CBitmap*    m_pBitmap;//厚飘甘
}LOGCELL;

//Orientation=啊肺(1), 技肺(2)  bDialog=DoModal()
//Orientation=啊肺(1), 技肺(2)  bDialog=DoModal()
class CPrintDC
{
public:
@@ -93,96 +92,96 @@
    void RemoveAll();
    void operator=(CLogPage& page);

    //青,凯 肮荐甫 汲沥茄促.
    //青,凯 肮荐甫 汲沥茄促.
    void SetColCount(int nCount);
    void SetRowCount(int nCount);
    BOOL RemoveRow(int nRow);

    //厘钎 免仿困摹
    //厘钎 免仿困摹
    void SetStartPoint(CPoint startPnt);
    CPoint GetStartPoint() const;

    //青,凯 肮荐甫 府畔茄促.
    //青,凯 肮荐甫 府畔茄促.
    int GetColCount() const;
    int GetRowCount() const;

    //气,臭捞甫 汲沥茄促.
    //气,臭捞甫 汲沥茄促.
    BOOL SetColWidth(int nCol, int nWidth);
    BOOL SetRowHeight(int nRow, int nHeight);

    //迄飘甫 汲沥茄促.
    //迄飘甫 汲沥茄促.
    BOOL SetCellFont(int nRow, int nCol, CFont* pf);
    BOOL SetCellFont(int nsRow, int nsCol, int neRow, int neCol, CFont* pf);
    CFont* GetCellFont(int nRow, int nCol);

    //硅版祸阑 汲沥茄促.
    //硅版祸阑 汲沥茄促.
    BOOL SetCellBkgColor(int nRow, int nCol, COLORREF color);
    COLORREF GetCellBkgColor(int nRow, int nCol);

    //臂磊祸阑 汲沥茄促.
    //臂磊祸阑 汲沥茄促.
    BOOL SetCellTxtColor(int nRow, int nCol, COLORREF color);
    COLORREF GetCellTxtColor(int nRow, int nCol);

    //臂磊困摹 汲沥
    //臂磊困摹 汲沥
    BOOL SetCellFormat(int nRow, int nCol, int nFormat);
    int GetCellFormat(int nRow, int nCol);

    //Rect阑 汲沥茄促.
    //Rect阑 汲沥茄促.
    BOOL SetCellRect(int nRow, int nCol, CRect rect);
    BOOL GetCellRect(int nRow, int nCol, CRect& rect);

    //BITMAP阑 汲沥茄促.
    //BITMAP阑 汲沥茄促.
    BOOL SetCellBmp(int nRow, int nCol, CBitmap* pBmp);
    CBitmap* GetCellBmp(int nRow, int nCol);

    //荤阿屈 弊副锭 绢蠢 困摹甫 弊副 巴牢啊 汲沥茄促. 
    //荤阿屈 弊副锭 绢蠢 困摹甫 弊副 巴牢啊 汲沥茄促. 
    BOOL SetCellLine(int nRow, int nCol, int nState=LCS_RECT/*LCS_RECT*/);
    int GetCellLine(int nRow, int nCol);

    //伎俊 臂磊阑 涝仿茄促.
    //伎俊 臂磊阑 涝仿茄促.
    BOOL SetItemText(int nRow, int nCol, LPCTSTR lpstr, int nFormat=DT_CENTER|DT_VCENTER|DT_SINGLELINE);
    CString GetItemText(int nRow, int nCol);

    BOOL SetCell(int nRow, int nCol, CLogCell lc);
    CLogCell* GetCell(int nRow, int nCol);

    //伎阑 捍钦茄促.
    //伎阑 捍钦茄促.
    BOOL CellMerge(int nsCol, int nsRow, int neCol ,int neRow );

    //免仿茄促.(nPageNO绰 其捞瘤 锅龋捞哥 0老 版快 免仿登瘤 臼绰促.)
    //免仿茄促.(nPageNO绰 其捞瘤 锅龋捞哥 0老 版快 免仿登瘤 臼绰促.)
    void Draw(CDC* pDC, int nPageNO=0);

    //SetPageRect(,)窃荐甫 荤侩矫 
    //Draw(CDC* pDC, int nPageNO=0);窃荐甫 龋免窍扁 官肺傈俊 荤侩秦具窃
    //侩档: 
    //SetPageRect(,)窃荐甫 荤侩矫 
    //Draw(CDC* pDC, int nPageNO=0);窃荐甫 龋免窍扁 官肺傈俊 荤侩秦具窃
    //侩档: 
    //   <<page>>                                 <<device>>
    //  0                               100      0                               1000  
    //  ΓΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΔ        ΓΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΔ
    //  Β  (10,10)              (90,10)Β        Β (100,100)           (900,100)Β
    //  Β  ΓΑΑΑΑΑΑΑΑΑΑΑΔ  Β        Β  ΓΑΑΑΑΑΑΑΑΑΑΑΔ  Β
    //  Β  Β                      Β  Β        Β  Β                      Β  Β
    //  Β  Β                      Β ΜΜΜΜΜΜΜ>Β                      Β  Β
    //  Β  Β                      Β  Β        Β  Β                      Β  Β
    //  Β  Β                      Β  Β        Β  Β                      Β  Β
    //  Β  ΖΑΑΑΑΑΑΑΑΑΑΑΕ  Β        Β  ΖΑΑΑΑΑΑΑΑΑΑΑΕ  Β
    //  Β  (10,40)              (90,40)Β        Β (100,400)           (900,400)Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  ΖΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΕ        ΖΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΕ
    //  ΓΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΔ        ΓΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΔ
    //  Β  (10,10)              (90,10)Β        Β (100,100)           (900,100)Β
    //  Β  ΓΑΑΑΑΑΑΑΑΑΑΑΔ  Β        Β  ΓΑΑΑΑΑΑΑΑΑΑΑΔ  Β
    //  Β  Β                      Β  Β        Β  Β                      Β  Β
    //  Β  Β                      Β ΜΜΜΜΜΜΜ>Β                      Β  Β
    //  Β  Β                      Β  Β        Β  Β                      Β  Β
    //  Β  Β                      Β  Β        Β  Β                      Β  Β
    //  Β  ΖΑΑΑΑΑΑΑΑΑΑΑΕ  Β        Β  ΖΑΑΑΑΑΑΑΑΑΑΑΕ  Β
    //  Β  (10,40)              (90,40)Β        Β (100,400)           (900,400)Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  Β                              Β        Β                              Β
    //  ΖΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΕ        ΖΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΕ
    //  200                            100,200    2000                            1000,2000 
    //  
    //   CRect page(0,0,100,200);
    //   CRect device(0,0,1000,2000);
    //   咯归阑 炼陛 林妨搁: CRect device(100,100,900,1900);
    //   咯归阑 炼陛 林妨搁: CRect device(100,100,900,1900);
    //   SetPageRect(pDC, page, device);
    BOOL SetPageRect(CDC* pDC, CRect page, CRect device);
protected:
@@ -193,9 +192,9 @@
    CLogItemArray m_liAry;
};

//厘钎 傈眉甫 包府茄促.
//厘钎甫 免仿窍扁 困秦 怖 鞘夸窍柳 臼促.
//CLogPage甫 荤侩秦档 公规窍促.
//厘钎 傈眉甫 包府茄促.
//厘钎甫 免仿窍扁 困秦 怖 鞘夸窍柳 臼促.
//CLogPage甫 荤侩秦档 公规窍促.
class CLogCtrl
{
public:

 SourceCode/Bond/BLControlsSDK/include/SortClass.h

@@ -1,4 +1,13 @@
#if !defined(AFX_SORTCLASS_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
#define AFX_SORTCLASS_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_

#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// SortClass.h : header file
//

/////////////////////////////////////////////////////////////////////////////

class CSortClass
{
@@ -37,4 +46,11 @@
            int iInt ;        
            DWORD dw;    
    };
};
};

/////////////////////////////////////////////////////////////////////////////

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

#endif // !defined(AFX_SORTCLASS_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)

 SourceCode/Bond/BLControlsSDK/include/StaticMap.h

@@ -13,7 +13,7 @@
#define ORIGIN_RIGHTBOTTOM    3

#define UM_MAP_CHANGED            5573
#define _MENU_DEFECT_LIST_ID_            8000
#define _MENU_DEFECT_LIST_ID_    8000
/////////////////////////////////////////////////////////////////////////////
// CStaticMap window
enum OriginDirection        { OD_LeftTop = 0, OD_RightTop = 1, OD_LeftBottom = 10, OD_RightBottom = 11 };
@@ -29,7 +29,7 @@

    // Operations
public:
    void                InitGlass(CWnd* pParent, int nMapWidth, int nMapHeight, int nMapMargin);    // Pixel 窜困 付柳.
    void                InitGlass(CWnd* pParent, int nMapWidth, int nMapHeight, int nMapMargin);    // Pixel 窜困 付柳.
    void                DeinitGlass();
    int                    GetMapTotalWidth()        { return m_nMapTotalWidth; }
    int                    GetMapTotalHeight()        { return m_nMapTotalHeight; }
@@ -50,7 +50,7 @@
    virtual void        RegistNoDefect()                        { }
    virtual void        Timer(UINT nIDEvent)                    { }

    // 犬措/绵家
    // 犬措/绵家
    void                IncreaseRatio();
    void                DecreaseRatio();
    void                ResetRatio();
@@ -61,7 +61,7 @@
    void                SetDisplayRect(CPoint& PointStart, CPoint& PointEnd);
    void                SetShowShot(BOOL bShow)    { m_bShowShot = bShow; }

    // 历厘
    // 历厘
    void                SaveMapToFile(CString strFileName);
    void                SetBGColor(COLORREF color) { m_clBGColor = color; }

@@ -95,7 +95,7 @@
    long                m_clBGColor;
    long                m_clPatColor;
    //////////////////////////////////////////////////////////////////////////
    // 弊府扁 沥焊
    // 弊府扁 沥焊
    HBITMAP                m_hDrawingSurface;
    BITMAPINFOHEADER    m_BMIH;
    CRect                m_RectDrawingSurface;
@@ -104,24 +104,24 @@
    OriginDirection        m_OriginDir;
    int                    m_nUnitSize;

    // Cell 弊府扁
    // Cell 弊府扁
    BOOL                m_bShowShot;

    // 犬措/绵家
    // 犬措/绵家
    CRect                m_RectShowWnd;

    double                m_dRatio;
    CPoint                m_PointWindowStart;
    BOOL                m_bDragMove;
    CPoint                m_PointDragStart;
    BOOL                m_bIsMiniMap;            // Minimap篮 犬措/绵家甫 救茄促.
    CPoint                m_PointGlassStart;        // Glass 吝 泅犁 焊咯瘤绰 康开.
    BOOL                m_bIsMiniMap;            // Minimap篮 犬措/绵家甫 救茄促.
    CPoint                m_PointGlassStart;        // Glass 吝 泅犁 焊咯瘤绰 康开.
    CPoint                m_PointGlassEnd;

    POINT                m_PointCCut[3];            //内呈钠 弊府扁 谅钎
    POINT                m_PointCCut[3];            //内呈钠 弊府扁 谅钎
    int                    m_nCCutSize;
    int                    m_nCoordGabX;            // 谅钎甫 谎副 芭府.
    int                    m_nCoordGabY;            // 谅钎甫 谎副 芭府.
    int                    m_nCoordGabX;            // 谅钎甫 谎副 芭府.
    int                    m_nCoordGabY;            // 谅钎甫 谎副 芭府.

    //{{AFX_MSG(CStaticGlass)
    afx_msg void OnPaint();

 SourceCode/Bond/BondEq/AxisSettingsDlg.cpp

@@ -210,16 +210,6 @@
        pWnd->MoveWindow(newX, newY, newWidth, newHeight);
        AdjustControlFont(pWnd, newWidth, newHeight);

        if (pWnd->IsKindOf(RUNTIME_CLASS(CComboBox))) {
            CComboBox* pComboBox = (CComboBox*)pWnd;
            pComboBox->SetItemHeight(-1, newHeight);  // -1 表示所有项的高度
        }

        if (pWnd->IsKindOf(RUNTIME_CLASS(CStatic))) {
            CStatic* pStatic = (CStatic*)pWnd;
            pStatic->ModifyStyle(0, SS_CENTER | SS_CENTERIMAGE);
        }

        // 获取下一个控件
        pWnd = pWnd->GetNextWindow();
    }
@@ -227,8 +217,21 @@

void CAxisSettingsDlg::AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight)
{
    int fontSize = nHeight - 10;
    TCHAR szClassName[256];
    GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));

    if (_tcsicmp(szClassName, _T("Static")) == 0) {
        CStatic* pStatic = (CStatic*)pWnd;
        pStatic->ModifyStyle(0, SS_CENTER | SS_CENTERIMAGE);
        return;
    }

    if (_tcsicmp(szClassName, _T("ComboBox")) == 0) {
        CComboBox* pComboBox = (CComboBox*)pWnd;
        pComboBox->SetItemHeight(-1, nHeight);  // -1 表示所有项的高度
    }

    int fontSize = nHeight - 10;
    CFont* pCurrentFont = pWnd->GetFont();
    LOGFONT logFont;
    pCurrentFont->GetLogFont(&logFont);

 SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp

@@ -82,6 +82,11 @@
        return;
    }

    if (newPassword.Compare(currentPassword) == 0) {
        EndDialog(IDCANCEL);
        return;
    }

#ifdef UNICODE
    std::string strUsername = CStringA(username);
    std::string strCurrentPassword = CStringA(currentPassword);

 SourceCode/Bond/BondEq/View/LoginDlg.cpp

@@ -109,7 +109,6 @@
void CLoginDlg::OnBnClickedChangePassword()
{
    CChangePasswordDlg changePasswordDlg;
    changePasswordDlg.DoModal();
    if (changePasswordDlg.DoModal() == IDOK) {
        m_editPassword.SetWindowText("");
    }

 SourceCode/Bond/BondEq/stdafx.h

@@ -47,17 +47,24 @@
#include "..\DatabaseSDK\include\MySQLDatabase.h"
#include "..\DatabaseSDK\include\SQLiteDatabase.h"

// 控件模块
#include "..\BLControlsSDK\include\BLControls.h"

#if defined(_WIN64)
    #if defined(_DEBUG)
        #pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Debug\\DatabaseEx.lib")
        #pragma comment(lib, "..\\BLControlsSDK\\lib\\x64\\Debug\\BLControlsD.lib")
    #else
        #pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Release\\DatabaseEx.lib")
        #pragma comment(lib, "..\\BLControlsSDK\\lib\\x64\\Release\\BLControls.lib")
    #endif
#else
    #if defined(_DEBUG)
        #pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Debug\\DatabaseEx.lib")
        #pragma comment(lib, "..\\BLControlsSDK\\lib\\Win32\\Debug\\BLControlsD.lib")
    #else
        #pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Release\\DatabaseEx.lib")
        #pragma comment(lib, "..\\BLControlsSDK\\lib\\Win32\\Release\\BLControls.lib")
    #endif
#endif