1
0
Fork 0
Commit Graph

470 Commits

Author SHA1 Message Date
Michael Hackstein ed827d77cd GraphViewer: Added/Tested default colouring of Edges and nodes 2013-04-04 16:36:16 +02:00
Michael Hackstein 2e43dbfb14 Aardvark: Adapted new Foxx interface 2013-04-04 15:56:02 +02:00
Michael Hackstein 8a9c58f6a4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-04 14:14:47 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Michael Hackstein 2affe643d3 GraphViewer: Enlarged the Arrow Pointer, has to be changed to be relative to nodesize 2013-04-04 01:04:58 +02:00
Michael Hackstein 159c55be39 GraphViewer: EdgeColouring tested in demo.html, again the label is set to black forcefully 2013-04-04 00:46:41 +02:00
Michael Hackstein c208a94f52 GraphViewer: Implemented UI Dialogs for edge colouring 2013-04-04 00:30:54 +02:00
Michael Hackstein f5c523ea56 GraphViewer: Implemented test for edge colouring dialogs 2013-04-04 00:22:24 +02:00
Michael Hackstein 8ab12a75b5 GraphViewer: Node colouring added to the demo.html. Decided to forcefully set the TextColour to black, as it inherits the user defined colour-scheme otherwise and this gets unreadable quite fast 2013-04-04 00:16:49 +02:00
Michael Hackstein 8a0b79b429 GraphViewer: NodeShaper now creates UI elements to change the colouring 2013-04-03 18:06:35 +02:00
Michael Hackstein 5c9c408cb4 GraphViewer: Added tests for Node-Colour change controls 2013-04-03 17:48:12 +02:00
Michael Hackstein c62230782a GraphViewer: EdgeShaper now supports colouring by attribute value 2013-04-03 17:36:59 +02:00
Michael Hackstein f08392f592 GraphViewer: NodeShaper now supports colouring by attribute value 2013-04-03 17:27:13 +02:00
Michael Hackstein e23506662f GraphViewer: Implemented ColourMapper 2013-04-03 17:15:01 +02:00
Michael Hackstein b2750383f4 GraphViewer: Colour Mapper now returns colours directly, unfortunately the pre definition of colours in the svg does not work at all... 2013-04-03 16:33:02 +02:00
Michael Hackstein a7d9d161cb GraphViewer: Added Test for ColourMapper.reset() 2013-04-03 16:12:52 +02:00
Michael Hackstein 3ccd7a5b7b GraphViewer: Added ColourMapper and implemented tests. This class should return colours for based on attribute values 2013-04-03 16:07:02 +02:00
Michael Hackstein fa2192672a GraphViewer: Node colouring has now 2 options, single colour and colour based on expanded or not 2013-04-03 15:19:35 +02:00
Michael Hackstein 02a94c1bcd GraphViewer: Edge colouring has now 2 options, single colour and gradient colour. However gradient works only with a hack and only on Safari due to SVG problems 2013-04-03 15:05:35 +02:00
Michael Hackstein 67cd95912d GraphViewer: Added tests for colouring of Nodes/Edges 2013-04-03 14:33:31 +02:00
Michael Hackstein de5539fa5c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-03 09:32:29 +02:00
Michael Hackstein 1b9b0daaa2 GraphViewer: Added test for Edge colouring 2013-04-03 07:52:43 +02:00
Michael Hackstein db3da09be9 GraphViewer: Changed rendering of edges, they are now translated and rotated instead of giving x1/y1 and x2/y2. This works much better for labels 2013-04-03 06:54:10 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 711b5884d3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into HEAD 2013-04-02 17:47:33 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Michael Hackstein 840a85496a GraphViewer: Embedded the Edges in an own g element 2013-04-02 16:08:48 +02:00
Frank Celler 3512fa6ff0 fixed error handling 2013-04-02 15:00:55 +02:00
Michael Hackstein d5756e0436 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-02 11:31:47 +02:00
Michael Hackstein f5a018b6e4 GraphViewer: Implemented UI Button creation for the EdgeShaper 2013-04-02 11:31:17 +02:00
Michael Hackstein b2f90348a8 GraphViewer: Moved further UI funcitons to the Helper 2013-04-02 11:16:58 +02:00
Michael Hackstein 5f4a9a76d2 GraphViewer: Added test for EdgeShaper UI elements 2013-04-02 11:10:57 +02:00
Michael Hackstein 60572c4889 GraphViewer: Changed UI creation, common parts are now exported to a helper function for reusability 2013-04-02 11:07:18 +02:00
Michael Hackstein c967c27a27 GraphViewer: Added Marker-Shape to EdgeShaper, and fixed a jQuery-Selector bug, if _id contains special symbols 2013-04-02 10:44:43 +02:00
Michael Hackstein fdd630f104 GraphViewer: Fixed Demo, removed unused leftover functions 2013-04-02 09:59:09 +02:00
Thomas Richter f876e30816 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-02 09:38:45 +02:00
Michael Hackstein 954e54da53 GraphViewer: EventDispatcher now reacts to new EdgeShaper interface 2013-04-02 09:27:35 +02:00
Michael Hackstein b1a890a609 GraphViewer: Moved EdgeShaper interface to the same as NodeShaper now 2013-04-02 09:23:44 +02:00
Michael Hackstein 6c03247b2b GraphViewer: Adapted Tests for EdgeShaper, this will be moved to the same interface as NodeShaper 2013-04-02 08:58:27 +02:00
Michael Hackstein 8d4b9b557a GraphViewer: Updated licence to 2013 2013-04-02 07:11:39 +02:00
Michael Hackstein 861039ee85 GraphViewer: Fixed binding to update event. All Tests pass again yeah 2013-04-02 07:08:50 +02:00
Michael Hackstein 79ca70a1e7 GraphViewer: Fixed single node reshape 2013-04-02 06:59:35 +02:00
Michael Hackstein deb9bd05e9 GraohViewer: Implemented first button: Switch NodeLayout to Circle 2013-04-01 13:36:56 +02:00
Michael Hackstein a0b7f7e73c GraphViewer: Added first sepcs for the UI-Generator of the NodeShaper 2013-04-01 11:46:39 +02:00
Michael Hackstein 443a2bb766 GraphViewer: Fix for NodeShaper 2013-04-01 11:02:05 +02:00
Frank Celler d411d14aed added generated file 2013-03-31 23:32:10 +02:00
Frank Celler 3921fd07c8 no strict for assign 2013-03-31 19:32:25 +02:00
Frank Celler 7def1cf29f Merge remote-tracking branch 'origin/feature/commonjs' into devel
Conflicts:
	apps/aardvark/manifest.json
	apps/aardvark/manifestComplete.json
	etc/arangodb/arangod.conf.in
	etc/relative/arangod.conf
	html/admin/js/bootstrap/module-internal.js
	js/apps/aardvark/assets/collections/foxxCollection.js
	js/apps/aardvark/assets/index.html
	js/apps/aardvark/assets/lib/backbone.js
	js/apps/aardvark/assets/lib/jquery.js
	js/apps/aardvark/assets/lib/underscore.js
	js/apps/aardvark/assets/models/foxx.js
	js/apps/aardvark/assets/views/foxxListView.js
	js/apps/aardvark/assets/views/foxxView.js
	js/apps/aardvark/index.html
	js/apps/aardvark/manifest.json
	js/common/bootstrap/module-internal.js
2013-03-31 12:46:16 +02:00
Frank Celler 7031210a53 fixed browser 2013-03-31 00:10:48 +01:00
Frank Celler e1125421a9 added generated 2013-03-31 00:10:48 +01:00