Merge branch 'feature/struct-menu-20241023' of http://1.92.128.200:3000/YXS/AppFlow into feature/struct-menu-20241023

# Conflicts:
#	CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro

CFDStruct/CFDOperatorsModel/CFDOperatorsBasicModelManager.h

@@ -8,7 +8,7 @@
 namespace ModelOper
 {
 
-    class CFDOperatorsBasicModelManager :public OperManagerBase
+    class CFDOperatorsBasicModelManager : public OperManagerBase
     {
         Q_OBJECT;
     public:

CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro

@@ -44,6 +44,8 @@ win32{
         -lFITKInterfaceFlowOF \
         -lFITKFlowOFIOHDF5 \
         -lOperatorsModel \
+#        -lCFDStructDataManager \
+
 
     Debug:CONFIG            +=  console
     Debug:DESTDIR         = ../../output/bin_d
@@ -74,7 +76,7 @@ win32{
         -lFITKInterfaceFlowOF \
         -lFITKFlowOFIOHDF5 \
         -lOperatorsModel \
-        -lCFDStructDataManager \
+#        -lCFDStructDataManager \
 
 
 

CFDStruct/CFDOperatorsModel/CFDOperatorsTimeModeManager.h

@@ -3,12 +3,12 @@
 
 //#include "OperManagerBase.h"
 #include "OperatorsModel/OperManagerBase.h"
-#include "CFDStructDataManager/CFDStructDataManager.h"
+//#include "CFDStructDataManager/CFDStructDataManager.h"
 
 namespace ModelOper
 {
 
-    class CFDOperatorsTimeModeManager :public OperManagerBase
+    class CFDOperatorsTimeModeManager : public OperManagerBase
     {
         Q_OBJECT;
     public:

CFDStruct/CFDStructGUI/CFDStructGUI.pro

@@ -32,7 +32,11 @@ win32{
         -lCUIProperty \
         -lGUIWidget \
         -lCFDOperatorsModel \
+        -lFITKAppFramework \
+        -lOperatorsModel \
         -lFITKCore \
+        -lOperatorsInterface \
+        -lFITKInterfaceGeometry \
 
 
     Debug:CONFIG            +=  console
@@ -47,7 +51,11 @@ win32{
         -lCUIProperty \
         -lGUIWidget \
         -lCFDOperatorsModel \
+        -lFITKAppFramework \
+        -lOperatorsModel \
         -lFITKCore \
+        -lOperatorsInterface \
+        -lFITKInterfaceGeometry \
 
 Debug:LIBS +=  -L$$PWD/../../Tools/Win64/SARibbon/libd/  \
                -lSARibbonBard  \

FITK_Kernel/FITKPython/FITKPython.pro

@@ -29,8 +29,6 @@ win32{
         -L../../output/bin  \
         -lFITKCore \
 
-
-
     Debug:CONFIG            +=  console
     Debug:DESTDIR         = ../../output/bin_d
     Debug:MOC_DIR         = ../../generate/FITKPython/debug/moc
@@ -45,9 +43,6 @@ win32{
         -L../../output/bin_d  \
         -lFITKCore \
 
-     
-
-
     message("Windows FITKPython generated")
 }