Bläddra i källkod

1120 windows同步

caizm 1 år sedan
förälder
incheckning
1e82369dee
1 ändrade filer med 26 tillägg och 19 borttagningar
  1. 26 19
      CAE_Solution/src/acis/cmdmainprocess.cpp

+ 26 - 19
CAE_Solution/src/acis/cmdmainprocess.cpp

@@ -265,7 +265,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     // If USE_HEXA is set to 1,
     // then both APPLY_PERIODICITY and USE_LOCAL_PHYSICAL_SIZE are set to 0
     //iniACIS();
-    emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log","1.--read cad surf parameter"));
+    emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log","1.--read cad surf parameter--"));
     //1.--read cad surf parameter
     //Get ENTITY_LIST;
     ENTITY_LIST Whole_ents;
@@ -344,12 +344,12 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
 
         ENTITY_LIST testEnt=ent;
         exit_on_bad_outcome(api_n_body_unite(testEnt, false));
-        printf("Whole_ents after unite is : %dthen use stitch function\n", testEnt.count());
+        printf("Whole_ents after unite is : %d,then use stitch function\n", testEnt.count());
         //--
         msg_str.clear();
         msg_str.append("Whole_ents after unite is : ");
         msg_str.append(to_string(testEnt.count()));
-        msg_str.append(",then use stitch function");
+        msg_str.append("\n start use stitch function\n");
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
         if (testEnt.count()==1)
         {
@@ -402,9 +402,10 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     printf("Whole_ents is : %d\n", Whole_ents.count());
     //--
     msg_str.clear();
-    msg_str.append("Load Geometry OK!Whole_ents is : ");
+    msg_str.append("Load Geometry OK!\n Whole_ents is : ");
     msg_str.append(to_string(Whole_ents.count()));
     msg_str.append(";");
+    msg_str.append("                 \n");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     ENTITY_LIST ents;
     ents = Whole_ents;
@@ -415,7 +416,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     printf("face count : %d\n", face_list.count());
     //--
     msg_str.clear();
-    msg_str.append("face count : ");
+    msg_str.append("**face count : ");
     msg_str.append(to_string(face_list.count()));
     msg_str.append(";");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
@@ -424,7 +425,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     printf("edge count is : %d\n", edge_list.count());
     //--
     msg_str.clear();
-    msg_str.append("edge count is: ");
+    msg_str.append("**edge count is: ");
     msg_str.append(to_string(edge_list.count()));
     msg_str.append(";");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
@@ -435,9 +436,10 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     printf("Cells Count: %d\n", cells.count());
     //--
     msg_str.clear();
-    msg_str.append("Cells count is: ");
+    msg_str.append("**Cells count is: ");
     msg_str.append(to_string(cells.count()));
-    msg_str.append(";");
+    msg_str.append(";\n");
+    msg_str.append("                 \n");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     //const char*cpName = ((ATTRIB_GEN_STRING *)tNAME)->value();
     //--test end
@@ -445,7 +447,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //2.--read cad surf parameter
     //--
     msg_str.clear();
-    msg_str.append("2.--read cad surf parameter");
+    msg_str.append("2.--read cad surf parameter--");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     QString dDir=QDir::currentPath();
     printf("path:%s\n",dDir.toLatin1().data());
@@ -467,19 +469,21 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //3.--create surf.0
     //--
     msg_str.clear();
-    msg_str.append("3.--create surf.0");
+    msg_str.append("                 \n");
+    msg_str.append("3.--create surf--");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     Createcadsurf(ents, cadsurf_);
     //4.--Set parameters and create mesh
     //--
     msg_str.clear();
-    msg_str.append("4.--Set parameters and create mesh");
+    msg_str.append("                 \n");
+    msg_str.append("4.--Set parameters and create mesh--");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     cadsurfParams_ = setADIParamTo3dpm(ADIParam_);
     //-4.1-size map for vol
     //--
     msg_str.clear();
-    msg_str.append("4.1-size map for vol");
+    msg_str.append("size map for vol");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
 
     CreateLocalSizeMap();
@@ -487,7 +491,8 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //5.--output surfmesh with cleaner or not
     //--
     msg_str.clear();
-    msg_str.append("5.--output surfmesh with cleaner or not");
+    msg_str.append("                 \n");
+    msg_str.append("5.--output surfmesh with cleaner or not--");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     if(!OutPutSurfMesh(cadsurf_, surfMesh_, &cadsurfParams_))return 1;
 
@@ -508,7 +513,8 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //6. Save the surface mesh to .mesh (optional)
     //--
     msg_str.clear();
-    msg_str.append("6. Save the surface mesh to .mesh (optional)");
+    msg_str.append("                 \n");
+    msg_str.append("6.--Save the surface mesh to .mesh (optional)--");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     string strName = get_uuid();
     string dirPath = get_file_path(object->da_struct->geoPath);
@@ -543,7 +549,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         {
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
-            msg_str.append("result file save failed!");
+            msg_str.append("**result file save failed!**");
         }
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
@@ -553,7 +559,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         if(true==crw->WirteBDFFoamFile(surfMesh_,(appPath+"/"+strName).c_str())){
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
-            msg_str.append("result file save failed!");
+            msg_str.append("**result file save failed!**");
         }
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
@@ -564,7 +570,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         {
             msg_str.append((appPath+"/"+strName).c_str());
         }else{
-            msg_str.append("result file save failed!");
+            msg_str.append("**result file save failed!**");
         }
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("path",msg_str));
     }
@@ -579,7 +585,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //-6.1Deletesome Clean up MeshGems Sizemaps
     //--
     msg_str.clear();
-    msg_str.append("6.1Deletesome Clean up MeshGems Sizemaps");
+    msg_str.append("  Deletesome Clean up MeshGems Sizemaps");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     if (szmp_iso_face_t_)
         meshgems_sizemap_delete(szmp_iso_face_t_);
@@ -590,7 +596,8 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //7. Termination
     //--
     msg_str.clear();
-    msg_str.append("7. Termination");
+    msg_str.append("7.--Termination--\n");
+    msg_str.append("*-----------------Finished-----------------*\n");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     //closeACIS();
     if(crw!=NULL)