Changeset 151 for cpp/frams/canvas

Timestamp:

03/01/14 22:07:48 (11 years ago)

Author:

sz

Message:

(c) header added

Location:

cpp/frams/canvas

Files:

• canvasutil.cpp (modified) (1 diff)
• neurodiagram.cpp (modified) (5 diffs)

cpp/frams/canvas/canvasutil.cpp

@@ +1 @@
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
+// Refer to http://www.framsticks.com/ for further information.
+
 #include "canvasutil.h"
 

cpp/frams/canvas/neurodiagram.cpp

@@ +1 @@
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
+// Refer to http://www.framsticks.com/ for further information.
+
 #include "neurodiagram.h"
 #include "nn_layout.h"
@@ -85 +89 @@
 void NeuroDiagram::hide()
 {
-        NeuroProbe *pr;
         showing_not_alive_label = 0;
         if (o) o->delmodel_list.remove(killnode);
-        for (probes.start(); pr = (NeuroProbe*)probes();) delete pr;
+        FOREACH(NeuroProbe*,pr,probes)
+                delete pr;
         probes.clear();
         selection.clear(0);
@@ -287 +291 @@
         for (int iw = 0; iw < n->getInputCount(); iw++)
         {
-                ns2 = diagram.getNS(n->getInput(iw)->refno);// the other NeuroSymbol (our input will connecto to its output)
+                ns2 = diagram.getNS(n->getInput(iw)->refno); // the other NeuroSymbol (our input will connect to its output)
 
                 int yw = inputY(iw);
-                int xw = yw / 4;// x coordinate of the first corner point, depends on yw to avoid overlapping between inputs
+                int xw = yw / 4; // x coordinate of the first corner point, depends on yw to avoid overlapping between inputs
                 drawLine(size.x / 4, yw, xw, yw); // first horizontal segment (to the left)
                 diagram.setWireColor(ns2->n->state, 0);
                 if ((diagram.linetype != 1) || (ns2->pos.x + ns2->size.x / 2 < pos.x))
-                { // straight line to the other neuron's output (signal goes forwards)
+                { // straight line to the other neuron's output (the signal goes forwards)
                         ns2->lineTo(ns2->size.x, ns2->size.y / 2);
                 }
                 else
-                { // make a loop from 3 segments - vert/horiz/vert (signal goes backwards)
+                { // make an U-shaped loop from 3 segments - vert/horiz/vert (the signal goes backwards)
                         int y2;
                         int down;
@@ -542 +546 @@
                 {
                         NeuroImpl *ni = NeuroNetImpl::getImpl(link->n);
-                        if (ni) ni->setCurrentState(st, chsel);//tu bylo odwrotnie!
+                        if (ni) ni->setCurrentState(st, chsel);
                 }
                 requestPaint();
@@ -645 +649 @@
 void NeuroDiagram::probeSampling(void*obj, long dummy)
 {
-        NeuroProbe *pr;
-        for (probes.start(); pr = (NeuroProbe*)probes();) pr->sampling();
+        FOREACH(NeuroProbe*,pr,probes) pr->sampling();
         requestPaint();
 }