[Openautomation-svn] SF.net SVN: openautomation:[326] PyWireGate/trunk

[<ma...@us...>]

Revision: 326
          http://openautomation.svn.sourceforge.net/openautomation/?rev=326&view=rev
Author:   mayerch
Date:     2011-05-09 17:10:59 +0000 (Mon, 09 May 2011)

Log Message:
-----------
Renamed "log" block to "display" - it'll show the current value in the editor in future and won't log to the screen anymore

Modified Paths:
--------------
    PyWireGate/trunk/logic_server/LogicLibrary.py
    PyWireGate/trunk/logik.json
    PyWireGate/trunk/logik2.json

Modified: PyWireGate/trunk/logic_server/LogicLibrary.py
===================================================================
--- PyWireGate/trunk/logic_server/LogicLibrary.py	2011-05-09 17:09:29 UTC (rev 325)
+++ PyWireGate/trunk/logic_server/LogicLibrary.py	2011-05-09 17:10:59 UTC (rev 326)
@@ -27,7 +27,7 @@
   _codingInstructions  = lambda s, n, i, o, p: ( "%s = %s" % ( o[0], p[0] ), "%s_next = %s" % ( o[0], p[0] ) )
 
 class LogBlock( LogicModule.LogicModule ):
-  _name                = "log"
+  _name                = "display"
   _inPorts             = [ 'in' ]
   _outPorts            = []
   _parameters          = []

Modified: PyWireGate/trunk/logik.json
===================================================================
--- PyWireGate/trunk/logik.json	2011-05-09 17:09:29 UTC (rev 325)
+++ PyWireGate/trunk/logik.json	2011-05-09 17:10:59 UTC (rev 326)
@@ -10,14 +10,14 @@
       "x": 150, "y": 50, "width": 50, "height": 50,
       "parameters": { "gain": 5.0 }
     },
-    "Log1": {
-      "type": "log",
-      "x": 250, "y": 150, "width": 50, "height": 50,
+    "Display1": {
+      "type": "display",
+      "x": 250, "y": 150, "width": 150, "height": 50,
       "parameters": {}
     },
-    "Log2": {
-      "type": "log",
-      "x": 250, "y": 50, "width": 50, "height": 50,
+    "Display2": {
+      "type": "display",
+      "x": 250, "y": 50, "width": 150, "height": 50,
       "parameters": {}
     },
     "Integral1": {
@@ -35,19 +35,19 @@
       "x": 150, "y": 350, "width": 50, "height": 50,
       "parameters": { "gain": -1.0 }
     },
-    "Log3": {
-      "type": "log",
-      "x": 250, "y": 250, "width": 50, "height": 50,
+    "Display3": {
+      "type": "display",
+      "x": 250, "y": 250, "width": 150, "height": 50,
       "parameters": {}
     }
   },
   "signals": [
-    [ "Const1"   , 0, "Log1"      , 0, {} ],
+    [ "Const1"   , 0, "Display1"  , 0, {} ],
     [ "Const1"   , 0, "Gain1"     , 0, {} ],
-    [ "Gain1"    , 0, "Log2"      , 0, {} ],
+    [ "Gain1"    , 0, "Display2"  , 0, {} ],
     [ "Integral1", 0, "Integral2" , 0, {} ],
     [ "Integral2", 0, "Gain2"     , 0, {} ],
     [ "Gain2"    , 0, "Integral1" , 0, {} ],
-    [ "Integral2", 0, "Log3"      , 0, {} ]
+    [ "Integral2", 0, "Display3"  , 0, {} ]
   ]
 }
\ No newline at end of file

Modified: PyWireGate/trunk/logik2.json
===================================================================
--- PyWireGate/trunk/logik2.json	2011-05-09 17:09:29 UTC (rev 325)
+++ PyWireGate/trunk/logik2.json	2011-05-09 17:10:59 UTC (rev 326)
@@ -15,9 +15,9 @@
       "x": 150, "y": 200, "width": 50, "height": 50,
       "parameters": {}
     },
-    "Log22": {
-      "type": "log",
-      "x": 350, "y": 300, "width": 50, "height": 50,
+    "Display22": {
+      "type": "display",
+      "x": 350, "y": 300, "width": 150, "height": 50,
       "parameters": {}
     },
     "Integral2": {
@@ -38,6 +38,6 @@
     [ "Memory1"  , 0, "Sum1"      , 1, {} ],
     [ "Integral2", 0, "Gain2"     , 0, {} ],
     [ "Gain2"    , 0, "Gain1"     , 0, {} ],
-    [ "Integral2", 0, "Log22"     , 0, {} ]
+    [ "Integral2", 0, "Display22" , 0, {} ]
   ]
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.