Merge pull request #38 from Laaouatni/35-bottom-and-right-show-wrong-ui-lines-in-gcss-simulator-but-left-and-top-correct

fix #35 solved issue in right, top... right, bottom

Author: Laaouatni

gcode/main.js

@@ -7,45 +7,45 @@ import Gcss from "./src/API/GcodeApi/Gsimulator/Gcss/Gcss.js";
 let a = new G0({});
 
 for (let i = 0; i < 3; i++) {
-  a.moveTo({left: 50, top: 50})
+  a.moveTo({ left: 10, top: 30 });
 }
 
 for (let i = 0; i < 3; i++) {
-  a.moveTo({ left: 50 })
+  a.moveTo({ left: 100 });
 }
 
 for (let i = 0; i < 3; i++) {
   a.moveTo({
-    bottom: 50
+    bottom: 50,
   });
 }
 
 for (let i = 0; i < 3; i++) {
   a.moveTo({
-    right: 50
+    right: 100,
   });
 }
 
 for (let i = 0; i < 3; i++) {
   a.moveTo({
-    bottom: 50, 
-    right: 50
+    bottom: 50,
+    right: 50,
   });
 }
 
 for (let i = 0; i < 3; i++) {
   a.moveTo({
-    top: 50, 
-    right: 50
+    top: 50,
+    right: 20,
   });
 }
 
 for (let i = 0; i < 4; i++) {
-  a.moveTo({ left: 50 })
+  a.moveTo({ left: 50 });
 }
 
 for (let i = 0; i < 3; i++) {
-  a.moveTo({ bottom: 50, left: 50 })
+  a.moveTo({ bottom: 30, left: 50 });
 }
 
 let g = new Gcss({

gcode/src/API/GcodeApi/Gsimulator/Gcss/CssLine/CssLine.js

@@ -51,15 +51,6 @@ export default class CssLine {
     return remValue * 16;
   }
 
-  // this.previusObj.x > this.currentObj.x &&
-  // this.previusObj.y < this.currentObj.y
-  //   ? this.biggestPos.y
-  //   : this.smallestPos.y
-
-  // this.previusObj.x > this.currentObj.x &&
-  //       this.previusObj.y < this.currentObj.y
-  //         ? -1 * this.lineAngle
-  //         : this.lineAngle
   styleLine() {
     this.lineStylesObj = new StyleLine(this).getResult();
 

gcode/src/API/GcodeApi/Gsimulator/Gcss/other/Methods/StyleLine/StyleLine.js

@@ -78,15 +78,15 @@ export default class StyleLine {
       this.obj.previusObj.x > this.obj.currentObj.x &&
       this.obj.currentObj.y > this.obj.previusObj.y
     ) {
-      return this.obj.lineAngle + 90;
+      return 180 - this.obj.lineAngle;
     }
 
     // left and bottom
     if (
       this.obj.currentObj.x > this.obj.previusObj.x &&
       this.obj.previusObj.y > this.obj.currentObj.y
     ) {
-      return this.obj.lineAngle - 90;
+      return -1 * this.obj.lineAngle;
     }
 
     // normal all other direction

gcode/src/CSS/Gline/Gline_main/Gline_main.css

@@ -40,4 +40,4 @@
     width: var(--line-width);
     opacity: 1;
   }
-}
+}