Skip to content

Commit 39957aa

Browse files
committed
Merge pull request #106 from k-okada/ugry
[euscollada/src/collada2eus.cpp] super ugry hack untilyaml-cpp 0.5.2
2 parents 9333afa + c3cb19e commit 39957aa

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

euscollada/src/collada2eus.cpp

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ int main(int argc, char* argv[]){
10001000
add_joint_suffix = false;
10011001
nargc--;
10021002
} else if (strcmp(argv[i], "--verbose") == 0) {
1003-
verbose = false;
1003+
verbose = true;
10041004
nargc--;
10051005
}
10061006
}
@@ -1059,10 +1059,21 @@ int main(int argc, char* argv[]){
10591059
BOOST_FOREACH(string& limb, limb_candidates) {
10601060
#ifdef USE_CURRENT_YAML
10611061
if (doc[limb]) {
1062+
int line=-1;
1063+
ifstream fin2(yaml_filename); // super ugry hack until yaml-cpp 0.5.2
1064+
string buffer;
1065+
for (;fin2;) {
1066+
getline(fin2, buffer); line++;
1067+
if(buffer == limb+":") break;
1068+
}
1069+
fin2.close();
10621070
if (verbose) {
1063-
std::cerr << limb << "@" << doc[limb].size() << std::endl;
1071+
std::cerr << limb << "@" << line << std::endl;
1072+
}
1073+
if(line<0) {
1074+
std::cerr << limb << "@" << line << " someting is wrong..." << std::endl;
10641075
}
1065-
limb_order.push_back(pair<string, size_t>(limb, doc[limb].size()));
1076+
limb_order.push_back(pair<string, size_t>(limb, line));
10661077
}
10671078
#else
10681079
if ( doc.FindValue(limb) ) {

euscollada/src/collada2eus_urdfmodel.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,16 @@ void ModelEuslisp::readYaml (string &config_file) {
504504
BOOST_FOREACH(string& limb, limb_candidates) {
505505
#ifdef USE_CURRENT_YAML
506506
if (doc[limb]) {
507-
std::cerr << limb << "@" << doc[limb].size() << std::endl;
508-
limb_order.push_back(pair<string, size_t>(limb, doc[limb].size()));
507+
int line=0;
508+
ifstream fin2(config_file.c_str()); // super ugry hack until yaml-cpp 0.5.2
509+
string buffer;
510+
for (;fin2;) {
511+
getline(fin2, buffer); line++;
512+
if(buffer == limb+":") break;
513+
}
514+
fin2.close();
515+
std::cerr << limb << "@" << line << std::endl;
516+
limb_order.push_back(pair<string, size_t>(limb, line));
509517
}
510518
#else
511519
if ( doc.FindValue(limb) ) {

0 commit comments

Comments
 (0)