Blob Blame History Raw
diff -Naur scidavis-1.25/libscidavis/src/ApplicationWindow.cpp scidavis-master/libscidavis/src/ApplicationWindow.cpp
--- scidavis-1.25/libscidavis/src/ApplicationWindow.cpp	2019-03-05 00:49:55.000000000 +0100
+++ scidavis-master/libscidavis/src/ApplicationWindow.cpp	2019-03-14 22:27:01.000000000 +0100
@@ -9611,7 +9611,7 @@
 
                       CurveLayout cl;
                       cl.connectType=curve[4].toInt();
-                      cl.lCol=curve[5].toUInt();
+                      cl.lCol=COLORUINT(curve[5]);
                       if (d_file_version <= 89)
                         cl.lCol = convertOldToNewColorIndex(cl.lCol);
                       cl.lStyle=curve[6].toInt();
@@ -9622,7 +9622,7 @@
                       else
                         cl.sType=curve[9].toInt();
 
-                      cl.symCol=curve[10].toUInt();
+                      cl.symCol=COLORUINT(curve[10]);
                       if (d_file_version <= 89)
                         cl.symCol = convertOldToNewColorIndex(cl.symCol);
                       if (curve[11]=="-1")
@@ -9630,12 +9630,12 @@
                       else
                       {
                         cl.symbolFill = true;
-                        cl.fillCol=curve[11].toUInt();
+                        cl.fillCol=COLORUINT(curve[11]);
                       }
                       if (d_file_version <= 89)
                         cl.fillCol = convertOldToNewColorIndex(cl.fillCol);
                       cl.filledArea=curve[12].toInt();
-                      cl.aCol=curve[13].toUInt();
+                      cl.aCol=COLORUINT(curve[13]);
                       if (d_file_version <= 89)
                         cl.aCol = convertOldToNewColorIndex(cl.aCol);
                       cl.aStyle=curve[14].toInt();
@@ -9755,21 +9755,21 @@
 			QStringList curve = s.split("\t");
 			CurveLayout cl;
 			cl.connectType=curve[6].toInt();
-			cl.lCol=curve[7].toUInt();
+			cl.lCol=COLORUINT(curve[7]);
 			cl.lStyle=curve[8].toInt();
 			cl.lWidth=curve[9].toInt();
 			cl.sSize=curve[10].toInt();
 			cl.sType=curve[11].toInt();
-			cl.symCol=curve[12].toUInt();
+			cl.symCol=COLORUINT(curve[12]);
 			if (curve[13]=="-1")
 				cl.symbolFill = false;
 			else
 			{
 				cl.symbolFill = true;
-				cl.fillCol=curve[13].toUInt();
+				cl.fillCol=COLORUINT(curve[13]);
 			}
 			cl.filledArea=curve[14].toInt();
-			cl.aCol=curve[15].toUInt();
+			cl.aCol=COLORUINT(curve[15]);
 			cl.aStyle=curve[16].toInt();
 			int current_index = 17;
 			if(curve.count() < 16)
diff -Naur scidavis-1.25/libscidavis/src/ColorButton.h scidavis-master/libscidavis/src/ColorButton.h
--- scidavis-1.25/libscidavis/src/ColorButton.h	2019-03-05 00:49:55.000000000 +0100
+++ scidavis-master/libscidavis/src/ColorButton.h	2019-03-14 22:27:01.000000000 +0100
@@ -42,6 +42,7 @@
 static inline QString COLORNAME( QColor c ) { return ('#'+QString::number(c.rgba(),16)); }
 static inline QString COLORVALUE( QString s ) { if ((s[0]=='#') && (s.size()==9)) return s.remove(1,2); else return s; }
 #endif
+static inline uint    COLORUINT( QString s ) { if (s[0]=='#') return s.remove(0,1).toUInt(nullptr,16); else return s.toUInt(); }
 
 //! A button used for color selection
 /**