diff --git a/cpp-dsn2pcb/c_pcb_dsn.cpp b/cpp-dsn2pcb/c_pcb_dsn.cpp index 65aa5e1..c15409c 100644 --- a/cpp-dsn2pcb/c_pcb_dsn.cpp +++ b/cpp-dsn2pcb/c_pcb_dsn.cpp @@ -774,30 +774,30 @@ int main(int argc, char *argv[]) //output pcb format auto border = double(arg_b); - std::cout << "(" << maxx - minx + border * 2 - << " " << maxy - miny + border * 2 - << " " << num_layers << ")\n"; + std::cout << "[" << maxx - minx + border * 2 + << "," << maxy - miny + border * 2 + << "," << num_layers << "]\n"; minx -= border; miny -= border; for (auto &&track : the_tracks) { - std::cout << "(" << track.m_id << " " << track.m_track_radius << " " - << track.m_via_radius << " " << track.m_gap << " ("; + std::cout << "[" << track.m_id << "," << track.m_track_radius << "," + << track.m_via_radius << "," << track.m_gap << ",["; for (auto i = 0; i < static_cast(track.m_pads.size()); ++i) { auto &&term = track.m_pads[i]; - std::cout << "(" << term.m_radius << " " << term.m_gap - << " (" << term.m_pos.m_x - minx - << " " << term.m_pos.m_y - miny - << " " << term.m_pos.m_z << ") ("; + std::cout << "(" << term.m_radius << "," << term.m_gap + << ",(" << term.m_pos.m_x - minx + << "," << term.m_pos.m_y - miny + << "," << term.m_pos.m_z << "),("; for (auto j = 0; j < static_cast(term.m_shape.size()); ++j) { auto cord = term.m_shape[j]; - std::cout << "(" << cord.m_x << " " << cord.m_y << ")"; + std::cout << "(" << cord.m_x << "," << cord.m_y << ")"; } - std::cout << "))"; + std::cout << "])"; } - std::cout << ") ("; + std::cout << "],["; for (auto i = 0; i < static_cast(track.m_paths.size()); ++i) { std::cout << "("; @@ -805,11 +805,11 @@ int main(int argc, char *argv[]) for (auto j = 0; j < static_cast(p.size()); ++j) { std::cout << "(" << p[j].m_x - minx - << " " << p[j].m_y - miny - << " " << p[j].m_z << ")"; + << "," << p[j].m_y - miny + << "," << p[j].m_z << ")"; } std::cout << ")"; } - std::cout << "))\n"; + std::cout << "]]\n"; } }