1120update

CAE_Solution/src/acis/cmdmainprocess.cpp

@@ -530,47 +530,43 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         strName = strName+".ugrid";
         msg_str.clear();
         if(true==crw->WirteUgridFoamFile(surfMesh_,(appPath+"/"+strName).c_str())){
-            msg_str.append("result file save path=");
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
             msg_str.append("result file save failed!");
         }
-        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
+        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
     else if (ADIParam_.strResultFormat == ".vtk") {
         strName = strName+".vtk";
         msg_str.clear();
         if(true==crw->WirteVtkFoamFile(surfMesh_,(appPath+"/"+strName).c_str()))
         {
-            msg_str.append("result file save path=");
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
             msg_str.append("result file save failed!");
         }
-        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
+        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
     else if (ADIParam_.strResultFormat == ".bdf") {
         strName = strName+".bdf";
         msg_str.clear();
         if(true==crw->WirteBDFFoamFile(surfMesh_,(appPath+"/"+strName).c_str())){
-            msg_str.append("result file save path=");
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
             msg_str.append("result file save failed!");
         }
-        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
+        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
     else if (ADIParam_.strResultFormat == ".neu") {
         strName = strName+".neu";
         msg_str.clear();
         if(true==crw->WriteNeuFoamFile(surfMesh_,(appPath+"/"+strName).c_str()))
         {
-            msg_str.append("result file save path=");
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
             msg_str.append("result file save failed!");
         }
-        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
+        emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
 
 
@@ -660,7 +656,8 @@ string cmdMainProcess::get_file_path(string &path)
     int num = path.find_last_of('/');
     path = path.substr(0,num);
     int num2 = path.find_last_of('/');
-    return path.substr(num2,num-num2+1);
+    path = path.substr(num2+1);
+    return path;
 }
 
 /*

CAE_Solution/src/component/manager/geometrymanager.cpp

@@ -126,6 +126,9 @@ void GeometryManager::DisplayGeometry(QVTKRenderer *qvtkRenderer)
     qvtkRenderer_ = qvtkRenderer;
     vtkVisGeoEnts_ = new VtkVisGeometry(qvtkRenderer);
     setEdgesVisible_VTK(true);
+    //setVerticesVisible_VTK(true);
+    //setFacesVisible_VTK(true);
+    //setBodiesVisible_VTK(true);
 }
 
 /**
@@ -133,6 +136,7 @@ void GeometryManager::DisplayGeometry(QVTKRenderer *qvtkRenderer)
   *
   * @param[in] true: visible, false: invisible.
   * @return
+  *
   * @author: shiting
   * @date: 20230814
   * @reviser:

CAE_Solution/src/threadPool_and_statemachine/dealWith/boostjsonobject.cpp

@@ -635,8 +635,13 @@ string boostJsonObject::ToJson(string type, string info)
     root.put("usrId",this->usrId);
     root.put("solverConfigid",this->solverConfigid);
     root.put("proId",this->proId);
-    root.put("action",this->action);
-    root.put(type,info);
+    if(type=="log"){
+        root.put("action",this->action);
+        root.put(type,info);
+    }else if(type=="path"){
+        root.put("action","meshResultFile");
+        root.put("path",info);
+    }
     root.put("paramJson","");
     stringstream mmsg;
     boost::property_tree::json_parser::write_json (mmsg,root);