Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set default output filename to match base path of input #82

Merged
merged 6 commits into from
Nov 19, 2021
Merged

Set default output filename to match base path of input #82

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04e3673
Add option to skip parsing of syncdata
kspaceKelvin Nov 6, 2021
7ea2b50
Change default output file name to match input file name but with h5 …
kspaceKelvin Nov 7, 2021
5265832
Fixed default filename implementation to be human readable and use th…
dchansen Nov 7, 2021
a3a036b
Merge branch 'ismrmrd:master' into set_default_output
kspaceKelvin Nov 7, 2021
d1752d3
Merge branch 'master' into set_default_output
kspaceKelvin Nov 15, 2021
ec51eb5
Made the default output name explicit
dchansen Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <boost/program_options.hpp>
namespace po = boost::program_options;

#include <boost/filesystem.hpp>
#include <boost/locale/encoding_utf.hpp>
using boost::locale::conv::utf_to_utf;

Expand Down Expand Up @@ -440,7 +441,6 @@ int main(int argc, char* argv[]) {

std::string schema_file_name;

std::string ismrmrd_file;
std::string ismrmrd_group;
std::string date_time = get_date_time_string();

Expand Down Expand Up @@ -472,7 +472,7 @@ int main(int argc, char* argv[]) {
("pMapStyle,x", po::value<std::string>(&parammap_xsl), "<Parameter stylesheet XSL file>")
("user-map", po::value<std::string>(&usermap_file), "<Provide a parameter map XML file>")
("user-stylesheet", po::value<std::string>(&usermap_xsl), "<Provide a parameter stylesheet XSL file>")
("output,o", po::value<std::string>(&ismrmrd_file)->default_value("output.h5"), "<ISMRMRD output file>")
("output,o", po::value<std::string>(), "<ISMRMRD output file (defaults to the input file name, with .mrd extension)>")
("outputGroup,g", po::value<std::string>(&ismrmrd_group)->default_value("dataset"),
"<ISMRMRD output group>")
("list,l", po::value<bool>(&list)->implicit_value(true), "<List embedded files>")
Expand Down Expand Up @@ -593,9 +593,15 @@ int main(int argc, char* argv[]) {
}
std::cout << "Siemens file is: " << siemens_dat_filename << std::endl;




std::string ismrmrd_file;
if (!vm.count("output"))
{
boost::filesystem::path siemens_dat_path(siemens_dat_filename);
ismrmrd_file = siemens_dat_path.replace_extension(".mrd").string();
std::cout << "Output file not specified -- using " << ismrmrd_file << std::endl;
} else {
ismrmrd_file = vm["output"].as<std::string>();
}

std::string schema_file_name_content = load_embedded("ismrmrd.xsd");

Expand Down