Skip to content

Commit 8e1b4f4

Browse files
author
Kevin Harrington
committed
changing of the DH settings shold triger a configurations change evnt
1 parent af5019e commit 8e1b4f4

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/main/java/com/neuronrobotics/sdk/addons/kinematics/AbstractKinematicsNR.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ protected ArrayList<LinkConfiguration> loadConfig(Element doc) {
277277
Node nNode = dHParameters.item(x);
278278
if (nNode.getNodeType() == Node.ELEMENT_NODE && nNode.getNodeName().contentEquals("DHParameters")) {
279279
Element dhNode = (Element) nNode;
280-
DHLink newLink = new DHLink(dhNode);
280+
DHLink newLink = new DHLink(dhNode,newLinkConf);
281281
getDhParametersChain().addLink(newLink);// 0->1
282282
NodeList mobileBasesNodeList = dhNode.getChildNodes();
283283
for (int j = 0; j < mobileBasesNodeList.getLength(); j++) {

src/main/java/com/neuronrobotics/sdk/addons/kinematics/DHLink.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ public class DHLink {
6666

6767
/** The embedable xml. */
6868
private MobileBase slaveMobileBase=null;
69+
70+
private LinkConfiguration newLinkConf;
6971

7072

7173
/**
@@ -88,8 +90,10 @@ public DHLink(double d, double theta,double r, double alpha) {
8890
* Instantiates a new DH link.
8991
*
9092
* @param nNode the n node
93+
* @param newLinkConf
9194
*/
92-
public DHLink(Element nNode) {
95+
public DHLink(Element nNode, LinkConfiguration newLinkConf) {
96+
this.newLinkConf = newLinkConf;
9397
setDelta(XmlFactory.getTagValueDouble("Delta", nNode));
9498
setTheta(Math.toRadians(XmlFactory.getTagValueDouble("Theta", nNode)));
9599
setRadius(XmlFactory.getTagValueDouble("Radius", nNode));
@@ -548,6 +552,7 @@ public double getDelta() {
548552
*/
549553
public void setDelta(double d) {
550554
this.d = d;
555+
newLinkConf.fireChangeEvent();
551556
}
552557

553558
/**
@@ -568,6 +573,7 @@ public void setRadius(double radius) {
568573
this.radius = radius;
569574
transX_J=null;
570575
transX=null;
576+
newLinkConf.fireChangeEvent();
571577
}
572578

573579
/**
@@ -577,6 +583,7 @@ public void setRadius(double radius) {
577583
*/
578584
public void setTheta(double theta) {
579585
this.theta = theta;
586+
newLinkConf.fireChangeEvent();
580587
}
581588

582589
/**
@@ -588,6 +595,7 @@ public void setAlpha(double alpha) {
588595
this.alpha = alpha;
589596
rotX=null;
590597
rotX_J=null;
598+
newLinkConf.fireChangeEvent();
591599
}
592600

593601
/**

src/main/java/com/neuronrobotics/sdk/addons/kinematics/LinkConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ public ArrayList<ILinkConfigurationChangeListener> getListeners() {
10681068
return listeners;
10691069
}
10701070

1071-
private void fireChangeEvent() {
1071+
void fireChangeEvent() {
10721072
if(listeners!=null) {
10731073
for(int i=0;i<listeners.size();i++) {
10741074
try {

0 commit comments

Comments
 (0)