Merge pull request #376 from Guruprasad-Rane/master

DimAligned & DimLinear updated.
LibreCAD · May 13, 2021 · b914196 · b914196
2 parents 8aca242 + 19aa485
commit b914196
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 28 deletions.
diff --git a/lcUILua/createActions/dimalignedoperations.lua b/lcUILua/createActions/dimalignedoperations.lua
@@ -23,17 +23,12 @@ function DimAlignedOperations:_init()
 
     self.firstPoint = nil
     self.secondPoint = nil
-
+    message("<b>Dimension Aligned</b>")
     message("Click on start point", id)
 end
 
 function DimAlignedOperations:enterFirstPoint(eventName, data)
-    if(eventName == "mouseMove") then
-        self.builder:dimAuto(data["position"],
-                             data["position"]:add(lc.geo.Coordinate(10, 0)),
-                             data["position"]:add(lc.geo.Coordinate(0, 10))
-        )
-    elseif(eventName == "point") then
+    if(eventName == "point") then
         self.firstPoint = data["position"]
         self.step = "enterSecondPoint"
 
@@ -50,12 +45,21 @@ function DimAlignedOperations:enterSecondPoint(eventName, data)
     elseif(eventName == "point") then
         self.secondPoint = data["position"]
         self.step = "enterMiddleOfText"
-
-        message("Click on text position")
+        message("Options:<u>T</u>ext or Click on text position")
+        mainWindow:cliCommand():returnText( true)
     end
 end
 
 function DimAlignedOperations:enterMiddleOfText(eventName, data)
+    if(eventName == "text") then
+        if (string.lower(data["text"]) == "t" or data["text"] == "text") then
+            self.step = "enterText"
+            message("Enter text override")
+        else
+            message("Invalid Option")
+        end
+    end
+
     if(eventName == "mouseMove") then
         self.builder:dimAuto(self.firstPoint,
                              self.secondPoint,
@@ -66,16 +70,22 @@ function DimAlignedOperations:enterMiddleOfText(eventName, data)
                              self.secondPoint,
                              data["position"]
         )
-        self.step = "enterText"
-        message("Enter text (<> for value)")
-        mainWindow:cliCommand():returnText( true)
+        mainWindow:cliCommand():returnText( false)
+        self:createEntity()
     end
 end
 
 function DimAlignedOperations:enterText(eventName, data)
+    if(eventName == "mouseMove") then
+        self.builder:dimAuto(self.firstPoint,
+                             self.secondPoint,
+                             data["position"]
+        )
+    end
     if(eventName == "text") then
         mainWindow:cliCommand():returnText( false)
         self.builder:setExplicitValue(data["text"])
-        self:createEntity()
+        self.step = "enterMiddleOfText"
+        message("Click on text position")
     end
 end
diff --git a/lcUILua/createActions/dimlinearoperations.lua b/lcUILua/createActions/dimlinearoperations.lua
@@ -20,53 +20,62 @@ setmetatable(DimLinearOperations, {
 
 function DimLinearOperations:_init()
     CreateOperations._init(self, lc.builder.DimLinearBuilder, "enterStartPoint")
-
+    self.FirstPoint = nil
+    message("<b>Dimension Linear</b>")
     message("Click on start point")
 end
 
 function DimLinearOperations:enterStartPoint(eventName, data)
-    if(eventName == "mouseMove" or eventName == "point") then
-        self.builder:setDefinitionPoint2(data["position"])
-    end
-
     if(eventName == "point") then
+        self.FirstPoint=data["position"]
         self.step = "enterEndPoint"
 
         message("Click on end point")
     end
 end
 
 function DimLinearOperations:enterEndPoint(eventName, data)
-    if(eventName == "mouseMove" or eventName == "point") then
+    if(eventName == "point") then
+        self.builder:setMiddleOfText(data["position"])
+        self.builder:setDefinitionPoint2(self.FirstPoint)
         self.builder:setDefinitionPoint3(data["position"])
-    end
 
-    if(eventName == "point") then
         self.step = "enterMiddleOfText"
 
-        message("Click on text position")
+        message("Options:<u>T</u>ext or Click on text position")
+        mainWindow:cliCommand():returnText( true)
     end
 end
 
 function DimLinearOperations:enterMiddleOfText(eventName, data)
+    if(eventName == "text") then
+        if (string.lower(data["text"]) == "t" or data["text"] == "text") then
+            self.step = "enterText"
+            message("Enter text override")
+        else
+            message("Invalid Option")
+        end
+    end
     if(eventName == "mouseMove" or eventName == "point") then
         self.builder:setDefinitionPoint(data["position"])
         self.builder:setMiddleOfText(data["position"])
     end
 
     if(eventName == "point") then
-        self.step = "enterText"
-
-        mainWindow:cliCommand():returnText( true)
-
-        message("Enter dimension text (<> for value)")
+        mainWindow:cliCommand():returnText( false)
+        self:createEntity()
     end
 end
 
 function DimLinearOperations:enterText(eventName, data)
+    if(eventName == "mouseMove" or eventName == "point") then
+        self.builder:setDefinitionPoint(data["position"])
+        self.builder:setMiddleOfText(data["position"])
+    end
     if(eventName == "text") then
         mainWindow:cliCommand():returnText( false)
         self.builder:setExplicitValue(data["text"])
-        self:createEntity()
+        self.step = "enterMiddleOfText"
+        message("Click on text position")
     end
 end