From 4c4ab3794ed67aea4edb0de2ed0bcad89dd38942 Mon Sep 17 00:00:00 2001 From: kradchen Date: Thu, 19 Sep 2024 15:36:10 +0800 Subject: [PATCH] feat: Change execute input args --- src/main.cxx | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/main.cxx b/src/main.cxx index 73a261e..8ecd2d2 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -25,37 +25,33 @@ int main(int argc, char *argv[]) { int argNum = 5; std::vector args(argNum); - args[0] = ""; - args[1] = "/home/sun/20230418T145123/"; - args[2] = "/home/sun/20230418T141000/"; - args[3] = Recon::DEFAULT_OUTPUT_PATH; - args[4] = Recon::DEFAULT_CONFIG_PATH; + args[0] = "/home/AScans_Data/CAS0.1Phantom/20230823T165617/"; + args[1] = "/home/AScans_Data/CAS0.1Phantom/20230823T171851/"; + args[2] = "/home/krad/Storage/DICOM/00e04b741e9f_20240619T145752/"; + args[3] = Recon::DEFAULT_CONFIG_PATH; argc = argc <= argNum? argc-1 : argNum; for (int i = 0; i < argc; i++) { args[i] = argv[i+1]; } - std::string outPutPath = args[3]; + std::string outPutPath = args[2]; std::string directoryPath = outPutPath; auto defaultLogger = getLogger("Main",outPutPath.data()); spdlog::set_default_logger(defaultLogger); - std::string ReconID = args[0]; - ReconID = ReconID=="none"?"":ReconID; RECON_INFO("Read UR Args ====================="); - RECON_INFO("ReconID:{0}",ReconID); - if(args[1].empty()) + if(args[0].empty()) { RECON_INFO("No reconstruction data."); return -2; } - std::string configPath = Recon::fixPathSlash(args[4]); + std::string configPath = Recon::fixPathSlash(args[3]); Recon::initalizeConfig(configPath); - if( args[2].empty() && Recon::transParams::runTransmissionReco) + if( args[1].empty() && Recon::transParams::runTransmissionReco) { RECON_INFO("Running transmission reconstruction, but no refrence data."); return -3; } -RECON_INFO("configPath:{0}",configPath); + RECON_INFO("configPath:{0}",configPath); outPutPath = Recon::fixPathSlash(outPutPath); @@ -65,25 +61,20 @@ RECON_INFO("configPath:{0}",configPath); RECON_INFO("Output directory is not valid."); return -4; } - RECON_INFO("outPutPath:{0}",directoryPath); - std::string dataPath = Recon::fixPathSlash(args[1]); + RECON_INFO("outPutPath:{0}",outPutPath); + std::string dataPath = Recon::fixPathSlash(args[0]); RECON_INFO("dataPath:{0}",dataPath); - std::string dataRefPath = Recon::fixPathSlash(args[2]); + std::string dataRefPath = Recon::fixPathSlash(args[1]); RECON_INFO("dataRefPath:{0}",dataRefPath); RECON_INFO("UR Args End======================="); RECON_INFO("UR Start"); - Recon::notifyStart(ReconID); int exitcode = Recon::startReconstructions(dataPath, dataRefPath, outPutPath); if (exitcode == 0) { RECON_INFO("UR Finish"); - if (!Recon::notifyFinish()) { - RECON_ERROR("Notify Finish failed!"); - return -100; - } return exitcode; } else{ - return exitcode; + return exitcode; } }