0920 修改读取igs路径

CAE_Solution/src/threadPool_and_statemachine/dealWith/boostjsonobject.cpp

@@ -15,7 +15,6 @@ boostJsonObject::boostJsonObject()
     sd_struct = NULL;
     sm_struct = NULL;
     ci_struct = NULL;
-    ag_struct = NULL;
     da_struct = NULL;
     usrId.clear();
     solverConfigid.clear();
@@ -66,10 +65,6 @@ boostJsonObject::~boostJsonObject()
     }
     qDeleteAll(vec_sd_struct);
 
-    if(ag_struct){
-        delete ag_struct;
-        ag_struct = NULL;
-    }
     if(da_struct){
         delete da_struct;
         da_struct = NULL;
@@ -150,7 +145,6 @@ boostJsonObject *boostJsonObject::operator=(boostJsonObject *object)
     this->vec_sd_struct = object->vec_sd_struct;
     this->sm_struct = object->sm_struct;
     this->ci_struct = object->ci_struct;
-    this->ag_struct = object->ag_struct;
     this->da_struct = object->da_struct;
     this->da_struct->clrParam = object->da_struct->clrParam;
     this->da_struct->hexaParam = object->da_struct->hexaParam;
@@ -393,12 +387,9 @@ void boostJsonObject::FromParamJson(string param)
         }
         ci_struct->hideZones = root.get<std::string>("hideZones");
         ci_struct->isVolume = root.get<std::string>("isVolume");
-    }else if(this->action == "readIgs")
-    {
-        ag_struct = new acis_geo_struct();
-        ag_struct->geoPath = root.get<std::string>("geometryFile");
     }else if(this->action == "meshSplit"){
         da_struct = new DPM_ADIParam_struct();
+        da_struct->geoPath = root.get<std::string>("geometryFile");
         da_struct->clrParam = new CleanerParam_struct();
         da_struct->hexaParam = new HexaParam_struct();
         da_struct->hybridParam = new HybridParam_struct();

CAE_Solution/src/threadPool_and_statemachine/dealWith/boostjsonobject.h

@@ -42,7 +42,6 @@ public:
     streamDisplay_struct* sm_struct;//stream
     contourinimationw_struct* ci_struct;//contourinimation;
 
-    acis_geo_struct* ag_struct;
     DPM_ADIParam_struct* da_struct;
 };
 

CAE_Solution/src/threadPool_and_statemachine/dealWith/display_struct.h

@@ -102,14 +102,6 @@ public:
 };
 
 //geometry类
-class acis_geo_struct
-{
-public:
-    acis_geo_struct(){}
-    ~acis_geo_struct(){}
-    string geoPath;
-};
-
 class surfParam_struct
 {
 public:
@@ -219,6 +211,7 @@ public:
     }
 
     string strResultFormat;
+    string geoPath;
     surfParam_struct* surfParam;
     int style;
     CleanerParam_struct* clrParam;

CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -766,7 +766,7 @@ bool handlePool::result_readIgsFile(boostJsonObject *object_, QVTKRenderer *rend
     Q_UNUSED(render_);
     cmdMainProcess* cmdp = new cmdMainProcess();
     try{
-    if(cmdp->CreateProcess_(object_->ag_struct->geoPath,"")){//unuse xmlpath
+    if(cmdp->CreateProcess_(object_->da_struct->geoPath,"")){//unuse xmlpath
         return true;
     }else{
         return false;