From 86c67055812b4e3395e4f2b832aac81b4a5bfa34 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 21 May 2020 12:17:03 -0400 Subject: cleanup code --- tksao/colorbar/colorbar.C | 2 ++ tksao/colorbar/colorbarbase.C | 8 ++++++++ tksao/colorbar/colorbarrgb.C | 2 ++ tksao/tkutil/gridbase.C | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/tksao/colorbar/colorbar.C b/tksao/colorbar/colorbar.C index 554dc58..9e7244c 100644 --- a/tksao/colorbar/colorbar.C +++ b/tksao/colorbar/colorbar.C @@ -812,6 +812,7 @@ void Colorbar::tagSaveCmd(const char* fn) void Colorbar::macosx(float scale, int width, int height, const Vector& v, const Vector& s) { + /* if (!colorCells) return; @@ -848,6 +849,7 @@ void Colorbar::macosx(float scale, int width, int height, if (dst) delete [] dst; + */ } #endif diff --git a/tksao/colorbar/colorbarbase.C b/tksao/colorbar/colorbarbase.C index c56774b..50adb08 100644 --- a/tksao/colorbar/colorbarbase.C +++ b/tksao/colorbar/colorbarbase.C @@ -834,6 +834,7 @@ void ColorbarBase::setColormapLevelCmd(int cc, double* ff) void ColorbarBase::macosxPrintCmd() { + /* ColorbarBaseOptions* opts = (ColorbarBaseOptions*)options; if (!visible) @@ -865,10 +866,12 @@ void ColorbarBase::macosxPrintCmd() // we want a border, even if no numerics macosxGrid(); macosxEnd(); + */ } void ColorbarBase::macosxGrid() { + /* ColorbarBaseOptions* opts = (ColorbarBaseOptions*)options; int& width = options->width; @@ -903,10 +906,12 @@ void ColorbarBase::macosxGrid() // numerics if (opts->numerics && lut) macosxGridNumerics(); + */ } void ColorbarBase::macosxGridNumerics() { + /* ColorbarBaseOptions* opts = (ColorbarBaseOptions*)options; Matrix mm = Translate(originX, originY); @@ -971,10 +976,12 @@ void ColorbarBase::macosxGridNumerics() } Tk_FreeFont(font); + */ } void ColorbarBase::macosxGridAST() { + /* ColorbarBaseOptions* opts = (ColorbarBaseOptions*)options; Vector oo(originX, originY); @@ -993,6 +1000,7 @@ void ColorbarBase::macosxGridAST() if (grid) grid->macosx(originX, originY); + */ } #endif diff --git a/tksao/colorbar/colorbarrgb.C b/tksao/colorbar/colorbarrgb.C index 8baadf6..024b1ff 100644 --- a/tksao/colorbar/colorbarrgb.C +++ b/tksao/colorbar/colorbarrgb.C @@ -337,6 +337,7 @@ void ColorbarRGB::setRGBChannelCmd(const char* c) void ColorbarRGB::macosx(float scale, int width, int height, const Vector& v, const Vector& s) { + /* if (!colorCells) return; @@ -406,6 +407,7 @@ void ColorbarRGB::macosx(float scale, int width, int height, if (dst) delete [] dst; + */ } #endif diff --git a/tksao/tkutil/gridbase.C b/tksao/tkutil/gridbase.C index 92f73ba..19b190b 100644 --- a/tksao/tkutil/gridbase.C +++ b/tksao/tkutil/gridbase.C @@ -270,6 +270,7 @@ void GridBase::psColor(Attribute* attr) int GridBase::macosxLine(int n, float* x, float* y) { + /* if (n<2 || !x || !y) return 1; @@ -291,6 +292,7 @@ int GridBase::macosxLine(int n, float* x, float* y) macosxDrawLines(v, n); delete [] v; + */ return 1; } @@ -298,6 +300,7 @@ int GridBase::macosxLine(int n, float* x, float* y) int GridBase::macosxText(const char* txt, float x, float y, const char* just, Vector up) { + /* // change this later Tcl_DString psdstr; Tcl_DStringInit(&psdstr); @@ -312,6 +315,7 @@ int GridBase::macosxText(const char* txt, float x, float y, macosxColor(parent_->getXColor(text_->colorName())); macosxDrawText(cc, angle, txt); + */ return 1; } -- cgit v0.12