Bladeren bron

0705 修改动画结构体

caizm 2 jaren geleden
bovenliggende
commit
77799b5fc7

+ 2 - 0
CAE_Solution/src/threadPool_and_statemachine/dealWith/boostjsonobject.cpp

@@ -374,6 +374,7 @@ void boostJsonObject::FromParamJson(string param)
             sf_struct->showhidestate = root.get<bool>("showHideState");
         }
         ci_struct->hideZones = root.get<std::string>("hideZones");
+        ci_struct->isVolume = root.get<std::string>("isVolume");
     }
 }
 
@@ -424,6 +425,7 @@ string boostJsonObject::ToJson(string type, QMap<QString, string> map_, int num)
         root.put("img",map_["img"]);
         root.put("step",num);
         root.put("animationType",map_["animationType"]);
+        root.put("isVolume",map_["isVolume"]);
     }
     root.put("paramJson","");
     stringstream mmsg;

+ 1 - 0
CAE_Solution/src/threadPool_and_statemachine/dealWith/display_struct.h

@@ -98,6 +98,7 @@ public:
     vector<int> steps;
     vector<string> filenames;
     string hideZones;
+    string isVolume;
 };
 
 #endif // DISPLAY_STRUCT_H

+ 1 - 0
CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -1023,6 +1023,7 @@ void handlePool::send_picture(boostJsonObject *object, QVTKRenderer *render_, in
         QMap<QString,string> map;
         map["img"] = img_;
         map["animationType"] = object->ci_struct->displaytype;
+        map["isVolume"] = object->ci_struct->isVolume;
         std::string json_ = object->ToJson("img",map,step);
         emit sendImg_handlePoolToSendstate(json_);//信号
     }