[naviserver-commits] modules/nschartdir ChangeLog,1.1.1.1,1.2 nschartdir.c,1.5,1.6

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nschartdir
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12214

Modified Files:
	ChangeLog nschartdir.c 
Log Message:
updated to Chardir 4.0


Index: nschartdir.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nschartdir/nschartdir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nschartdir.c	1 Aug 2005 19:19:44 -0000	1.5
--- nschartdir.c	24 Aug 2005 16:32:52 -0000	1.6
***************
*** 74,78 ****
       TrendLayer *trend;
     } layers[MAX_LAYERS];
! } Chart;
  
  static int ChartCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
--- 74,78 ----
       TrendLayer *trend;
     } layers[MAX_LAYERS];
! } Ns_Chart;
  
  static int ChartCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
***************
*** 80,84 ****
  static void ChartGC(void *arg);
  
! static Chart *chartList = 0;
  static Ns_Mutex chartMutex;
  static int chartIdleTimeout = 600;
--- 80,84 ----
  static void ChartGC(void *arg);
  
! static Ns_Chart *chartList = 0;
  static Ns_Mutex chartMutex;
  static int chartIdleTimeout = 600;
***************
*** 162,168 ****
  }
  
! static Chart *getChart(unsigned long id)
  {
!    Chart *chart;
  
     Ns_MutexLock(&chartMutex);
--- 162,168 ----
  }
  
! static Ns_Chart *getChart(unsigned long id)
  {
!    Ns_Chart *chart;
  
     Ns_MutexLock(&chartMutex);
***************
*** 173,177 ****
  }
  
! static void freeChart(Chart *chart,int lock)
  {
      if(!chart) return;
--- 173,177 ----
  }
  
! static void freeChart(Ns_Chart *chart,int lock)
  {
      if(!chart) return;
***************
*** 189,193 ****
  static void ChartGC(void *arg)
  {
!     Chart *chart;
      time_t now = time(0);
  
--- 189,193 ----
  static void ChartGC(void *arg)
  {
!     Ns_Chart *chart;
      time_t now = time(0);
  
***************
*** 195,199 ****
      for(chart = chartList;chart;) {
        if(now - chart->access_time > chartIdleTimeout) {
!         Chart *next = chart->next;
          Ns_Log(Notice,"ns_chartdir: GC: inactive chart %ld",chart->id);
          freeChart(chart,0);
--- 195,199 ----
      for(chart = chartList;chart;) {
        if(now - chart->access_time > chartIdleTimeout) {
!         Ns_Chart *next = chart->next;
          Ns_Log(Notice,"ns_chartdir: GC: inactive chart %ld",chart->id);
          freeChart(chart,0);
***************
*** 229,235 ****
  }
  
! static Chart *createChart(int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
!     Chart *chart;
      char *type;
      int width = 500;
--- 229,235 ----
  }
  
! static Ns_Chart *createChart(int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
!     Ns_Chart *chart;
      char *type;
      int width = 500;
***************
*** 249,253 ****
        return 0;
      }
!     chart = (Chart*)ns_calloc(1,sizeof(Chart));
      Ns_MutexLock(&chartMutex);
      chart->id = ++chartID;
--- 249,253 ----
        return 0;
      }
!     chart = (Ns_Chart*)ns_calloc(1,sizeof(Ns_Chart));
      Ns_MutexLock(&chartMutex);
      chart->id = ++chartID;
***************
*** 277,281 ****
  }
  
! static int setBackground(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int bgcolor;
--- 277,281 ----
  }
  
! static int setBackground(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int bgcolor;
***************
*** 294,298 ****
  }
  
! static int setSize(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int width,height;
--- 294,298 ----
  }
  
! static int setSize(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int width,height;
***************
*** 308,312 ****
  }
  
! static int setPlotArea(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int x,y,width,height;
--- 308,312 ----
  }
  
! static int setPlotArea(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int x,y,width,height;
***************
*** 334,338 ****
  }
  
! static int addLegend(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int x,y;
--- 334,338 ----
  }
  
! static int addLegend(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int x,y;
***************
*** 368,372 ****
  }
  
! static int addTitle(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      const char *title;
--- 368,372 ----
  }
  
! static int addTitle(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      const char *title;
***************
*** 395,399 ****
  }
  
! static int setBgImage(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      const char *image;
--- 395,399 ----
  }
  
! static int setBgImage(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      const char *image;
***************
*** 414,418 ****
  }
  
! static int setColors(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      char *name;
--- 414,418 ----
  }
  
! static int setColors(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      char *name;
***************
*** 427,433 ****
      }
      
!     if(!strcasecmp(name,"defaultPalette")) palette = defaultPalette; else
!     if(!strcasecmp(name,"whiteOnBlackPalette")) palette = whiteOnBlackPalette; else
!     if(!strcasecmp(name,"transparentPalette")) palette = transparentPalette; else {
        if(Tcl_ListObjGetElements(interp,objv[3],&argc,&argv) != TCL_OK) {
          Tcl_WrongNumArgs(interp,2,objv,"palette");
--- 427,433 ----
      }
      
!     if(!strcasecmp(name,"defaultPalette")) palette = (int*)defaultPalette; else
!     if(!strcasecmp(name,"whiteOnBlackPalette")) palette = (int*)whiteOnBlackPalette; else
!     if(!strcasecmp(name,"transparentPalette")) palette = (int*)transparentPalette; else {
        if(Tcl_ListObjGetElements(interp,objv[3],&argc,&argv) != TCL_OK) {
          Tcl_WrongNumArgs(interp,2,objv,"palette");
***************
*** 444,448 ****
  }
  
! static int setWallpaper(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      const char *image;
--- 444,448 ----
  }
  
! static int setWallpaper(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      const char *image;
***************
*** 456,460 ****
  }
  
! static int XAxisCmd(int second,Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd;
--- 456,460 ----
  }
  
! static int XAxisCmd(int second,Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd;
***************
*** 627,631 ****
  }
  
! static int YAxisCmd(int second,Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd;
--- 627,631 ----
  }
  
! static int YAxisCmd(int second,Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd;
***************
*** 858,862 ****
  }
  
! static int LayerCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd, layer, datasetID;
--- 858,862 ----
  }
  
! static int LayerCmd(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd, layer, datasetID;
***************
*** 1199,1203 ****
  }
  
! static int dashLineColor(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int color;
--- 1199,1203 ----
  }
  
! static int dashLineColor(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int color;
***************
*** 1214,1218 ****
  }
  
! static int patternColor(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int i,argc;
--- 1214,1218 ----
  }
  
! static int patternColor(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int i,argc;
***************
*** 1248,1252 ****
  }
  
! static int gradientColor(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int *array,argc;
--- 1248,1252 ----
  }
  
! static int gradientColor(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int *array,argc;
***************
*** 1269,1277 ****
      // Check if it is name
      if(argc == 1 && (name = Tcl_GetStringFromObj(argv[0],0)) &&
!        (!strcasecmp("goldGradient",name) && (array = goldGradient)) ||
!        (!strcasecmp("silverGradient",name) && (array = silverGradient)) ||
!        (!strcasecmp("redMetalGradient",name) && (array = redMetalGradient)) ||
!        (!strcasecmp("blueMetalGradient",name) && (array = blueMetalGradient)) ||
!        (!strcasecmp("greenMetalGradient",name) && (array = greenMetalGradient)) ) {
        Tcl_SetObjResult(interp,Tcl_NewIntObj(chart->chart->gradientColor(array,angle,scale,startx,starty)));
        return TCL_OK;
--- 1269,1277 ----
      // Check if it is name
      if(argc == 1 && (name = Tcl_GetStringFromObj(argv[0],0)) &&
!        (!strcasecmp("goldGradient",name) && (array = (int*)goldGradient)) ||
!        (!strcasecmp("silverGradient",name) && (array = (int*)silverGradient)) ||
!        (!strcasecmp("redMetalGradient",name) && (array = (int*)redMetalGradient)) ||
!        (!strcasecmp("blueMetalGradient",name) && (array = (int*)blueMetalGradient)) ||
!        (!strcasecmp("greenMetalGradient",name) && (array = (int*)greenMetalGradient)) ) {
        Tcl_SetObjResult(interp,Tcl_NewIntObj(chart->chart->gradientColor(array,angle,scale,startx,starty)));
        return TCL_OK;
***************
*** 1285,1289 ****
  }
  
! static int addText(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int x,y;
--- 1285,1289 ----
  }
  
! static int addText(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int x,y;
***************
*** 1313,1317 ****
  }
  
! static int PieCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd;
--- 1313,1317 ----
  }
  
! static int PieCmd(Ns_Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      int cmd;
***************
*** 1388,1392 ****
  {
      int i,cmd;
!     Chart *chart = 0;
  
      enum commands {
--- 1388,1392 ----
  {
      int i,cmd;
!     Ns_Chart *chart = 0;
  
      enum commands {

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/modules/nschartdir/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ChangeLog	20 May 2005 20:37:39 -0000	1.1.1.1
--- ChangeLog	24 Aug 2005 16:32:52 -0000	1.2
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-08-24 Vlad Seryakov vl...@cr...
+ 
+ 	* update to support ChartDirector 4.0
+ 
  2003-01-15 Vlad Seryakov vl...@cr...