|
@@ -18,6 +18,8 @@ static char gstr_fromlane[256];
|
|
|
static char gstr_toroad[256];
|
|
|
static char gstr_tolane[256];
|
|
|
|
|
|
+static char gstr_grpcserver[256];
|
|
|
+
|
|
|
void print_useage()
|
|
|
{
|
|
|
std::cout<<" -i --input $xodrfile : set input file path. eq. -i d:/lk.rd5"<<std::endl;
|
|
@@ -26,6 +28,7 @@ void print_useage()
|
|
|
std::cout<<" -b --from lane . eq. -b -1"<<std::endl;
|
|
|
std::cout<<" -c --to road. eq. -c 3"<<std::endl;
|
|
|
std::cout<<" -d --to lane . eq. -d -1"<<std::endl;
|
|
|
+ std::cout<<" -s --grpcserver set server grpc ip & port. eq. -s 111.33.136.149:50091"<<std::endl;
|
|
|
std::cout<<" -h --help print help"<<std::endl;
|
|
|
}
|
|
|
|
|
@@ -39,7 +42,7 @@ int GetOptLong(int argc, char *argv[]) {
|
|
|
// 第几个元素的描述,即是long_opts的下标值
|
|
|
int option_index = 0;
|
|
|
// 设置短参数类型及是否需要参数
|
|
|
- const char *optstring = "i:o:a:b:c:d:h";
|
|
|
+ const char *optstring = "i:o:a:b:c:d:s:h";
|
|
|
|
|
|
// 设置长参数类型及其简写,比如 --reqarg <==>-r
|
|
|
/*
|
|
@@ -62,6 +65,7 @@ int GetOptLong(int argc, char *argv[]) {
|
|
|
{"fromlane", required_argument, NULL, 'b'},
|
|
|
{"toroad", required_argument, NULL, 'c'},
|
|
|
{"tolane", required_argument, NULL, 'd'},
|
|
|
+ {"grpcserver", required_argument, NULL, 's'},
|
|
|
{"help", no_argument, NULL, 'h'},
|
|
|
// {"optarg", optional_argument, NULL, 'o'},
|
|
|
{0, 0, 0, 0} // 添加 {0, 0, 0, 0} 是为了防止输入空值
|
|
@@ -98,6 +102,9 @@ int GetOptLong(int argc, char *argv[]) {
|
|
|
case 'd':
|
|
|
strncpy(gstr_tolane,optarg,255);
|
|
|
break;
|
|
|
+ case 's':
|
|
|
+ strncpy(gstr_grpcserver,optarg,255);
|
|
|
+ break;
|
|
|
case 'h':
|
|
|
print_useage();
|
|
|
nRtn = 1; //because use -h
|
|
@@ -163,6 +170,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
|
snprintf(gstr_inputpath,256," ");
|
|
|
snprintf(gstr_outputpath,256," ");
|
|
|
+ snprintf(gstr_grpcserver,256," ");
|
|
|
|
|
|
snprintf(gstr_fromroad,256,"1");
|
|
|
snprintf(gstr_toroad,256,"3");
|
|
@@ -249,6 +257,11 @@ int main(int argc, char *argv[])
|
|
|
int nres;
|
|
|
|
|
|
std::string strserverstr = GetServerstr();
|
|
|
+ if(strncmp(gstr_grpcserver , " ",255) != 0)
|
|
|
+ {
|
|
|
+ strserverstr = gstr_grpcserver;
|
|
|
+ }
|
|
|
+ std::cout<<" grpcserver: "<<strserverstr<<std::endl;
|
|
|
carmakercvt * pcvt = new carmakercvt(strserverstr);
|
|
|
nres = pcvt->GetRes(strinputname,stroutputname,strcmd,pstr_ptr,ninputsize,pout_ptr,noutputsize);
|
|
|
|