Skip to content

Commit 73aa3f6

Browse files
authored
Merge pull request #12 from ManifoldFR/topic/recording-id
Allow to set and get the stream's recording ID
2 parents acf6e1c + 9439f2a commit 73aa3f6

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

examples/ur5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
robot = erd.load("ur5")
88
model = robot.model
99
visual_model = robot.visual_model
10-
rr = pinocchio_rerun.RerunVisualizer(model, visual_model)
10+
rr = pinocchio_rerun.RerunVisualizer(model, visual_model, app_id = "UR5Visualizer", rec_id = "ur5")
1111
rr.loadViewerModel()
1212
q0 = pin.neutral(model)
1313
rr.display(q0)

python/module.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,20 @@ PYMODULE() {
3838

3939
bp::class_<RerunVisualizer, boost::noncopyable>("RerunVisualizer",
4040
bp::no_init)
41-
.def(bp::init<Model const &, GeometryModel const &>(
42-
("self"_a, "model", "geomModel")))
41+
.def("__init__",
42+
bp::make_constructor(
43+
+[](const pinocchio::Model &model,
44+
const pinocchio::GeometryModel &geomModel,
45+
const std::string &appID, const std::string &recID) {
46+
return new RerunVisualizer(model, geomModel, appID, recID);
47+
},
48+
bp::default_call_policies(),
49+
(bp::arg("model"), bp::arg("geom_model"),
50+
bp::arg("app_id") = "RerunVisualizer",
51+
bp::arg("rec_id") = "DefaultID")))
4352
.def(pinocchio::python::VisualizerPythonVisitor<RerunVisualizer>())
4453
.add_property("initialized", &RerunVisualizer::initialized)
54+
.add_property("recordingID", &RerunVisualizer::recordingID)
4555
.def("switchTimeline", &RerunVisualizer::switchTimeline,
4656
("self"_a, "name"_a), "Switch Rerun timelines.")
4757
.def("disableTimeline", &RerunVisualizer::disableTimeline,

src/rerun_visualizer.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
namespace pinrerun {
77

88
RerunVisualizer::RerunVisualizer(const pinocchio::Model &model,
9-
const pinocchio::GeometryModel &geomModel)
10-
: BaseVisualizer(model, geomModel, nullptr), stream("RerunVisualizer"),
11-
m_prefix("pinocchio/" + model.name), m_initialized(false) {
9+
const pinocchio::GeometryModel &geomModel,
10+
const std::string &appID,
11+
const std::string &recID)
12+
: BaseVisualizer(model, geomModel, nullptr), stream(appID, recID),
13+
m_prefix("pinocchio/" + model.name), m_initialized(false),
14+
m_recordingID(recID) {
1215
stream.spawn().exit_on_failure();
1316
stream.set_time_seconds("stable_time", 0.0);
1417
}

src/rerun_visualizer.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class RerunVisualizer : public BaseVisualizer {
2020
public:
2121
using BaseVisualizer::play;
2222
RerunVisualizer(const pinocchio::Model &model,
23-
const pinocchio::GeometryModel &geomModel);
23+
const pinocchio::GeometryModel &geomModel,
24+
const std::string &appID = "RerunVisualizer",
25+
const std::string &recID = "DefaultID");
2426

2527
void loadViewerModel() override;
2628

@@ -47,10 +49,13 @@ class RerunVisualizer : public BaseVisualizer {
4749

4850
inline bool initialized() const { return m_initialized; }
4951

52+
std::string recordingID() const { return m_recordingID; }
53+
5054
protected:
5155
void displayImpl() override;
5256
std::string m_prefix;
5357
bool m_initialized;
58+
std::string m_recordingID;
5459
};
5560

5661
} // namespace pinrerun

0 commit comments

Comments
 (0)