BEDGE-2699 - code refactoring

Author: dhoomakethu

.gitignore

@@ -59,7 +59,7 @@ docs/_build/
 target/
 
 #PyCharms
-*.idea
+.idea
 
 #IniFiles
 *.ini

LICENSE

@@ -15,15 +15,16 @@ Modbus Simulator with GUI based on modbus-tk
     - [OSx](https://kivy.org/docs/installation/installation-osx.html)
     - [Linux](http://kivy.org/docs/installation/installation-linux.html#ubuntu-11-10-or-newer)
     - [Windows](http://kivy.org/docs/installation/installation-windows.html)
+2. create virtualenv and install requirements
+
+
+    $ pip install -r requirements
 
-2. install modbus-tk
-    * On Mac kivy uses its own virtual env ,hence all required modules needs to be installed seperatly [installing modules](http://kivy.org/docs/installation/installation-macosx.html#installing-modules)
-        - kivy -m pip install modbus-tk
 3. [Setup development environment](https://github.com/kivy/kivy/wiki/Setting-Up-Kivy-with-various-popular-IDE's)
 
 ## Running/Testing application
-    $ cd modbus_simulator
-    $ kivy main.py
+    $ ./tools/launcher
+    
 A GUi should show up if all the requirements are met !!
 
 ![Screen Shot 2015-11-01 at 7.25.50 PM.png](https://bitbucket.org/repo/X9byrq/images/4179375251-Screen%20Shot%202015-11-01%20at%207.25.50%20PM.png)
@@ -48,7 +49,7 @@ A GUi should show up if all the requirements are met !!
 ## Packaging for different OS (Standalone applications)
 A standalone application specific to target OS can be created with Kivy package manager
 
-1. [OSX](http://kivy.org/docs/guide/packaging-macosx.html)
+1. [OSX](https://kivy.org/docs/guide/packaging-osx.html)
 2. [Linux](http://bitstream.io/packaging-and-distributing-a-kivy-application-on-linux.html)
 3. [Windows](http://kivy.org/docs/guide/packaging-windows.html)
 

README.md

@@ -5,21 +5,21 @@
 import kivy
 kivy.require('1.4.2')
 from kivy.app import App
-from kivy.properties import ObjectProperty, NumericProperty
+from kivy.properties import ObjectProperty
 from kivy.uix.boxlayout import BoxLayout
 from kivy.animation import Animation
-from kivy.uix.label import Label
 from kivy.uix.textinput import TextInput
-from kivy.uix.settings import (Settings, SettingsWithSidebar)
+from kivy.uix.settings import SettingsWithSidebar
 from kivy.uix.listview import ListView, ListItemButton
 from kivy.adapters.listadapter import ListAdapter
-import DataModel
-from modbus import ModbusSimu, BLOCK_TYPES, configure_modbus_logger
-from settings import SettingIntegerWithRange
-from backgroundJob import BackgroundJob
+from utils.modbus import ModbusSimu, BLOCK_TYPES, configure_modbus_logger
+from ui.settings import SettingIntegerWithRange
+from utils.backgroundJob import BackgroundJob
 import re
 import os
 from kivy.config import Config
+from kivy.lang import Builder
+import ui.datamodel
 
 MAP = {
     "coils": "coils",
@@ -28,6 +28,8 @@
     'holding registers': 'holding_registers'
 }
 
+Builder.load_file("templates/modbussimu.kv")
+
 
 class FloatInput(TextInput):
     pat2 = re.compile(r'\d+(?:,\d+)?')
@@ -43,9 +45,9 @@ def insert_text(self, substring, from_undo=False):
 
 
 class Gui(BoxLayout):
-    '''
+    """
     Gui of widgets. This is the root widget of the app.
-    '''
+    """
 
     # ---------------------GUI------------------------ #
     # Checkbox to select between tcp/serial
@@ -168,7 +170,6 @@ def data_map(self):
     def data_map(self, value):
         self._data_map[self.active_server] = value
 
-
     def _init_coils(self):
         time_interval = int(eval(self.config.get("Simulation",
                                                  "time interval")))

Control-Panel.png assets/Control-Panel.pngControl-Panel.png renamed to assets/Control-Panel.png

@@ -0,0 +1,10 @@
+Cython==0.25.2
+docutils==0.13.1
+Kivy==1.9.1
+Kivy-Garden==0.1.4
+modbus-tk==0.5.4
+pygame==1.9.2
+pyglet==1.2.4
+Pygments==2.1.3
+pyserial==3.1
+requests==2.12.4