Changeset 789 for cpp/frams

Timestamp:

05/29/18 15:40:49 (7 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

Location:

cpp/frams/canvas

Files:

• canvasutil.cpp (modified) (1 diff)
• nn_simple_layout.cpp (modified) (1 diff)

cpp/frams/canvas/canvasutil.cpp

@@ -5 +5 @@
 #include "canvasutil.h"
 
-static int std_unknown_symbol[]={12, 1,4, 25,25, 75,25, 75,75, 25,75, 25,25};
-static int std_neuron_symbol[]={12, 1,4, 75,50, 25,0, 25,99, 75,50, 100,50};
-static int std_inputonly_symbol[]={14, 1,5, 25,40, 35,40, 45,50, 35,60, 25,60, 25,40};
-static int std_outputonly_symbol[]={18, 1,7, 75,50, 75,60, 55,60, 65,50, 55,40, 75,40, 75,50, 100,50};
+static int std_unknown_symbol[] = { 12, 1, 4, 25, 25, 75, 25, 75, 75, 25, 75, 25, 25 };
+static int std_neuron_symbol[] = { 12, 1, 4, 75, 50, 25, 0, 25, 99, 75, 50, 100, 50 };
+static int std_inputonly_symbol[] = { 14, 1, 5, 25, 40, 35, 40, 45, 50, 35, 60, 25, 60, 25, 40 };
+static int std_outputonly_symbol[] = { 18, 1, 7, 75, 50, 75, 60, 55, 60, 65, 50, 55, 40, 75, 40, 75, 50, 100, 50 };
 
-int* drawNeuroSymbol(CanvasDrawing* c,NeuroClass* cl,int x,int y,int w,int h)
+int* drawNeuroSymbol(CanvasDrawing* c, NeuroClass* cl, int x, int y, int w, int h)
 {
-int *data=std_unknown_symbol;
-if (cl)
+        int *data = std_unknown_symbol;
+        if (cl)
         {
-        data=cl->getSymbolGlyph();
-        if (!data)
+                data = cl->getSymbolGlyph();
+                if (!data)
                 {
-                if (cl->getPreferredInputs()==0)
-                        data=std_outputonly_symbol;
-                else if (cl->getPreferredOutput()==0)
-                        data=std_inputonly_symbol;
-                else data=std_neuron_symbol;
+                        if (cl->getPreferredInputs() == 0)
+                                data = std_outputonly_symbol;
+                        else if (cl->getPreferredOutput() == 0)
+                                data = std_inputonly_symbol;
+                        else data = std_neuron_symbol;
                 }
         }
-drawVector(c,data,x,y,w,h);
-return data;
+        drawVector(c, data, x, y, w, h);
+        return data;
 }
 
-void drawVector(CanvasDrawing* c,int data[],int x,int y,int w,int h)
+void drawVector(CanvasDrawing* c, int data[], int x, int y, int w, int h)
 {
-if (!data) return;
-Pixel p;
-data++;
-for (int NL=*(data++);NL>0;NL--)
+        if (!data) return;
+        Pixel p;
+        data++;
+        for (int NL = *(data++); NL > 0; NL--)
         {
-        int NS=*(data++);
-        p.x=x+(*(data++)*w)/100;
-        p.y=y+(*(data++)*h)/100;
-        c->moveTo(p);
-        for (;NS>0;NS--)
+                int NS = *(data++);
+                p.x = x + (*(data++)*w) / 100;
+                p.y = y + (*(data++)*h) / 100;
+                c->moveTo(p);
+                for (; NS > 0; NS--)
                 {
-                p.x=x+(*(data++)*w)/100;
-                p.y=y+(*(data++)*h)/100;
-                c->lineTo(p);
+                        p.x = x + (*(data++)*w) / 100;
+                        p.y = y + (*(data++)*h) / 100;
+                        c->lineTo(p);
                 }
         }

cpp/frams/canvas/nn_simple_layout.cpp

@@ -38 +38 @@
                 for (i = 0; i < a; i++)
                 {
-                        if (e >= N) return;
-                        nn->SetXYWH(e, 70 * i + ((i + j) & 3) * 4, 70 * j + ((2 + i + j) & 3) * 4, 50, 50);
-                        e++;
+                if (e >= N) return;
+                nn->SetXYWH(e, 70 * i + ((i + j) & 3) * 4, 70 * j + ((2 + i + j) & 3) * 4, 50, 50);
+                e++;
                 }
 }