Skip to content

Commit

Permalink
Added localization to RobotGripperSystem
Browse files Browse the repository at this point in the history
  • Loading branch information
i-make-robots committed Dec 5, 2023
1 parent b91d274 commit fc5b252
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.marginallyclever.robotoverlord.parameters.swing.ViewElementButton;
import com.marginallyclever.robotoverlord.parameters.swing.ViewElementComboBox;
import com.marginallyclever.robotoverlord.parameters.swing.ComponentSwingViewFactory;
import com.marginallyclever.robotoverlord.swing.translator.Translator;
import com.marginallyclever.robotoverlord.systems.EntitySystem;
import com.marginallyclever.robotoverlord.systems.RayPickSystem;
import org.slf4j.Logger;
Expand All @@ -20,6 +21,9 @@
import java.util.ArrayList;
import java.util.List;

/**
* This system is responsible for handling roboot grippers.
*/
public class RobotGripperSystem implements EntitySystem {
private static final Logger logger = LoggerFactory.getLogger(RobotGripperSystem.class);
private final EntityManager entityManager;
Expand Down Expand Up @@ -56,7 +60,7 @@ private void decorateGripper(ComponentSwingViewFactory view, Component component
ViewElementComboBox box = (ViewElementComboBox)view.addComboBox(gripper.mode,RobotGripperComponent.names);
box.setReadOnly(true);

ViewElementButton bToggleGripper = view.addButton("Grab");
ViewElementButton bToggleGripper = view.addButton(Translator.get("RobotGripperSystem.Grab"));
bToggleGripper.addActionEventListener((evt)-> {
switch(gripper.mode.get()) {
case RobotGripperComponent.MODE_OPEN -> doGrab(gripper);
Expand All @@ -70,23 +74,23 @@ private void decorateGripper(ComponentSwingViewFactory view, Component component

private void setGripperButton(ViewElementButton bToggleGripper,RobotGripperComponent gripper) {
if(gripper.mode.get() == RobotGripperComponent.MODE_OPEN) {
bToggleGripper.setText("Grab");
bToggleGripper.setText(Translator.get("RobotGripperSystem.grab"));
bToggleGripper.setEnabled(true);
} else if(gripper.mode.get() == RobotGripperComponent.MODE_CLOSED) {
bToggleGripper.setText("Release");
bToggleGripper.setText(Translator.get("RobotGripperSystem.release"));
bToggleGripper.setEnabled(true);
} else if(gripper.mode.get() == RobotGripperComponent.MODE_OPENING) {
bToggleGripper.setText("Opening");
bToggleGripper.setText(Translator.get("RobotGripperSystem.opening"));
bToggleGripper.setEnabled(false);
} else if(gripper.mode.get() == RobotGripperComponent.MODE_CLOSING) {
bToggleGripper.setText("Closing");
bToggleGripper.setText(Translator.get("RobotGripperSystem.closing"));
bToggleGripper.setEnabled(false);
}
}

public void doGrab(RobotGripperComponent gripper) {
List<RobotGripperJawComponent> jaws = gripper.getJaws();
if (jaws.size()==0) return;
if (jaws.isEmpty()) return;

double distance = (gripper.openDistance.get() - gripper.closeDistance.get());

Expand All @@ -102,7 +106,7 @@ public void doGrab(RobotGripperComponent gripper) {
List<RayHit> jawHit = picker.findRayIntersections(ray);
hits.addAll(jawHit);
} catch (Exception e) {
e.printStackTrace();
logger.error("Error while raycasting.",e);
}
}

Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/languages/english.xml
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,9 @@
<string><key>PreferencesPanel.title</key><value>Preferences</value></string>
<string><key>InteractionPreferencesPanel.title</key><value>Interaction</value></string>
<string><key>GraphicsPreferencesPanel.title</key><value>Graphics</value></string>

<string><key>RobotGripperSystem.grab</key><value>Grab</value></string>
<string><key>RobotGripperSystem.release</key><value>Release</value></string>
<string><key>RobotGripperSystem.opening</key><value>Opening</value></string>
<string><key>RobotGripperSystem.closing</key><value>Closing</value></string>
</language>

0 comments on commit fc5b252

Please sign in to comment.