Changeset 254

Timestamp:

11/18/14 17:02:05 (10 years ago)

Author:

Maciej Komosinski

Message:

More color definitions in neural diagrams

File:

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

cpp/frams/canvas/neurodiagram.cpp

@@ -243 +243 @@
 
 NeuroSymbol::NeuroSymbol(NeuroDiagram &nd, Neuro * _n)
-:selected(0), n(_n), diagram(nd)
+        :selected(0), n(_n), diagram(nd), FramDrawToolkit(nd.getColorDefs())
 {
         tooltip = "#";
@@ -261 +261 @@
         if (selected)
         {
-                setColor(255, 255, 255);
+                setColor(ColorDefs::neuroselection);
                 fillRect(0, 0, size.x, size.y);
         }
@@ -271 +271 @@
         {
                 const char* t = label;
+                setColor(ColorDefs::neurosymbol);
                 drawAlignedText(size.x / 2, size.y - textHeight(), 0, t);
 
@@ -325 +326 @@
                 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.isLive())
+                        diagram.setWireColor(ns2->n->state, 0);
                 // linetype: 1 (default) - draw straight or U-shape depending on layout
                 //           0 (debug option) - only draw straight lines
@@ -442 +444 @@
 NeuroProbe::NeuroProbe(NeuroSymbol* ns)
 :DCanvasWindow(DCanvasWindow::Title + DCanvasWindow::Border + DCanvasWindow::Close + DCanvasWindow::Size,
-(const char*)ns->getLabel(), &neurochart, &neurochart)
+  (const char*)ns->getLabel(), &neurochart, &neurochart)
 {
         holdismine = 0;