UI improvements

lcUI/cadmdichild.cpp

@@ -385,4 +385,15 @@ void CadMdiChild::cancelCurrentOperations() {
 
 lc::UndoManager_SPtr CadMdiChild::undoManager() const {
     return _undoManager;
+}
+
+std::shared_ptr<LCViewer::Cursor> CadMdiChild::cursor() const {
+	return _cursor;
+}
+
+unsigned int CadMdiChild::id() {
+	return _id;
+}
+void CadMdiChild::setId(unsigned int id) {
+	_id = id;
 }

lcUI/cadmdichild.h

@@ -46,11 +46,16 @@ class CadMdiChild : public QWidget {
         std::shared_ptr<OperationManager>  operationManager() const;
         lc::StorageManager_SPtr storageManager() const;
         LCViewer::LCADViewer* viewer() const {return _viewer;} ;
+        std::shared_ptr<LCViewer::Cursor> cursor() const;
         void cancelCurrentOperations();
         void import(std::string);
 
+        unsigned int id();
+        void setId(unsigned int id);
+
     private:
         int randInt(int low, int high);
+        unsigned int _id;
 
         std::shared_ptr<lc::Document> _document;
         lc::UndoManagerImpl_SPtr _undoManager;

lcUI/lua/qtbridge.cpp

@@ -84,6 +84,7 @@ void addQtWindowBindings(lua_State *L) {
 			.addFunction("addSubWindow", [](QMdiArea* mdiArea, QWidget* subWindow) {
 				return mdiArea->addSubWindow(subWindow);
 			})
+			.addFunction("subWindowList", &QMdiArea::subWindowList)
 		.endClass()
 
 		.beginExtendClass<QMdiSubWindow, QWidget>("QMdiSubWindow")
@@ -148,14 +149,20 @@ void addLCBindings(lua_State *L) {
 				CadMdiChild* child = new CadMdiChild;
 				return child;
 			})
+			.addFunction("cursor", &CadMdiChild::cursor)
 			.addFunction("document", &CadMdiChild::document)
+			.addProperty("id", &CadMdiChild::id, &CadMdiChild::setId)
 			.addFunction("import", &CadMdiChild::import)
 			.addFunction("newDocument", &CadMdiChild::newDocument)
 			.addFunction("undoManager", &CadMdiChild::undoManager)
 			.addFunction("view", &CadMdiChild::view)
 			.addFunction("viewer", &CadMdiChild::viewer)
 		.endClass()
 
+		.beginClass<LCViewer::Cursor>("Cursor")
+			.addFunction("position", &LCViewer::Cursor::position)
+		.endClass()
+
 		.beginExtendClass<LCViewer::LCADViewer, QWidget>("LCADViewer")
 			.addFunction("x", &LCViewer::LCADViewer::x)
 			.addFunction("y", &LCViewer::LCADViewer::y)

lcUILua/actions/event.lua

@@ -1,25 +1,32 @@
-local event = {}
+event = {}
 
-function event.register(eventName, callback, ...)
-	event[eventName] = {}
-	event[eventName].callback = callback
-	if(... ~= nil) then
-		event[eventName].args = {...}
+function event.register(eventName, callback)
+	if(event[eventName] == nil) then
+		event[eventName] = {}
+		event[eventName].callbacks = {callback}
 	end
+
+	table.insert(event[eventName].callbacks, callback)
 end
 
 function event.trigger(eventName, ...)
 	if(event[eventName]) then
-		if(event[eventName].args) then
-			event[eventName].callback(event[eventName].args, {...})
-		else
-			event[eventName].callback({...})
+		for i, cb in pairs(event[eventName].callbacks) do
+			if type(cb) == "function" then
+				cb(...)
+			elseif cb.onEvent then
+				cb:onEvent(eventName, ...)
+			end
 		end
 	end
 end
 
-function event.delete(eventName)
-	event[eventName] = nil
-end
-
-return event
+function event.delete(eventName, callback)
+	if(event[eventName]) then
+		for i, cb in pairs(event[eventName].callbacks) do
+			if(callback == cb) then
+				table.remove(event[eventName].callbacks, i)
+			end
+		end
+	end
+end

lcUILua/actions/operations.lua

@@ -1,32 +1,46 @@
-local event = require 'actions.event'
+require 'actions.event'
 
-local operations = {}
+Operations = {}
 
-function operations.create_line()
-	print("Draw a line")
-	print("Click on first point")	
-	event.register('point', operations.get_line_point1, nil)
+function Operations:new()
+	local o = {}
+	Operations.__index = self
+	setmetatable(o, self)
+	return o
 end
 
-function operations.get_line_point1(point)
-	event.delete('point')
-	event.register('point', operations.get_line_point2, point[1], point[2])
-	print("Click on second point")
+function Operations:onEvent(eventName, ...)
+	--If current window is focused
+	if(mdiArea:activeSubWindow():widget().id == self.id) then
+		if(eventName == "point") then
+			self:get_line_point(...)
+		end
+	end
 end
 
-function operations.get_line_point2(point1, point2)
-	d = mdiArea:activeSubWindow():widget():document()
-	b = Builder(d)
-	layer = d:layerByName("0")
+function Operations:create_line()
+	self.line_vars = {}
+	self.line_vars['lastPoint'] = nil
 
-	l=Line(Coord(point1[1],point1[2]), Coord(point2[1],point2[2]), layer);
-    b:append(l)
-    b:execute()
-    event.delete('point')
-end
-
-function operations.click(x,y)
-	event.trigger('point', x, y)
+	print("Draw a line")
+	print("Click on first point")	
+	event.register('point', self)
 end
 
-return operations
+function Operations:get_line_point(point)
+	if(self.line_vars['lastPoint'] ~= nil) then
+		local lp = self.line_vars['lastPoint']
+		local d = mdiArea:activeSubWindow():widget():document()
+		local b = Builder(d)
+		local layer = d:layerByName("0")
+		local l=Line(Coord(lp[1], lp[2]), Coord(point[1], point[2]), layer);
+
+		b:append(l)
+		b:execute()
+
+		event.delete('point', self)
+	else
+		self.line_vars['lastPoint'] = point
+		print("Click on second point")
+	end
+end

lcUILua/ui/init.lua

@@ -1,12 +1,21 @@
-operations = require 'actions.operations'
+require 'actions.operations'
+
+op = {}
 
 function new_file()
 	cadMdiChild = lc.CadMdiChild()
 	cadMdiChild:newDocument()
-	mdiArea:addSubWindow(cadMdiChild)
+	window = mdiArea:addSubWindow(cadMdiChild)
 	cadMdiChild:showMaximized()
 	cadMdiChild:viewer():autoScale()
+
 	luaInterface:luaConnect(cadMdiChild:view(), "mousePressEvent()", "click")
+	luaInterface:luaConnect(cadMdiChild:view(), "destroyed()", "onMdiChildDestroyed")
+
+	id = #op + 1
+	op[id] = Operations:new()
+	op[id].id = id
+	window:widget().id = id
 end
 
 function open_file()
@@ -41,18 +50,29 @@ end
 function load_file(fileName)
 	cadMdiChild = lc.CadMdiChild()
 	cadMdiChild:import(fileName:toStdString())
-	mdiArea:addSubWindow(cadMdiChild)
+	window = mdiArea:addSubWindow(cadMdiChild)
 	cadMdiChild:showMaximized()
-
 	luaInterface:luaConnect(cadMdiChild:view(), "mousePressEvent()", "click")
+	luaInterface:luaConnect(cadMdiChild:view(), "destroyed()", "onMdiChildDestroyed")
+
+	id = #op + 1
+	op[id] = Operations:new()
+	op[id].id = id
+	window:widget().id = id
 end
 
 function click()
-	local view = mdiArea:activeSubWindow():widget():view()
-	local x = view:x()
-	local y = view:y()
+	local widget = mdiArea:activeSubWindow():widget()
+	local position = widget:cursor():position()
+	local x = position:x()
+	local y = position:y()
+
+	event.trigger('point', {x, y})
+end
 
-	operations.click(x, y)
+function create_line()
+	local widget = mdiArea:activeSubWindow():widget()
+	op[widget.id]:create_line()
 end
 
 --UI
@@ -77,7 +97,7 @@ luaInterface:luaConnect(mainWindow:findChild("actionNew"), "triggered(bool)", "n
 luaInterface:luaConnect(mainWindow:findChild("actionOpen"), "triggered(bool)", "open_file")
 luaInterface:luaConnect(mainWindow:findChild("actionUndo"), "triggered(bool)", "undo")
 luaInterface:luaConnect(mainWindow:findChild("actionRedo"), "triggered(bool)", "redo")
-luaInterface:luaConnect(lineAction, "triggered(bool)", "operations.create_line")
+luaInterface:luaConnect(lineAction, "triggered(bool)", "create_line")
 
 luaScript = lc.LuaScript(mdiArea)
 mainWindow:addDockWidget(2, luaScript)

lcviewernoqt/drawables/lccursor.cpp

@@ -77,3 +77,7 @@ void Cursor::onSnapPointEvent(SnapPointEvent const & event) {
 Nano::Signal<void(const LocationEvent&)> Cursor::locationEvents() const {
     return _locationEvent;
 }
+
+lc::geo::Coordinate Cursor::position() const {
+	return lc::geo::Coordinate(_lastSnapEvent.snapPoint().x(), _lastSnapEvent.snapPoint().y());
+}

lcviewernoqt/drawables/lccursor.h

@@ -23,6 +23,8 @@ namespace LCViewer {
 
         void onSnapPointEvent(SnapPointEvent const & event);
 
+        lc::geo::Coordinate position() const;
+
         Nano::Signal<void(const LocationEvent &)> locationEvents() const;
 
     private:

lcviewernoqt/managers/snapmanagerimpl.cpp

@@ -107,6 +107,9 @@ void SnapManagerImpl::setDeviceLocation(int x, int y) {
         }
     }
 
+	//If no snap points found show cursor at mouse pos
+	_snapPointEvent(SnapPointEvent(location));
+
     // FIXME: Currently sending a snapEvent so the cursor get's updated, what we really want is some sort of a release snap event
     // but only when we had a snap, but just lost it
     //SnapPointEvent snapEvent(lc::geo::Coordinate(event.mousePosition().x(), event.mousePosition().y()));

lcviewerqt/lcadviewer.cpp

@@ -22,7 +22,7 @@ LCADViewer::LCADViewer(QWidget *parent) :
 
     setMouseTracking(true);
     this->_altKeyActive = false;
-
+	setCursor(Qt::BlankCursor);
 }
 
 LCADViewer::~LCADViewer() {