添加sxtwl的月干支与二十四节气关联

Author: taynpg

.vscode/settings.json

@@ -1,11 +1,11 @@
 {
    "files.autoSave": "onFocusChange",
-   "editor.fontSize": 14,
-   "editor.fontFamily": "'FiraCode Nerd Font Mono', 'FiraCode Nerd Font Mono', 'FiraCode Nerd Font Mono'",
+   "editor.fontSize": 16,
+   "editor.fontFamily": "'Operator Mono Lig', 'Operator Mono Lig', 'Operator Mono Lig'",
    "cmake.configureOnOpen": true,
    "cmake.debugConfig": {
        "console": "integratedTerminal",
-       "args": ["-t", "3", "-d", "9999-1-1-1-1-1"]
+       "args": ["-t", "1", "-d", "1994-6-6-3-5-0"]
    },
    "cmake.generator": "Ninja",
    "cmake.options.statusBarVisibility": "visible",

CMakeLists.txt

@@ -6,7 +6,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (MSVC)
     add_compile_options(/source-charset:utf-8)
-    add_compile_options(/wd4018) #有符号与无符号的比较 （主要作用与三方库）
+    # 以下抑制，主要作用与三方库。
+    add_compile_options(/wd4018) #有符号与无符号的比较
+    add_compile_options(/wd4800) #将值强制为布尔值“true”或“false”(性能警告)
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_SYSTEM_NAME MATCHES "Windows")

box_calendar/calendar_base.cpp

@@ -43,6 +43,20 @@ CDate& CDate::operator=(const CDate& date)
     return *this;
 }
 
+bool CDate::operator!=(const CDate& date)
+{
+    if (this->m_nYear != date.m_nYear) {
+        return true;
+    }
+    if (this->m_nMon != date.m_nMon) {
+        return true;
+    }
+    if (this->m_nDay != date.m_nDay) {
+        return true;
+    }
+    return false;
+}
+
 CDateTime::CDateTime(const CDate& rh)
 {
     m_date.m_nYear = rh.m_nYear;
@@ -90,22 +104,25 @@ CCalenderBase* CCalenderFactory::creatInstance(CalendarType etype)
     CCalenderBase* pResult = nullptr;
 
     switch (etype) {
-    case CALENDAR_V1: {
-        pResult = new CCalenderV1();
-        break;
-    }
-    case CALENDAR_V2: {
-        pResult = new CCalenderV2();
-        break;
-    }
-    default:
-        break;
+        case CALENDAR_V1: {
+            pResult = new CCalenderV1();
+            break;
+        }
+        case CALENDAR_V2: {
+            pResult = new CCalenderV2();
+            break;
+        }
+        default:
+            break;
     }
     return pResult;
 }
 
 // 释放内存
-void CCalenderFactory::freeCalender(CCalenderBase* pCalender) { delete pCalender; }
+void CCalenderFactory::freeCalender(CCalenderBase* pCalender)
+{
+    delete pCalender;
+}
 
 CCalenderBase::CCalenderBase() = default;
 
@@ -252,4 +269,4 @@ CGanZhi& CGanZhi::operator=(const CGanZhi& ganzhi)
     this->m_nYZhi = ganzhi.m_nYZhi;
     return *this;
 }
-}   // namespace cppbox
+}  // namespace cppbox

box_calendar/calendar_base.h

@@ -52,6 +52,7 @@ struct CPP_CALENDAR_API CDate {
     CDate(int y, int m, int d);
     CDate(const CDate& date);
     CDate& operator=(const CDate& date);
+    bool operator!=(const CDate& date);
     int    m_nYear = 0;
     int    m_nMon = 0;
     int    m_nDay = 0;

box_calendar/calendar_v2.cpp

@@ -50,8 +50,27 @@ bool CCalenderV2::setDateTime(const CDateTime& datetime)
             break;
         }
     }
+    checkMonthGZ();
     return true;
 }
+
+// 根据节气时间修正月干支
+void CCalenderV2::checkMonthGZ()
+{
+    auto ck = [&](const CDateTime& datetime) {
+        if (m_datetime.m_date != datetime.m_date) {
+            return ;
+        }
+        int df = getDiffByTwoTime(m_datetime.m_time, datetime.m_time);
+        if (df < 0) {
+            m_sizhu.m_nMGan = CCalenderBase::getRemainder(10, m_sizhu.m_nMGan - 1);
+            m_sizhu.m_nMZhi = CCalenderBase::getRemainder(12, m_sizhu.m_nMZhi - 1);
+        }
+    };
+    ck(m_first.datetime);
+    ck(m_second.datetime);
+}
+
 // 获取前一天
 void CCalenderV2::getPreDay(CDateTime& datetime) { getPreDay(datetime.m_date); }
 

box_calendar/calendar_v2.h

@@ -40,6 +40,8 @@ class CCalenderV2 : public CCalenderBase
     void sxday2DateTimeLunar(Day* day, CDate& date);
     void sxday2DateTimeSolar(Day* day, CDate& date);
     int  roundDouble(double number);
+    // 根据节气时间修正月干支
+    void checkMonthGZ();
 
 private:
     Day* day_{};