Merge branch 'New-Simu' of https://github.com/riptideio/modbus-simulator into New-Simu

Author: dhoomakethu

.gitignore

@@ -66,6 +66,9 @@ target/
 
 #JSONFiles
 *.json
+
+/.venv
+
 **/*.ini
 instructions
 read

LICENSE

@@ -51,4 +51,4 @@ A standalone application specific to target OS can be created with Kivy package
 
 
 # NOTE:
-A cli version supporting both Modbus_RTU and Modbus_TCP is available here [modbus_simu_cli](https://github.com/dhoomakethu/modbus_sim_cli)
+A cli version supporting both Modbus_RTU and Modbus_TCP is available here [modbus_simu_cli](https://bitbucket.org/riptideio/modbus_sim_cli)

README.md

@@ -4,7 +4,12 @@
 '''
 import click
 import sys
-import __builtin__
+import six
+
+if six.PY2:
+    import __builtin__
+else:
+    import builtins as __builtin__
 
 
 @click.command()

img/simu.gif

@@ -17,7 +17,7 @@
             size: self.width - 2 * self.margin , self.thickness
 
 
-<DataModal>:
+<DataModel>:
 <FloatInput>:
 <Gui>:
     slave_list: slave_list
@@ -254,11 +254,13 @@
                     id: add_data
                     text: "add"
                     on_release: root.update_data_models(*args)
-                Widget:
-                Button:
-                    id: delete_data
-                    text: "delete"
-                    on_release: root.delete_data_entry(*args)
+#                Widget:
+#                Button:
+#                    id: delete_data
+#                    text: "delete"
+#                    disabled: True
+#                    on_release: root.delete_data_entry(*args)
+#                    hide: True
             Separator:
             TabbedPanel:
                 id: data_model_screen
@@ -298,7 +300,7 @@
                 id: riptide_logo
                 with_previous: False
                 disabled: True
-                title: '    v1.0.0'
+                title: '    v2.0.0'
             ActionOverflow:
             ActionButton:
                 id: reset_simulation