--- trunk/tntnet/dynamic/temperaturegraph.ecpp 2007/12/08 19:19:07 196 +++ trunk/tntnet/dynamic/temperaturegraph.ecpp 2007/12/09 08:03:54 197 @@ -21,7 +21,7 @@ reply.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT"); //date in the past GD::Image image; -image.CreateTrueColor( GD::Size(600,360)); +image.Create( GD::Size(600,360)); //Black color scheme //GD::TrueColor decoration(45,95,0); @@ -29,23 +29,24 @@ //GD::TrueColor line(255,0,0); //White color scheme -image.Fill( GD::Point(1,1), GD::TrueColor(255,255,255).Int() ); -GD::TrueColor decoration(60,60,60); -GD::TrueColor text(0,0,0); -GD::TrueColor line(255,0,0); +int white = image.ColorAllocate(255,255,255); +int decoration = image.ColorAllocate(60,60,60); +int text = image.ColorAllocate(0,0,0); +int line = image.ColorAllocate(255,0,0); +image.Fill( GD::Point(1,1), white ); -image.String(gdFontSmall, 250,5, "Temperature graph", text.Int()); -image.String(gdFontSmall, 200,18, "Latest 20 samples, in degrees Celcius", text.Int()); +image.String(gdFontSmall, 250,5, "Temperature graph", text); +image.String(gdFontSmall, 200,18, "Latest 20 samples, in degrees Celcius", text); for (int i=0; i<11; ++i) { std::stringstream marker; marker << (100- (i*10)); int y = (i*30) + 40; - image.Line( 30, y, 590, y, decoration.Int()); + image.Line( 30, y, 590, y, decoration); - image.String(gdFontSmall, 5, y-7, marker.str().c_str(), text.Int()); + image.String(gdFontSmall, 5, y-7, marker.str().c_str(), text); } ///////////////////////////////////////////////// @@ -71,11 +72,11 @@ int y = ((100-current) * 3) + 40; //image.FilledArc( GD::Point(x,y), GD::Size(3,3), 0, 360, line.Int(), gdPie); - image.FilledRectangle( GD::Point(x-1,y-1), GD::Point(x+1,y+1), line.Int() ); + image.FilledRectangle( GD::Point(x-1,y-1), GD::Point(x+1,y+1), line ); if (i>0) { - image.Line( GD::Point(x,y), previous, line.Int()); + image.Line( GD::Point(x,y), previous, line); } previous = GD::Point(x,y);