1120update

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;
@@ -279,9 +279,9 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         ENTITY_LIST readRowEnt = geo->GetEntities();
         //---------
 
-        msg_str = "Read all entity body count is ";
+        msg_str = "  read all entity body count is ";
         msg_str.append(to_string(readRowEnt.count()));
-        msg_str.append(";");
+        msg_str.append(".");
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
 
         //printf("Read all entity body count is %d;\n", readRowEnt.count());
@@ -293,9 +293,9 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         printf("\n Body's count is %d;", ent.count());
         //--
         msg_str.clear();
-        msg_str.append("Body's count is ");
+        msg_str.append("  body's count is ");
         msg_str.append(to_string(ent.count()));
-        msg_str.append(";");
+        msg_str.append(".");
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
 
         //--获取边的信息
@@ -347,9 +347,9 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         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("  whole_ents after unite is : ");
         msg_str.append(to_string(testEnt.count()));
-        msg_str.append("\n start use stitch function\n");
+        msg_str.append(".\n  start use stitch function.");
         emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
         if (testEnt.count()==1)
         {
@@ -364,9 +364,9 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
             printf("Whole_ents after attach is : %d\n", testEnt.count());
             //--
             msg_str.clear();
-            msg_str.append("Whole_ents after attach is : ");
+            msg_str.append("  whole_ents after attach is : ");
             msg_str.append(to_string(testEnt.count()));
-            msg_str.append(";");
+            msg_str.append(".");
             emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
             /*for (int kk = 0; kk < ent.count(); kk++)
             {
@@ -382,9 +382,9 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
             printf("geomStitch count is %d;\n ", Whole_ents.count());
             //--
             msg_str.clear();
-            msg_str.append("geomStitch count is ");
+            msg_str.append("  geomStitch count is ");
             msg_str.append(to_string(Whole_ents.count()));
-            msg_str.append(";");
+            msg_str.append(".");
             emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
         }
         //--
@@ -398,14 +398,13 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     }else {//self create
         Whole_ents = CreateSelfGeo();
     }
-    printf("Load Geometry OK!"); //
+    printf("  load geometry ok!"); //
     printf("Whole_ents is : %d\n", Whole_ents.count());
     //--
     msg_str.clear();
-    msg_str.append("Load Geometry OK!\n 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");
+    msg_str.append(".");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     ENTITY_LIST ents;
     ents = Whole_ents;
@@ -416,18 +415,18 @@ 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(";");
+    msg_str.append(".");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     ENTITY_LIST edge_list;
     api_get_edges(Whole_ents[0], edge_list);
     printf("edge count is : %d\n", edge_list.count());
     //--
     msg_str.clear();
-    msg_str.append("**edge count is: ");
+    msg_str.append("  edge count: ");
     msg_str.append(to_string(edge_list.count()));
-    msg_str.append(";");
+    msg_str.append(".");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
 
     //api_ct_get_all_cells(face_list[0], cells);
@@ -436,10 +435,9 @@ 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: ");
     msg_str.append(to_string(cells.count()));
-    msg_str.append(";\n");
-    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
@@ -452,11 +450,11 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     QString dDir=QDir::currentPath();
     printf("path:%s\n",dDir.toLatin1().data());
     //--
-    msg_str.clear();
-    msg_str.append("path:");
-    msg_str.append(dDir.toLatin1().data());
-    msg_str.append(";");
-    emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
+//    msg_str.clear();
+//    msg_str.append("  path:");
+//    msg_str.append(dDir.toLatin1().data());
+//    msg_str.append(".");
+//    emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     ADIParam_.useDefaultParam();
     CRWriteFile* crw = new CRWriteFile();
 
@@ -469,21 +467,19 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //3.--create surf.0
     //--
     msg_str.clear();
-    msg_str.append("                 \n");
-    msg_str.append("3.--create surf--");
+    msg_str.append("\n3.--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("                 \n");
-    msg_str.append("4.--Set parameters and create mesh--");
+    msg_str.append("\n4.--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("size map for vol");
+    msg_str.append("  size map for vol.");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
 
     CreateLocalSizeMap();
@@ -491,8 +487,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //5.--output surfmesh with cleaner or not
     //--
     msg_str.clear();
-    msg_str.append("                 \n");
-    msg_str.append("5.--output surfmesh with cleaner or not--");
+    msg_str.append("\n5.--output surfmesh with cleaner or not--");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     if(!OutPutSurfMesh(cadsurf_, surfMesh_, &cadsurfParams_))return 1;
 
@@ -500,9 +495,9 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     printf("style=%d\n", ADIParam_.style);
     //--
     msg_str.clear();
-    msg_str.append("style=");
+    msg_str.append("  style=");
     msg_str.append(to_string(ADIParam_.style));
-    msg_str.append(";");
+    msg_str.append(".");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     if(ADIParam_.style)
     {
@@ -513,8 +508,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //6. Save the surface mesh to .mesh (optional)
     //--
     msg_str.clear();
-    msg_str.append("                 \n");
-    msg_str.append("6.--Save the surface mesh to .mesh (optional)--");
+    msg_str.append("\n6.--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);
@@ -538,7 +532,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
         if(true==crw->WirteUgridFoamFile(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));
     }
@@ -580,12 +574,12 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     printf("Successfully wrote SurfMesh to .mesh format\n");
     //--
     msg_str.clear();
-    msg_str.append("Successfully wrote SurfMesh to .mesh format");
+    msg_str.append("  successfully wrote surfMesh to .mesh format.");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     //-6.1Deletesome Clean up MeshGems Sizemaps
     //--
     msg_str.clear();
-    msg_str.append("  Deletesome 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_);
@@ -596,7 +590,7 @@ bool cmdMainProcess::CreateProcess_(string pathGeo, string pathParam)
     //7. Termination
     //--
     msg_str.clear();
-    msg_str.append("7.--Termination--\n");
+    msg_str.append("\n7.--Termination--\n");
     msg_str.append("*-----------------Finished-----------------*\n");
     emit LogMsg::getInstance()->send_to_sendClient(object->ToJson("log",msg_str));
     //closeACIS();