1, 增加水质模拟

EPNAET2/epanet.c

@@ -2892,18 +2892,18 @@ char* getTmpName(char* fname)
       // --- if user supplied the name of a temporary directory,
       //     then make it be the prefix of the full file name
       n = (int)strlen(TmpDir);
-      if ( n > 0 )
-      {
-          strcpy(fname, TmpDir);
-          if ( fname[n-1] != '\\' ) strcat(fname, "\\");
-      }
-
-      // --- otherwise, use the relative path notation as the file name
-      //     prefix so that the file will be placed in the current directory
-      else
-      {
-          strcpy(fname, ".\\");
-      }
+      //if ( n > 0 )
+      //{
+      //    strcpy(fname, TmpDir);
+      //    if ( fname[n-1] != '\\' ) strcat(fname, "\\");
+      //}
+
+      //// --- otherwise, use the relative path notation as the file name
+      ////     prefix so that the file will be placed in the current directory
+      //else
+      //{
+      //    strcpy(fname, ".\\");
+      //}
 
       // --- now add the prefix to the file name
       strcat(fname, name);

pandaAnalysis/CivHydrCalc.cpp

@@ -121,7 +121,6 @@ bool CivHydrCalc::qualitySimulation(char* inpFile, char* rptFile, char* binOutFi
         return false;
     }
     
-    
     // 根据类型 更改值
     errcode = ENinitH(EN_SAVE);
     if (errcode > 0)
@@ -192,7 +191,7 @@ bool CivHydrCalc::qualitySimulation(char* inpFile, char* rptFile, char* binOutFi
     ENclose();
 
     // 更新数据
-    if (mResultCache.updateToDb(mDbConn))
+    if (!mResultCache.updateToDb(mDbConn))
         return false;
 
 
@@ -214,6 +213,9 @@ bool CivHydrCalc::exportInp(char* fileName)
 
    bool pattern = mDbConn->createTable(PATTERNTABLE, "public", CivTableTemp::PATTERN_TABLE);
    bool  cii = mDbConn->createTable(OPTIONTTABLE, "public", CivTableTemp::PARAMETER_TABLE);
+   bool curve = mDbConn->createTable(CURVETABLE, "public", CivTableTemp::CURVE_TABLE);
+   bool node = mDbConn->createTable(NODERESULTTABLE, "public", CivTableTemp::NODE_TABLE);
+   bool link = mDbConn->createTable(PIPERESULTTABLE, "public", CivTableTemp::PIPE_TABLE);
 
     // 获取表格
     Tables tables = mDbConn->getTables(mNetname);

pandaAnalysis/CivHydrFuncInter.cpp

@@ -8,9 +8,9 @@ bool DLLEXPORT simulation(char* uri, char* netName, char* flag)
     char rptR[256];
     char outBinFile[256];
 
-    strcpy_s(fileName, "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\funcDemo\\test.inp");
-    strcpy_s(rptR, "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\funcDemo\\test.rpt");
-    strcpy_s(outBinFile, "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\funcDemo\\test.bin");
+    strcpy_s(fileName, "test.inp");
+    strcpy_s(rptR, "test.rpt");
+    strcpy_s(outBinFile, "test.bin");
 
     CivHydrCalc* calc = new CivHydrCalc(uri, netName);
 

pandaAnalysis/CivInpDirector.cpp

@@ -10,4 +10,19 @@ void CivInpDirector::create(CivBuilder* builder)
 	builder->buildPump();
 	builder->buildVavle();
 	builder->buildEmitter();
+	builder->buildPatterns();
+	builder->buildParamter();
+	builder->buildCoordnates();
+	builder->buildVertices();
+	builder->buildLabels();
+	builder->buildTags();
+	builder->buildBackDrop();
+	builder->buildQuality();
+	builder->buildSources();
+	builder->buildMixing();
+	builder->buildCurves();
+	builder->buildStatus();
+	builder->buildControls();
+	builder->buildRules();
+	builder->buildDemands();
 }
\ No newline at end of file

pandaDbManager/CivDbConnection.cpp

@@ -109,8 +109,7 @@ bool CivDbConnection::updateNode(const NodeResultItems& nodeItems)
 
     std::stringstream os;
     NodeFieldName filedNames;
-    if (createTable(NODERESULTTABLE, "public", CivTableTemp::NODE_TABLE))
-    {     
+
     os << "INSERT INTO public."<< NODERESULTTABLE<<" ( ";
     os << filedNames.Number<<",";
     os<< filedNames.dDemand << ",";
@@ -164,7 +163,7 @@ bool CivDbConnection::updateNode(const NodeResultItems& nodeItems)
     os.str("");
     if (!execSql(sql))
         return false;
-     }
+     
     
     return true;
 }
@@ -177,8 +176,6 @@ bool CivDbConnection::updateLink(const LinkResultItems& lineItems)
     std::stringstream os;
     LinkFiledName filedNames;
     std::string currData = CurrentDate;
-    if (createTable(PIPERESULTTABLE, "public", CivTableTemp::PIPE_TABLE))
-    {
 
     os<< "INSERT INTO public."<< PIPERESULTTABLE <<"( ";
     os<< filedNames.szNo<< ",";
@@ -238,8 +235,6 @@ bool CivDbConnection::updateLink(const LinkResultItems& lineItems)
     if (!execSql(sql))
         return false;
 
-    }
-   
     return true;
 }