diff --git a/doc/pic/code_robot_definition.pdf b/doc/manuelleRekonstruktion/pic/code_robot_definition.pdf similarity index 100% rename from doc/pic/code_robot_definition.pdf rename to doc/manuelleRekonstruktion/pic/code_robot_definition.pdf diff --git a/doc/pic/code_robot_definition.svg b/doc/manuelleRekonstruktion/pic/code_robot_definition.svg similarity index 100% rename from doc/pic/code_robot_definition.svg rename to doc/manuelleRekonstruktion/pic/code_robot_definition.svg diff --git a/doc/pic/image.png b/doc/manuelleRekonstruktion/pic/image.png similarity index 100% rename from doc/pic/image.png rename to doc/manuelleRekonstruktion/pic/image.png diff --git a/doc/pic/robot_frontView_forearm.pdf b/doc/manuelleRekonstruktion/pic/robot_frontView_forearm.pdf similarity index 100% rename from doc/pic/robot_frontView_forearm.pdf rename to doc/manuelleRekonstruktion/pic/robot_frontView_forearm.pdf diff --git a/doc/pic/robot_frontView_forearm.svg b/doc/manuelleRekonstruktion/pic/robot_frontView_forearm.svg similarity index 100% rename from doc/pic/robot_frontView_forearm.svg rename to doc/manuelleRekonstruktion/pic/robot_frontView_forearm.svg diff --git a/doc/pic/robot_frontView_forearm_0.pdf b/doc/manuelleRekonstruktion/pic/robot_frontView_forearm_0.pdf similarity index 100% rename from doc/pic/robot_frontView_forearm_0.pdf rename to doc/manuelleRekonstruktion/pic/robot_frontView_forearm_0.pdf diff --git a/doc/pic/robot_frontView_forearm_1.pdf b/doc/manuelleRekonstruktion/pic/robot_frontView_forearm_1.pdf similarity index 100% rename from doc/pic/robot_frontView_forearm_1.pdf rename to doc/manuelleRekonstruktion/pic/robot_frontView_forearm_1.pdf diff --git a/doc/pic/robot_hand_sideView.pdf b/doc/manuelleRekonstruktion/pic/robot_hand_sideView.pdf similarity index 100% rename from doc/pic/robot_hand_sideView.pdf rename to doc/manuelleRekonstruktion/pic/robot_hand_sideView.pdf diff --git a/doc/pic/robot_hand_sideView.svg b/doc/manuelleRekonstruktion/pic/robot_hand_sideView.svg similarity index 100% rename from doc/pic/robot_hand_sideView.svg rename to doc/manuelleRekonstruktion/pic/robot_hand_sideView.svg diff --git a/doc/pic/robot_hand_sideView_0.pdf b/doc/manuelleRekonstruktion/pic/robot_hand_sideView_0.pdf similarity index 100% rename from doc/pic/robot_hand_sideView_0.pdf rename to doc/manuelleRekonstruktion/pic/robot_hand_sideView_0.pdf diff --git a/doc/pic/robot_hand_topView.pdf b/doc/manuelleRekonstruktion/pic/robot_hand_topView.pdf similarity index 100% rename from doc/pic/robot_hand_topView.pdf rename to doc/manuelleRekonstruktion/pic/robot_hand_topView.pdf diff --git a/doc/pic/robot_hand_topView.svg b/doc/manuelleRekonstruktion/pic/robot_hand_topView.svg similarity index 100% rename from doc/pic/robot_hand_topView.svg rename to doc/manuelleRekonstruktion/pic/robot_hand_topView.svg diff --git a/doc/pic/robot_hand_topView_0.pdf b/doc/manuelleRekonstruktion/pic/robot_hand_topView_0.pdf similarity index 100% rename from doc/pic/robot_hand_topView_0.pdf rename to doc/manuelleRekonstruktion/pic/robot_hand_topView_0.pdf diff --git a/doc/pic/robot_image_a.png b/doc/manuelleRekonstruktion/pic/robot_image_a.png similarity index 100% rename from doc/pic/robot_image_a.png rename to doc/manuelleRekonstruktion/pic/robot_image_a.png diff --git a/doc/pic/robot_image_b.png b/doc/manuelleRekonstruktion/pic/robot_image_b.png similarity index 100% rename from doc/pic/robot_image_b.png rename to doc/manuelleRekonstruktion/pic/robot_image_b.png diff --git a/doc/pic/robot_image_c.png b/doc/manuelleRekonstruktion/pic/robot_image_c.png similarity index 100% rename from doc/pic/robot_image_c.png rename to doc/manuelleRekonstruktion/pic/robot_image_c.png diff --git a/doc/pic/robot_image_d.png b/doc/manuelleRekonstruktion/pic/robot_image_d.png similarity index 100% rename from doc/pic/robot_image_d.png rename to doc/manuelleRekonstruktion/pic/robot_image_d.png diff --git a/doc/pic/robot_image_e.png b/doc/manuelleRekonstruktion/pic/robot_image_e.png similarity index 100% rename from doc/pic/robot_image_e.png rename to doc/manuelleRekonstruktion/pic/robot_image_e.png diff --git a/doc/pic/robot_sideView_forearm.pdf b/doc/manuelleRekonstruktion/pic/robot_sideView_forearm.pdf similarity index 100% rename from doc/pic/robot_sideView_forearm.pdf rename to doc/manuelleRekonstruktion/pic/robot_sideView_forearm.pdf diff --git a/doc/pic/robot_sideView_forearm.svg b/doc/manuelleRekonstruktion/pic/robot_sideView_forearm.svg similarity index 100% rename from doc/pic/robot_sideView_forearm.svg rename to doc/manuelleRekonstruktion/pic/robot_sideView_forearm.svg diff --git a/doc/pic/robot_sideView_forearm_0.pdf b/doc/manuelleRekonstruktion/pic/robot_sideView_forearm_0.pdf similarity index 100% rename from doc/pic/robot_sideView_forearm_0.pdf rename to doc/manuelleRekonstruktion/pic/robot_sideView_forearm_0.pdf diff --git a/doc/pic/robot_sideView_measurements.pdf b/doc/manuelleRekonstruktion/pic/robot_sideView_measurements.pdf similarity index 100% rename from doc/pic/robot_sideView_measurements.pdf rename to doc/manuelleRekonstruktion/pic/robot_sideView_measurements.pdf diff --git a/doc/pic/robot_sideView_measurements.svg b/doc/manuelleRekonstruktion/pic/robot_sideView_measurements.svg similarity index 100% rename from doc/pic/robot_sideView_measurements.svg rename to doc/manuelleRekonstruktion/pic/robot_sideView_measurements.svg diff --git a/doc/pic/robot_sideView_measurements_0.pdf b/doc/manuelleRekonstruktion/pic/robot_sideView_measurements_0.pdf similarity index 100% rename from doc/pic/robot_sideView_measurements_0.pdf rename to doc/manuelleRekonstruktion/pic/robot_sideView_measurements_0.pdf diff --git a/doc/position.pdf b/doc/manuelleRekonstruktion/position.pdf similarity index 100% rename from doc/position.pdf rename to doc/manuelleRekonstruktion/position.pdf diff --git a/doc/position.tex b/doc/manuelleRekonstruktion/position.tex similarity index 100% rename from doc/position.tex rename to doc/manuelleRekonstruktion/position.tex diff --git a/public/index.html b/public/index.html index 034a250..8a5651f 100755 --- a/public/index.html +++ b/public/index.html @@ -20,9 +20,6 @@
- - - - +
diff --git a/test/calculateAngles4.synthesized.a.test.js b/test/calculateAngles4.synthesized.a.test.js deleted file mode 100644 index 577219d..0000000 --- a/test/calculateAngles4.synthesized.a.test.js +++ /dev/null @@ -1,55 +0,0 @@ -const { calculate } = require('../public/calculateAngles'); - - - -function foundMarkers(y, robot, a=0, translate=[0,0,0]){ - - const alphaPi = y * Math.PI / 180; - - const pos20 = [0,Math.sin(alphaPi)*10,Math.cos(alphaPi)*10] - - m = {"markers": [ - {"id": 20, "position_mm": pos20 } - ]} - - return m -} - -robot = { - "Elements":["Base", "Arm1"], - "ElementLength":{"Arm1":250, "Joint1": 89.5, "Arm2":250, "Finger1":100, "Finger2":100}, - "Joints":{ - "jointB":{"name":"Shoulder","type":"revolute","axis":[1,0,0],"parent":"Base","child":"Arm1","origin":[-89.5,0,0], "originSource":[null, "test", "test"]}, - "jointC":{"name":"Ellbow","type":"revolute","axis":[1,0,0],"parent":"Arm1","child":"Joint1", "origin":[-89.5, -250, 0]}, - "jointD":{"name":"EllbowTwist","type":"revolute","axis":[0,1,0],"parent":"Joint1","child":"Arm2", "origin":[0, -250, 0]} - }, - "Marker":[ - {"id":20, "on":"Arm1", "relPos":[0,0,10]}, - {"id":40, "on":"Arm2", "relPos":[0,200,35]}, - {"id":41, "on":"Arm2", "relPos":[0,160,35]} - ], - "recognized":{"x":null, "y":null, "z":null} -} - - - -function normalizeAngleDeg(angle) { - return ((angle % 360) + 360) % 360; -} - - -describe('calculateAngles minimal test', () => { - it('should run calculate() artificially created robot & testData', async () => { - - - var result = calculate(foundMarkers(45, robot), robot); - - expect(result).toBeDefined(); - expect(robot.recognized.y).toBeDefined(); - expect(robot.recognized.y).toBeCloseTo(45,2); - - }) - - - -}); \ No newline at end of file diff --git a/test/script.app.test.js b/test/script.app.test.js deleted file mode 100755 index 4a9d9c1..0000000 --- a/test/script.app.test.js +++ /dev/null @@ -1,11 +0,0 @@ - - -const Robot = require('../public/calculateActions.js'); - - - -test('Initialisiere den Robot', () => { - - expect(1).toBeCloseTo(1,0.002); - -}); \ No newline at end of file