wads 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2652d96c92be67ffd117365e2eb1ed93c21fd6f6c83cae037c6761f3f70754d5
-  data.tar.gz: e1680952ab2bdd333bc518ae7d97bca0a8bfc4033e2b0b9f8bf062e689ee22e9
+  metadata.gz: 14aff80a445145535994cd93357eae0a5ed6b3b5ae31c722ab043e92857dc645
+  data.tar.gz: 5cbcc5dea862306c0d9e572f8781b78f1da32e77947f130ef49670ff3f9ef8fd
 SHA512:
-  metadata.gz: 2e07cd62b59ca7d4e73176a94f3396f37f2981b6d448ebdd9490f9b6d5c0a69e0cd531805fed3e5512435b2d9a669521b1a047e0d022dd9ee0fb1ffb9ddd1941
-  data.tar.gz: 9189a546fe8c0f74fa0e18abbca8de17eacd70b63b7092e09374b4315f832ed359f62add905a3ce9c82641728b569846fc44f04007b2e14bcdb28e0608f35e3d
+  metadata.gz: 1e43b86028c31695ecee423d4cda06a59e09386f55cd08507058443373541f2dd2914dae44d0f6c5d2937688546b37986f0c7cc66f7ae4f24d749d4457e390f3
+  data.tar.gz: 954a9e628886be15e7e91cdf3a7522c845480e48b49cd0c01666d91fb695f6885c06775933d1f36ff64ce3db75e508a2f2d37e20b8067fa8dce442dead4aa32d

data/README.md

@@ -27,6 +27,9 @@ cd ruby-wads
 This will run the sample NASDAQ stocks analysis that features the use of the 
 Stats class, and a table Gosu widget used to display the results of the analysis.
 
+![alt Screenshot](https://github.com/dbroemme/ruby-wads/blob/main/media/StocksSample.png?raw=true)
+
+
 You can also see the graph capabilities by running the Star Wars analysis example.
 This uses a data set that captures all character interactions within Episode 4.
 
@@ -38,6 +41,34 @@ There is also a sample Graph display using the following command.
 ```
 ./run-sample-app -g
 ```
+Note that you can construct graphs in one of two ways. The first approach uses Nodes directly.
+```
+root = Node.new("a")
+b = root.add("b")
+b.add("d")
+b.add("e").add("f")
+root.add("c")
+Graph.new(root)
+```
+The second approach uses an overarching Graph object. 
+```
+g = Graph.new 
+g.add("a")
+g.add("b")
+g.add("c")
+g.add("d")
+g.add("e")
+g.add("f")
+g.connect("a", "b")
+g.connect("a", "c")
+g.connect("b", "d")
+g.connect("b", "e")
+g.connect("e", "f")
+```
+
+Currently, the Graph object is used by the Graph Widget for display. For the code above, this appears by default as follows:
+
+![alt Screenshot](https://github.com/dbroemme/ruby-wads/blob/main/media/SampleGraph.png?raw=true)
 
 ## References
 

data/lib/wads/app.rb

@@ -49,7 +49,7 @@ class WadsSampleApp < Gosu::Window
             process_lottery_data
 
         elsif opts[:graph] 
-            graph = create_test_graph
+            graph = create_test_graph #_using_nodes
             if not opts[:text]
                 @display_widget = SampleGraphDisplay.new(@small_font, graph)
                 show
@@ -204,6 +204,15 @@ class WadsSampleApp < Gosu::Window
         g.connect("e", "f")
         g
     end
+
+    def create_test_graph_using_nodes
+        root = Node.new("a")
+        b = root.add("b")
+        b.add("d")
+        b.add("e").add("f")
+        root.add("c")
+        Graph.new(root)
+    end
 end
 
 class SampleStocksDisplay < Widget

data/lib/wads/data_structures.rb

@@ -271,6 +271,14 @@ module Wads
             @visited = false
             @tags = tags
         end 
+
+        def add(name, value = nil, tags = {})
+            add_output_node(Node.new(name, value, tags))
+        end
+
+        def children 
+            @outputs 
+        end
         
         def add_child(name, value)
             add_output(name, value)
@@ -400,9 +408,14 @@ module Wads
         attr_accessor :node_list
         attr_accessor :node_map
 
-        def initialize 
+        def initialize(root_node = nil)
             @node_list = []
             @node_map = {}
+            if root_node 
+                root_node.visit do |n|
+                    add_node(n)
+                end
+            end
         end
 
         def add(name, value = nil, tags = {}) 

data/lib/wads/version.rb

@@ -1,3 +1,3 @@
 module Wads
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 end

data/lib/wads/widgets.rb

@@ -946,6 +946,9 @@ module Wads
 
         def is_row_selected(mouse_y)
             row_number = determine_row_number(mouse_y)
+            if row_number.nil?
+                return false
+            end
             @selected_rows.include?(@current_row + row_number)
         end 
 
@@ -995,6 +998,9 @@ module Wads
         def handle_mouse_down mouse_x, mouse_y
             if contains_click(mouse_x, mouse_y)
                 row_number = determine_row_number(mouse_y)
+                if row_number.nil? 
+                    return WidgetResult.new(false)
+                end
                 # First check if its the delete button that got this
                 delete_this_row = false
                 @delete_buttons.each do |db|
@@ -1423,6 +1429,7 @@ module Wads
                 @rendered_nodes.values.each do |vn|
                     vn.draw 
                 end 
+
                 # Draw the connections between nodes 
                 @visible_data_nodes.values.each do |data_node|
                     data_node.outputs.each do |connected_data_node|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wads
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - dbroemme
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -77,6 +77,8 @@ files:
 - lib/wads/version.rb
 - lib/wads/widgets.rb
 - media/Banner.png
+- media/SampleGraph.png
+- media/StocksSample.png
 - media/WadsScreenshot.png
 - run-sample-app
 - sample_app.rb