Skip to content
Snippets Groups Projects

Armarx time integration

Merged Fabian Reister requested to merge armarx_time_integration into master
8 unresolved threads

Merge request reports

Approval is optional

Merged by Fabian ReisterFabian Reister 2 years ago (May 9, 2022 12:05pm UTC)

Merge details

  • Changes merged into master with bc5e4c10.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
49
50 // Subscribe to a topic (passing the topic name).
51 // def->topic<PlatformUnitListener>("MyTopic");
52
53 // Use (and depend on) another component (passing the ComponentInterfacePrx).
54 // def->component(myComponentProxy)
55
56
57 // Add a required property. (The component won't start without a value being set.)
58 // def->required(properties.boxLayerName, "p.box.LayerName", "Name of the box layer in ArViz.");
59
60 // Add an optionalproperty.
61 def->optional(properties.boxLayerName, "p.box.LayerName", "Name of the box layer in ArViz.");
62 def->optional(properties.numBoxes, "p.box.Number", "Number of boxes to draw in ArViz.");
63
64 45 workingMemory().name() = "View";
  • 76 60 {
    77 61 // Topics and properties defined above are automagically registered.
    78 62 usingTopic("GazeTargets");
  • 130 gaze_target::toAron(dto, bo);
    106 gaze_target::GazeTarget bo;
    107 gaze_target::fromIce(target, bo);
    108 gaze_target::arondto::GazeTarget arondto;
    109 gaze_target::toAron(arondto, bo);
    131 110
    111 std::stringstream ss;
    112 ss << "GazeTarget_" << bo.requestTimestamp;
    132 113 armem::EntityUpdate update;
    133 114 update.entityID = coreSegmentID
    134 115 .withProviderSegmentName(this->getName())
    135 .withEntityName("GazeTarget_" + std::to_string(requestTimestamp));
    136 update.timeCreated = armem::Time::now();
    137 update.instancesData = { dto.toAron() };
    116 .withEntityName(ss.str());
    117 update.timeCreated = armarx::core::time::DateTime::Now();
  • 122 102 namespace gaze_target = armarx::control::gaze_controller::gaze_target;
    123 103 const armem::MemoryID coreSegmentID("View", "GazeTarget");
    124 104
    125 FramedPositionPtr p = FramedPositionPtr::dynamicCast(targetPoint);
    126
    127 105 armem::client::Writer writer = memoryNameSystem().getWriter(coreSegmentID);
    128 gaze_target::GazeTarget bo = gaze_target::GazeTarget{requestTimestamp, reachedTimestamp, releasedTimestamp, abortedTimestamp, p};
    129 gaze_target::arondto::GazeTarget dto;
    130 gaze_target::toAron(dto, bo);
    106 gaze_target::GazeTarget bo;
    107 gaze_target::fromIce(target, bo);
    108 gaze_target::arondto::GazeTarget arondto;
    109 gaze_target::toAron(arondto, bo);
    131 110
    111 std::stringstream ss;
    112 ss << "GazeTarget_" << bo.requestTimestamp;
  • 164 167 auto newTarget = requestedTargets.top();
  • 179 184 std::scoped_lock<std::mutex>targetLock(targetMutex);
    180 185 for (size_t i = 0; i < submittedTargets.size(); i++)
  • 179 184 std::scoped_lock<std::mutex>targetLock(targetMutex);
  • 5 5 # `interfaces` and custom libraries come first,
    6 6 # followed by `components` and finalized by `applications`.
    7 7
    8 #add_subdirectory(client)
    9 #add_subdirectory(components)
    10 #add_subdirectory(gaze_scheduler)
    8 add_subdirectory(client)
    9 add_subdirectory(components)
  • Johann Mantel added 1 commit

    added 1 commit

    • 80c05801 - implement hints given in review and change name of memory components

    Compare with previous version

  • Fabian Reister mentioned in commit bc5e4c10

    mentioned in commit bc5e4c10

  • Please register or sign in to reply
    Loading