Changeset 1130 for cpp/frams/canvas/neurodiagram.cpp

Timestamp:

04/16/21 15:55:34 (3 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/frams/canvas/neurodiagram.cpp (modified) (4 diffs)

cpp/frams/canvas/neurodiagram.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -13 +13 @@
 #include <frams/simul/simul.h>
 #include "common/nonstd_time.h"
+#include <algorithm>
 
 #define FIELDSTRUCT NeuroDiagram
@@ -231 +232 @@
         NeuroProbe *probe = new NeuroProbe(getNS(i));
         Pixel s = getSize();
-        s.x = s.y = max(probe->getSize().x, min(s.x / 3, s.y / 3));
+        s.x = s.y = std::max(probe->getSize().x, std::min(s.x / 3, s.y / 3));
         probes += (void*)probe;
         add(probe);
@@ -503 +504 @@
                                 int *dr = drawing;
                                 int w = size.x - 2, h = size.y - clienttop - clientbottom;
-                                int scale = min(w, h);
+                                int scale = std::min(w, h);
                                 int x0 = clienttop + leftborder + ((w > h) ? (w - h) / 2 : 0);
                                 int y0 = clientleft + topborder + ((h > w) ? (h - w) / 2 : 0);