From: <ro...@us...> - 2008-09-26 21:29:18
|
Revision: 1562 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1562&view=rev Author: ron-fox Date: 2008-09-26 21:29:08 +0000 (Fri, 26 Sep 2008) Log Message: ----------- Add superpositions to integration output. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2008-09-26 20:47:35 UTC (rev 1561) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2008-09-26 21:29:08 UTC (rev 1562) @@ -807,3 +807,6 @@ - Fixed error in RunState handling.. Set it to "Inactive" on event source EOF. This is needed to support batchmode processing of e.g. filter files. +September 26, 2008 + - backport capability to integrate superpositions as well + as the base spectrum. Modified: branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc 2008-09-26 20:47:35 UTC (rev 1561) +++ branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc 2008-09-26 21:29:08 UTC (rev 1562) @@ -61,6 +61,8 @@ #include "grobjmgr.h" #include "panemgr.h" #include "mapcoord.h" +#include "superpos.h" + /* ** Constants: */ @@ -109,6 +111,17 @@ static IntegrationDisplay *dialog = NULL; +/* + Add text and, if needed log, to the integration display: +*/ +static void addAndLog(IntegrationDisplay* d, char* pText) +{ + d->AddText(pText); + if(Xamine_logging) { + Xamine_log.LogMessage(pText); + } +} + /* ** Functional Description: @@ -217,10 +230,8 @@ g->getid(), g->getname(n), centroid, fwhm, area); - d->AddText(txt); /* Add to the dialog. */ - if(Xamine_logging) { - Xamine_log.ContinueMessage(txt); - } + addAndLog(d, txt); + } /* @@ -260,13 +271,8 @@ /* Add the line to the dialog: */ - d->AddText(txt); + addAndLog(d, txt); - /* If logging is on then also log: */ - - if(Xamine_logging) { - Xamine_log.ContinueMessage(txt); - } } /* @@ -373,6 +379,7 @@ return; } } + /* ** Functional Description: @@ -404,11 +411,10 @@ int nobjects = Xamine_GetSpectrumObjectCount(specno); int ngates = Xamine_GetSpectrumGateCount(specno); int nints; - if(att->is1d()) - nints = nobjects+ngates; - else - nints = nobjects+ngates; + nints = nobjects+ngates; + + if(nints == 0) { return; } @@ -424,11 +430,10 @@ spname, " Id Name Centroid FWHM Area\n", "Summing regions: \n"); - if(Xamine_logging) { - Xamine_log.LogMessage(buffer); - } - d->AddText(buffer); + addAndLog(d, buffer); + + // grobj_generic *objects[GROBJ_MAXOBJECTS]; if(nobjects > 0) { @@ -442,41 +447,98 @@ for( i = 0; i < nobjects; i++) { if( (objects[i]->type() == summing_region_1d) || (objects[i]->type() == summing_region_2d)) { - Integrate(dialog, objects[i], specno, spectype); + Integrate(d, objects[i], specno, spectype); } } + + delete []objects; } - nobjects = Xamine_GetSpectrumGateCount(specno); - if(nobjects > 0) { - grobj_generic** objects = new grobj_generic*[nobjects]; - Xamine_GetSpectrumGates(specno, objects, nobjects, True); + if(ngates > 0) { + grobj_generic** objects = new grobj_generic*[ngates]; + Xamine_GetSpectrumGates(specno, objects, ngates, True); grobj_type matching; if(!att->is1d()) { sprintf(buffer,"Contours:\n"); - if(Xamine_logging) - Xamine_log.LogMessage(buffer); - d->AddText(buffer); + addAndLog(d, buffer); matching = contour_2d; } else { sprintf(buffer, "Cuts: \n"); - if(Xamine_logging) - Xamine_log.LogMessage(buffer); - d->AddText(buffer); + addAndLog(d, buffer); matching = cut_1d; } - for(int i = 0; i < nobjects; i++) { + for(int i = 0; i < ngates; i++) { if(objects[i]->type() == matching) { - Integrate(dialog, objects[i], specno, spectype); + Integrate(d, objects[i], specno, spectype); } } delete []objects; } + // If the spectrum is 1-d we should also do the superpositions. + // this gets done by re-getting the objects cloning them and applying + // them to the superimposed spectra. We don't attempt to figure out + // the grobjs defined on the superpositions as they aren't even being + // displayed. + + if (att->is1d()) { + win_1d* att1 = reinterpret_cast<win_1d*>(att); + SuperpositionList& superimposed(att1->GetSuperpositions()); + if (superimposed.Count() == 0) return; // nothing superimposed. + + SuperpositionListIterator sp(superimposed); + addAndLog(d, "Superpositions:\n"); + + grobj_generic** objects = new grobj_generic*[nobjects]; + grobj_generic** gates = new grobj_generic*[ngates]; + + Xamine_GetSpectrumObjects(specno, objects, nobjects, True); + Xamine_GetSpectrumGates(specno, gates, ngates, True); + + while(!sp.Last()) { + Superposition super(sp.Next()); + int spectrum = super.Spectrum(); + xamine_shared->getname(spname, spectrum); + sprintf(buffer, + " Integrations for spectrum %s (Superposition)\n\n%s%s", + spname, + " Id Name Centroid FWHM Area\n", + "Summing regions: \n"); + + addAndLog(d, buffer); + + // Summing regions note that only 1-ds can have superpositions... + + for (int i=0; i < nobjects; i++) { + if ((objects[i]->type() == summing_region_1d)) { + grobj_generic* copy = objects[i]->clone(); + copy->setspectrum(spectrum); + Integrate(d, copy, spectrum, xamine_shared->gettype(spectrum)); + delete copy; + } + } + // cuts: + + addAndLog(d, "Cuts\n"); + + for (int i=0; i < ngates; i++) { + if ((gates[i]->type() == cut_1d)) { + grobj_generic* copy = gates[i]->clone(); + copy->setspectrum(spectrum); + Integrate(d, copy, spectrum, xamine_shared->gettype(spectrum)); + delete copy; + } + } + // Delete the copies of the objects and spectra: + } + delete []objects; + delete []gates; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-02-18 12:50:29
|
Revision: 1591 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1591&view=rev Author: ron-fox Date: 2009-02-18 12:50:25 +0000 (Wed, 18 Feb 2009) Log Message: ----------- Make the background ofthe button bar an indication of whether test software is installed (black). Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/buttonsetup.cc branches/SpecTcl-3.2-maintenance/configure.in Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-02-18 12:25:37 UTC (rev 1590) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-02-18 12:50:25 UTC (rev 1591) @@ -810,3 +810,5 @@ September 26, 2008 - backport capability to integrate superpositions as well as the base spectrum. +3.2-002 +Feb 18, 2008 - Xamine button bar background -> black on test installs. Modified: branches/SpecTcl-3.2-maintenance/Display/buttonsetup.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/buttonsetup.cc 2009-02-18 12:25:37 UTC (rev 1590) +++ branches/SpecTcl-3.2-maintenance/Display/buttonsetup.cc 2009-02-18 12:50:25 UTC (rev 1591) @@ -60,7 +60,22 @@ static XMToggleButton *zoom_button; static XMToggleButton *log_button; static XMToggleButton *mapping_button; + +/* + See if this is a test system. +*/ +static bool +isTestSystem() +{ + std::string filename(HOME); + filename += "/../../TEST_VERSION"; + int result = access(filename.c_str(), F_OK); + + printf("Checking for: %s got %d\n",filename.c_str(), result); + return (result == 0); +} + /* ** Functional Description: ** Xamine_SetButtonBarLog: @@ -150,6 +165,8 @@ spectra = new XMFrame("Spectra_f", *manager, &frame_attribs, 1); grobs = new XMFrame("Grobj_f", *manager, &frame_attribs, 1); + + /* Produce the forms: */ XMForm *windows_rc, *spectra_rc, *grobs_rc; @@ -158,7 +175,17 @@ spectra_rc = new XMForm("Spectra_rc", *spectra); grobs_rc = new XMForm("Grobj_rc", *grobs); + // In a test systesm make the background of the button box an ugly black. + if (isTestSystem()) { + Pixel black = BlackPixelOfScreen(XtScreen(manager->getid())); + manager->SetAttribute(XmNbackground, black); + windows_rc->SetAttribute(XmNbackground, black); + spectra_rc->SetAttribute(XmNbackground, black); + grobs_rc->SetAttribute(XmNbackground, black); + } + + /* Create the buttons in windows category */ XMPushButton *pb; Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2009-02-18 12:25:37 UTC (rev 1590) +++ branches/SpecTcl-3.2-maintenance/configure.in 2009-02-18 12:50:25 UTC (rev 1591) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-001) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-002) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-03-18 19:12:22
|
Revision: 1599 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1599&view=rev Author: ron-fox Date: 2009-03-18 19:11:53 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Log changes to tkcon to make it safe for SpecTcl Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/stamp-vti branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/version.texi Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-03-18 19:07:47 UTC (rev 1598) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-03-18 19:11:53 UTC (rev 1599) @@ -811,4 +811,6 @@ - backport capability to integrate superpositions as well as the base spectrum. 3.2-002 -Feb 18, 2008 - Xamine button bar background -> black on test installs. +Feb 18, 2009 - Xamine button bar background -> black on test installs. +March 18, 2009 - tkcon.tcl - rename clear command to tkconclear so it does not + interfere with SpecTcl's clear command. \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/stamp-vti =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/stamp-vti 2009-03-18 19:07:47 UTC (rev 1598) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/stamp-vti 2009-03-18 19:11:53 UTC (rev 1599) @@ -1,4 +1,4 @@ -@set UPDATED 5 November 2007 -@set UPDATED-MONTH November 2007 +@set UPDATED 17 September 2008 +@set UPDATED-MONTH September 2008 @set EDITION 2.12.7 @set VERSION 2.12.7 Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/version.texi =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/version.texi 2009-03-18 19:07:47 UTC (rev 1598) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.7/doc/version.texi 2009-03-18 19:11:53 UTC (rev 1599) @@ -1,4 +1,4 @@ -@set UPDATED 5 November 2007 -@set UPDATED-MONTH November 2007 +@set UPDATED 17 September 2008 +@set UPDATED-MONTH September 2008 @set EDITION 2.12.7 @set VERSION 2.12.7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-05-01 17:30:37
|
Revision: 1603 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1603&view=rev Author: ron-fox Date: 2009-05-01 17:30:33 +0000 (Fri, 01 May 2009) Log Message: ----------- -Fix error in 2d sum spectra (m2). Was being treated as if having it's first x parameter was necessary and therefore was underincremented. - Edited a bunch o-stuff so that this compiles with only a minimal set of warning on lenny and runs there too. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc branches/SpecTcl-3.2-maintenance/Display/XMDialogs.h branches/SpecTcl-3.2-maintenance/Display/XMLabel.cc branches/SpecTcl-3.2-maintenance/Display/XMLabel.h branches/SpecTcl-3.2-maintenance/Display/XMList.cc branches/SpecTcl-3.2-maintenance/Display/XMList.h branches/SpecTcl-3.2-maintenance/Display/XMManagers.cc branches/SpecTcl-3.2-maintenance/Display/XMManagers.h branches/SpecTcl-3.2-maintenance/Display/XMMenus.cc branches/SpecTcl-3.2-maintenance/Display/XMMenus.h branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.cc branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.h branches/SpecTcl-3.2-maintenance/Display/XMText.cc branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc branches/SpecTcl-3.2-maintenance/Display/XMWidget.h branches/SpecTcl-3.2-maintenance/Display/Xamine.cc branches/SpecTcl-3.2-maintenance/Display/acceptgates.cc branches/SpecTcl-3.2-maintenance/Display/advprompt.cc branches/SpecTcl-3.2-maintenance/Display/attribdefault.cc branches/SpecTcl-3.2-maintenance/Display/axisdefault.cc branches/SpecTcl-3.2-maintenance/Display/buttondlg.cc branches/SpecTcl-3.2-maintenance/Display/buttonreq.cc branches/SpecTcl-3.2-maintenance/Display/buttonsetup.cc branches/SpecTcl-3.2-maintenance/Display/checklist.cc branches/SpecTcl-3.2-maintenance/Display/checklist.h branches/SpecTcl-3.2-maintenance/Display/colormgr.cc branches/SpecTcl-3.2-maintenance/Display/colorset.cc branches/SpecTcl-3.2-maintenance/Display/compatspec.cc branches/SpecTcl-3.2-maintenance/Display/copier.cc branches/SpecTcl-3.2-maintenance/Display/copyatr.cc branches/SpecTcl-3.2-maintenance/Display/delgrob.cc branches/SpecTcl-3.2-maintenance/Display/dfltmgr.cc branches/SpecTcl-3.2-maintenance/Display/dispwind.cc branches/SpecTcl-3.2-maintenance/Display/errormsg.cc branches/SpecTcl-3.2-maintenance/Display/errormsg.h branches/SpecTcl-3.2-maintenance/Display/exit.cc branches/SpecTcl-3.2-maintenance/Display/expand.cc branches/SpecTcl-3.2-maintenance/Display/geometrymenu.cc branches/SpecTcl-3.2-maintenance/Display/grafinput.cc branches/SpecTcl-3.2-maintenance/Display/griprint.cc branches/SpecTcl-3.2-maintenance/Display/grobfile.cc branches/SpecTcl-3.2-maintenance/Display/grobjinput.cc branches/SpecTcl-3.2-maintenance/Display/grobjiomenu.cc branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc branches/SpecTcl-3.2-maintenance/Display/helpmenu.cc branches/SpecTcl-3.2-maintenance/Display/info.cc branches/SpecTcl-3.2-maintenance/Display/lblfont.cc branches/SpecTcl-3.2-maintenance/Display/location.cc branches/SpecTcl-3.2-maintenance/Display/logging.cc branches/SpecTcl-3.2-maintenance/Display/marker.cc branches/SpecTcl-3.2-maintenance/Display/menusetup.cc branches/SpecTcl-3.2-maintenance/Display/objcopy.cc branches/SpecTcl-3.2-maintenance/Display/panemgr.cc branches/SpecTcl-3.2-maintenance/Display/printer.cc branches/SpecTcl-3.2-maintenance/Display/procede.cc branches/SpecTcl-3.2-maintenance/Display/properties.cc branches/SpecTcl-3.2-maintenance/Display/ptlist.cc branches/SpecTcl-3.2-maintenance/Display/reducedefault.cc branches/SpecTcl-3.2-maintenance/Display/refreshdefault.cc branches/SpecTcl-3.2-maintenance/Display/rend1default.cc branches/SpecTcl-3.2-maintenance/Display/rend2default.cc branches/SpecTcl-3.2-maintenance/Display/select2.cc branches/SpecTcl-3.2-maintenance/Display/spcchoice.cc branches/SpecTcl-3.2-maintenance/Display/spcdisplay.cc branches/SpecTcl-3.2-maintenance/Display/specchoose.cc branches/SpecTcl-3.2-maintenance/Display/spectra.cc branches/SpecTcl-3.2-maintenance/Display/sumregion.cc branches/SpecTcl-3.2-maintenance/Display/superprompt.cc branches/SpecTcl-3.2-maintenance/Display/titledefault.cc branches/SpecTcl-3.2-maintenance/Display/trackcursor.cc branches/SpecTcl-3.2-maintenance/Display/winiomenu.cc branches/SpecTcl-3.2-maintenance/Display/wysiwygPrint.cc branches/SpecTcl-3.2-maintenance/EventSource/PipeFile.cpp branches/SpecTcl-3.2-maintenance/Fits/fitgsl.c branches/SpecTcl-3.2-maintenance/NSCLException/StreamIOError.cpp branches/SpecTcl-3.2-maintenance/NSCLException/StreamIOError.h branches/SpecTcl-3.2-maintenance/Sorter/CSpectrum2Dm.cpp branches/SpecTcl-3.2-maintenance/Sorter/CSpectrum2Dm.h branches/SpecTcl-3.2-maintenance/Sorter/SpectrumFactoryException.cpp branches/SpecTcl-3.2-maintenance/Sorter/SpectrumFactoryException.h branches/SpecTcl-3.2-maintenance/SpecTcl/ApplyCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/AttachCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/BindCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/ClearCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/FilterCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/GateCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/GateCommand.h branches/SpecTcl-3.2-maintenance/SpecTcl/GateFactory.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/GateFactoryException.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/GateFactoryException.h branches/SpecTcl-3.2-maintenance/SpecTcl/GatePackage.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/Globals.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/ParameterCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/PseudoCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/PseudoScript.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/ScalerProcessorCallbacks.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/SpectrumCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/SpectrumPackage.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/TCLAnalyzer.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/TapeCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/UnbindCommand.cpp branches/SpecTcl-3.2-maintenance/SpecTcl/WriteCommand.cpp branches/SpecTcl-3.2-maintenance/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp branches/SpecTcl-3.2-maintenance/SpectrumIO/SpectrumFormatError.cpp branches/SpecTcl-3.2-maintenance/SpectrumIO/SpectrumFormatError.h branches/SpecTcl-3.2-maintenance/SpectrumIO/nsclbinerror.cpp branches/SpecTcl-3.2-maintenance/SpectrumIO/nsclbinerror.h branches/SpecTcl-3.2-maintenance/TCL/CLanguageTraceCallbacks.cpp branches/SpecTcl-3.2-maintenance/TCL/CLanguageTraceCallbacks.h branches/SpecTcl-3.2-maintenance/TCL/TCLObjectProcessor.cpp branches/SpecTcl-3.2-maintenance/TCL/TCLTracedVariable.cpp branches/SpecTcl-3.2-maintenance/TCL/TCLTracedVariable.h branches/SpecTcl-3.2-maintenance/TCL/TCLVariable.cpp branches/SpecTcl-3.2-maintenance/TCL/TCLVariable.h branches/SpecTcl-3.2-maintenance/TCL/VariableTraceCallback.h branches/SpecTcl-3.2-maintenance/TestFiles/ltwrite.cpp branches/SpecTcl-3.2-maintenance/TestFiles/testfile.cpp branches/SpecTcl-3.2-maintenance/TreeParam/CTreeParameterArray.cpp branches/SpecTcl-3.2-maintenance/Xamine/Xamineplus.cpp branches/SpecTcl-3.2-maintenance/calibratedparams/CCalibratedParameter.cpp branches/SpecTcl-3.2-maintenance/configure.in branches/SpecTcl-3.2-maintenance/contrib/scriptable/CIntConfigParam.cpp Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-05-01 17:30:33 UTC (rev 1603) @@ -813,4 +813,11 @@ 3.2-002 Feb 18, 2009 - Xamine button bar background -> black on test installs. March 18, 2009 - tkcon.tcl - rename clear command to tkconclear so it does not - interfere with SpecTcl's clear command. \ No newline at end of file + interfere with SpecTcl's clear command. +3.2-003 +May 1, 2009 - CSpectrum2Dm.{h,cpp} Ensure these spectra get put in the + don't need a parameter list rather than some need a parameter list + which causes them to be grossly underincremented. +May 1, 2009 - Complete a raft of editing so that SpecTcl compiles and runs + with minimal error messages on debian lenny...really + Debina g++-4.3.2-1.1 \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -164,7 +164,7 @@ GetAttribute(XmNdirectory, &dir_compound); - XmStringGetLtoR(dir_compound, XmSTRING_DEFAULT_CHARSET, &directory); + XmStringGetLtoR(dir_compound, const_cast<char*>(XmSTRING_DEFAULT_CHARSET), &directory); XmStringFree(dir_compound); return directory; } @@ -181,7 +181,7 @@ char *mask; GetAttribute(XmNdirMask, &mask_compound); - XmStringGetLtoR(mask_compound, XmSTRING_DEFAULT_CHARSET, &mask); + XmStringGetLtoR(mask_compound, const_cast<char*>(XmSTRING_DEFAULT_CHARSET), &mask); XmStringFree(mask_compound); return mask; } @@ -201,7 +201,7 @@ char *mask; GetAttribute(XmNdirSpec, &search_compound); - XmStringGetLtoR(search_compound, XmSTRING_DEFAULT_CHARSET, &mask); + XmStringGetLtoR(search_compound, const_cast<char*>(XmSTRING_DEFAULT_CHARSET), &mask); XmStringFree(search_compound); return mask; } @@ -225,13 +225,13 @@ ** Cardinal num_args: ** Count of resource argumnts which will be applied to the shell. */ -void XMCustomDialog::CreateDialog(char *name, Widget parent, char *title, +void XMCustomDialog::CreateDialog(const char *name, Widget parent, char *title, ArgList l, Cardinal num_args) { /* Create the shell */ - id = XtVaCreatePopupShell(name, xmDialogShellWidgetClass, parent, + id = XtVaCreatePopupShell(const_cast<char*>(name), xmDialogShellWidgetClass, parent, XmNtitle, title, XmNdeleteResponse, XmDESTROY, NULL); @@ -247,7 +247,7 @@ /* Create a form which is used to allow the modalization to be controlled */ - shell_child = new XMForm("Dialog_Form", id); + shell_child = new XMForm(const_cast<char*>("Dialog_Form"), id); /* Create the pane manager widget which manages the dialog elements */ @@ -256,7 +256,7 @@ XtSetArg(pane_args[0], XmNsashWidth, 1); XtSetArg(pane_args[1], XmNsashHeight,1); - top_manager= new XMPanedWindow("Dialog_toplevel", + top_manager= new XMPanedWindow(const_cast<char*>("Dialog_toplevel"), *shell_child, pane_args, 2); /* Glue the pane to all corners of the form: */ @@ -266,10 +266,10 @@ shell_child->SetBottomAttachment(*top_manager, XmATTACH_FORM); /* Create the sub region managers: */ - - work_area = new XMForm("Dialog_work_area", + + work_area = new XMForm(const_cast<char*>("Dialog_work_area"), *top_manager); - action_area= new XMRowColumn("Dialog_action_area", + action_area= new XMRowColumn(const_cast<char*>("Dialog_action_area"), *top_manager); @@ -278,10 +278,10 @@ action_area->SetOrientation(XmHORIZONTAL); action_area->SetPacking(XmPACK_COLUMN); - Ok = new XMPushButton("Ok", *action_area); - Apply = new XMPushButton("Apply", *action_area); - Cancel= new XMPushButton("Cancel", *action_area); - Help = new XMPushButton("Help", *action_area); + Ok = new XMPushButton(const_cast<char*>("Ok"), *action_area); + Apply = new XMPushButton(const_cast<char*>("Apply"), *action_area); + Cancel= new XMPushButton(const_cast<char*>("Cancel"), *action_area); + Help = new XMPushButton(const_cast<char*>("Help"), *action_area); } @@ -363,7 +363,7 @@ ** dialog objects. */ -static char *prompter_help[] = { +static const char *prompter_help[] = { "You are being prompted for some text. Type the text in the text window.\n", " When you have edited the text to look like what you want click: \n\n", " Ok - To accept the text and remove the dialog.\n", @@ -412,9 +412,9 @@ /* Register the default help text: */ - help_info.name = "Prompt_Help"; + help_info.name = const_cast<char*>("Prompt_Help"); help_info.dialog = NULL; - help_info.text = prompter_help; + help_info.text = const_cast<char**>(prompter_help); } XMPrompter::XMPrompter(char *name, XMWidget &parent, char *prompt, XtPointer calldata) : @@ -434,9 +434,9 @@ /* Register the default help text: */ - help_info.name = "Prompt_Help"; + help_info.name = const_cast<char*>("Prompt_Help"); help_info.dialog = NULL; - help_info.text = prompter_help; + help_info.text = const_cast<char**>(prompter_help); /* If we have help we should enable the help button: */ @@ -482,7 +482,7 @@ */ void XMPrompter::RevertHelpText() { - help_info.text = prompter_help; + help_info.text = const_cast<char**>(prompter_help); } /* @@ -670,7 +670,7 @@ ** Default help text for selection box widgets.: */ -static char *SelectionDefaultHelp[] = { +static const char *SelectionDefaultHelp[] = { " You are being asked to select an item from the list of choices\n", "in the list box part of the widget. You can select an item either by\n", "clicking on it with the mouse or by typing it into the text input\n", @@ -730,9 +730,9 @@ /* Set up the help button with the default help text.: */ helpbutton->Enable(); - helpinfo.name = "SelectionHelp"; + helpinfo.name = const_cast<char*>("SelectionHelp"); helpinfo.dialog = (XMInformationDialog *)NULL; - helpinfo.text = SelectionDefaultHelp; + helpinfo.text = const_cast<char**>(SelectionDefaultHelp); /* Set the initial list values: */ @@ -762,9 +762,9 @@ /* Set up the help button with the default help text.: */ helpbutton->Enable(); - helpinfo.name = "SelectionHelp"; + helpinfo.name = const_cast<char*>("SelectionHelp"); helpinfo.dialog = (XMInformationDialog *)NULL; - helpinfo.text = SelectionDefaultHelp; + helpinfo.text = const_cast<char**>(SelectionDefaultHelp); /* Set up the initial list values: */ @@ -822,7 +822,7 @@ */ void XMSelector::RevertHelpText() { - helpinfo.text = SelectionDefaultHelp; + helpinfo.text = const_cast<char**>(SelectionDefaultHelp); } /* @@ -929,7 +929,7 @@ ** XMFileSelector dialog. */ -static char *FileSelectorHelp[] = // Default help text for file selector. +static const char *FileSelectorHelp[] = // Default help text for file selector. { " You are being prompted a filename. If you know the complete name of\n", "the file, you can type it in at the text box at the bottom of the work\n", @@ -1017,7 +1017,7 @@ /* Set up the help info data structure */ - helpinfo.name = "File_Selection_Help"; + helpinfo.name = const_cast<char*>("File_Selection_Help"); helpinfo.dialog = (XMInformationDialog *)NULL; RevertHelpText(); } @@ -1044,7 +1044,7 @@ /* Set up the help info data structure */ - helpinfo.name = "File_Selection_Help"; + helpinfo.name = const_cast<char*>("File_Selection_Help"); helpinfo.dialog = (XMInformationDialog *)NULL; RevertHelpText(); @@ -1092,7 +1092,7 @@ void XMFileSelector::RevertHelpText() { - helpinfo.text = FileSelectorHelp; + helpinfo.text = const_cast<char**>(FileSelectorHelp); } @@ -1166,7 +1166,7 @@ char *filename; - if(!XmStringGetLtoR(calldata->value, XmSTRING_DEFAULT_CHARSET, + if(!XmStringGetLtoR(calldata->value, const_cast<char*>(XmSTRING_DEFAULT_CHARSET), &filename)) { Xamine_error_msg(this, "XMFileSelector::OkCb Unable to retreive file name string"); @@ -1267,7 +1267,7 @@ ** it is really difficult to generically describe a custom dialog box, ** the user will typically have to replace this text using SetHelpText. */ -static char *custom_help[] = { +static const char *custom_help[] = { " This is a custom dialog box which was created by a programmer that was\n", "too lazy to supply detailed help text about what the dialog does. Since\n", "the work area of the dialog box could be almost anything, I cannot be\n", @@ -1375,7 +1375,7 @@ void XMCustomDialogBox::RevertHelpText() { - help_info.text = custom_help; + help_info.text = const_cast<char**>(custom_help); } /* @@ -1525,9 +1525,9 @@ void XMCustomDialogBox::InitializeHelp() { - help_info.name = "Custom Dialog Box"; + help_info.name = const_cast<char*>("Custom Dialog Box"); help_info.dialog = (XMInformationDialog *)NULL; - help_info.text = custom_help; + help_info.text = const_cast<char**>(custom_help); } /* @@ -1604,7 +1604,7 @@ XMMessageBox::SetText(char *txt) { XmString s = XmStringCreateLtoR(txt, - XmSTRING_DEFAULT_CHARSET); + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNmessageString, s); XmStringFree(s); } @@ -1628,27 +1628,27 @@ } void -XMMessageBox::LabelCancelButton(char *txt) +XMMessageBox::LabelCancelButton(const char* txt) { - XmString str = XmStringCreateLtoR(txt, - XmSTRING_DEFAULT_CHARSET); + XmString str = XmStringCreateLtoR(const_cast<char*>(txt), + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNcancelLabelString, str); XmStringFree(str); } void -XMMessageBox::LabelOkButton(char *txt) +XMMessageBox::LabelOkButton(const char *txt) { - XmString str = XmStringCreateLtoR(txt, - XmSTRING_DEFAULT_CHARSET); + XmString str = XmStringCreateLtoR(const_cast<char*>(txt), + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNokLabelString, str); XmStringFree(str); } void -XMMessageBox::LabelHelpButton(char *txt) +XMMessageBox::LabelHelpButton(const char *txt) { - helpbutton->Label(txt); + helpbutton->Label(const_cast<char*>(txt)); } void @@ -1700,12 +1700,12 @@ ** Functions for class XMErrorDialog */ -XMErrorDialog::XMErrorDialog(char *n, Widget parent, char *msg, +XMErrorDialog::XMErrorDialog(const char *n, Widget parent, char *msg, void (*cb)(XMWidget *, XtPointer, XtPointer), XtPointer cbd, ArgList list, Cardinal argcount) : - XMMessageBox(n) + XMMessageBox(const_cast<char*>(n)) { id = XmCreateErrorDialog(parent, name, @@ -1713,7 +1713,7 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Dismiss"); + LabelOkButton(const_cast<char*>("Dismiss")); cancelbutton->Disable(); helpbutton->Disable(); if(cb) @@ -1722,12 +1722,12 @@ XtPopup(XtParent(id), XtGrabNone); } -XMErrorDialog::XMErrorDialog(char *n, XMWidget &parent, char *msg, +XMErrorDialog::XMErrorDialog(const char *n, XMWidget &parent, char *msg, void (*cb)(XMWidget *, XtPointer, XtPointer), XtPointer cbd, ArgList list, Cardinal argcount): - XMMessageBox(n) + XMMessageBox(const_cast<char*>(n)) { id = XmCreateErrorDialog(parent.getid(), name, @@ -1735,7 +1735,7 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Dismiss"); + LabelOkButton(const_cast<char*>("Dismiss")); cancelbutton->Disable(); helpbutton->Disable(); if(cb) @@ -1766,7 +1766,7 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Dismiss"); + LabelOkButton(const_cast<char*>("Dismiss")); cancelbutton->Disable(); helpbutton->Disable(); if(cb) @@ -1790,7 +1790,7 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Dismiss"); + LabelOkButton(const_cast<char*>("Dismiss")); cancelbutton->Disable(); helpbutton->Disable(); if(cb) @@ -1820,7 +1820,7 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Dismiss"); + LabelOkButton(const_cast<char*>("Dismiss")); cancelbutton->Disable(); helpbutton->Disable(); if(cb) @@ -1842,7 +1842,7 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Dismiss"); + LabelOkButton(const_cast<char*>("Dismiss")); cancelbutton->Disable(); helpbutton->Disable(); if(cb) @@ -1872,8 +1872,8 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Yes"); - LabelCancelButton("No"); + LabelOkButton(const_cast<char*>("Yes")); + LabelCancelButton(const_cast<char*>("No")); helpbutton->Disable(); if(cb) AddOkCallback(cb, cbd); @@ -1894,8 +1894,8 @@ argcount); SetText(msg); GetButtons(); - LabelOkButton("Yes"); - LabelCancelButton("No"); + LabelOkButton(const_cast<char*>("Yes")); + LabelCancelButton(const_cast<char*>("No")); helpbutton->Disable(); if(cb) AddOkCallback(cb, cbd); @@ -2083,7 +2083,7 @@ void XMSelection::SetText(char *txt) { - XmString s = XmStringCreateLtoR(txt, XmSTRING_DEFAULT_CHARSET); + XmString s = XmStringCreateLtoR(txt, const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNtextString, s); XmStringFree(s); } @@ -2092,7 +2092,7 @@ XMSelection::SetLabelString(char *txt) { XmString s = XmStringCreateLtoR(txt, - XmSTRING_DEFAULT_CHARSET); + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNselectionLabelString, s); XmStringFree(s); } @@ -2101,7 +2101,7 @@ XMSelection::LabelApplyButton(char *txt) { XmString str = XmStringCreateLtoR(txt, - XmSTRING_DEFAULT_CHARSET); + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNapplyLabelString, str); XmStringFree(str); } @@ -2322,7 +2322,7 @@ { char* pDir = const_cast<char*>(dir); XmString d; - d = XmStringCreateLtoR(pDir, XmSTRING_DEFAULT_CHARSET); + d = XmStringCreateLtoR(pDir, const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); XmFileSelectionDoSearch(id, d); XmStringFree(d); } @@ -2338,9 +2338,10 @@ } void -XMFileListDialog::SetLabelString(char *txt) +XMFileListDialog::SetLabelString(const char *txt) { - XmString s = XmStringCreateLtoR(txt, XmSTRING_DEFAULT_CHARSET); + XmString s = XmStringCreateLtoR(const_cast<char*>(txt), + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); XtVaSetValues(XmFileSelectionBoxGetChild(id, XmDIALOG_SELECTION_LABEL), XmNlabelString, s, @@ -2349,9 +2350,10 @@ } void -XMFileListDialog::SetFilterString(char *txt) +XMFileListDialog::SetFilterString(const char *txt) { - XmString s = XmStringCreateLtoR(txt, XmSTRING_DEFAULT_CHARSET); + XmString s = XmStringCreateLtoR(const_cast<char*>(txt), + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); SetAttribute(XmNfilterLabelString, s); XmStringFree(s); } @@ -2403,14 +2405,14 @@ ** Implementation of functions from class XMCustomDialog */ -XMCustomDialog::XMCustomDialog(char *name, XMWidget &parent, char *title, +XMCustomDialog::XMCustomDialog(const char *name, XMWidget &parent, char *title, ArgList l, Cardinal num_args) : XMWidget(name) { CreateDialog(name, parent.getid(), title, l, num_args); } -XMCustomDialog::XMCustomDialog(char *name, Widget parent, char *title, +XMCustomDialog::XMCustomDialog(const char *name, Widget parent, char *title, ArgList l, Cardinal num_args) : XMWidget(name) { Modified: branches/SpecTcl-3.2-maintenance/Display/XMDialogs.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMDialogs.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMDialogs.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -106,9 +106,9 @@ /* Label cancel/Help/OK buttons */ - void LabelCancelButton(char *txt); - void LabelOkButton(char *txt); - void LabelHelpButton(char *txt); + void LabelCancelButton(const char *txt); + void LabelOkButton(const char *txt); + void LabelHelpButton(const char *txt); /* Set default button types: */ @@ -129,13 +129,13 @@ { public: /* Constructors: */ - XMErrorDialog(char *n, Widget parent, char *msg, + XMErrorDialog(const char *n, Widget parent, char *msg, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cbd = NULL, ArgList list = NULL, Cardinal argcount = 0); - XMErrorDialog(char *n, XMWidget &parent, char *msg, + XMErrorDialog(const char *n, XMWidget &parent, char *msg, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cbd = NULL, @@ -526,13 +526,13 @@ public: XMFileListDialog(char *n, Widget parent, char - *directory = XMFILE_DEFAULT_DIRMASK, + *directory = const_cast<char*>(XMFILE_DEFAULT_DIRMASK), void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cbd = NULL, ArgList list = NULL, Cardinal argcount = 0); XMFileListDialog(char *n, XMWidget &parent, - char *directory = XMFILE_DEFAULT_DIRMASK, + char *directory =const_cast<char*>( XMFILE_DEFAULT_DIRMASK), void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cbd = NULL, @@ -549,8 +549,8 @@ /* Methods to manipulate the labels: */ - virtual void SetLabelString(char *txt); - virtual void SetFilterString(char *txt); + virtual void SetLabelString(const char *txt); + virtual void SetFilterString(const char *txt); /* Set restrictions on the file types searched: */ @@ -582,11 +582,11 @@ public: XMFileSelector(char *n, Widget parent, XtPointer calld = NULL, - char *directory = XMFILE_DEFAULT_DIRMASK); + char *directory = const_cast<char*>(XMFILE_DEFAULT_DIRMASK)); XMFileSelector(char *n, XMWidget &parent, XtPointer ud = NULL, - char *directory = XMFILE_DEFAULT_DIRMASK); + char *directory = const_cast<char*>(XMFILE_DEFAULT_DIRMASK)); ~XMFileSelector(); @@ -642,14 +642,14 @@ XMPushButton *Apply; XMPushButton *Cancel; XMPushButton *Help; - void CreateDialog(char *name, Widget parent, char *title, + void CreateDialog(const char *name, Widget parent, char *title, ArgList l, Cardinal num_args); public: /* Constructors: */ - XMCustomDialog(char *name, XMWidget &parent, char *title, + XMCustomDialog(const char *name, XMWidget &parent, char *title, ArgList l = NULL, Cardinal num_args = 0); - XMCustomDialog(char *name, Widget parent, char *title, + XMCustomDialog(const char *name, Widget parent, char *title, ArgList l = NULL, Cardinal num_args = 0); /* Destructors: */ Modified: branches/SpecTcl-3.2-maintenance/Display/XMLabel.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMLabel.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMLabel.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -13,21 +13,21 @@ #include <config.h> #include "XMLabel.h" -XMLabel::XMLabel(char *n, XMWidget &parent, char *text, +XMLabel::XMLabel(const char *n, XMWidget &parent, const char *text, ArgList args, Cardinal arg_count) : XMManagedWidget(n, xmLabelWidgetClass, parent, args, arg_count) { SetLabel(text); } -XMLabel::XMLabel(char *n, Widget parent, char *text, +XMLabel::XMLabel(const char *n, Widget parent, const char *text, ArgList args, Cardinal arg_count) : XMManagedWidget(n, xmLabelWidgetClass, parent, args, arg_count) { SetLabel(text); } -XMLabel::XMLabel(char *n) : +XMLabel::XMLabel(const char *n) : XMManagedWidget(n) { } @@ -36,9 +36,9 @@ { } void -XMLabel::SetLabel(char *text) +XMLabel::SetLabel(const char *text) { - XmString label = XmStringCreateSimple(text); + XmString label = XmStringCreateSimple(const_cast<char*>(text)); SetAttribute(XmNlabelString, label); XmStringFree(label); } Modified: branches/SpecTcl-3.2-maintenance/Display/XMLabel.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMLabel.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMLabel.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -304,13 +304,13 @@ class XMLabel :public XMManagedWidget { public: - XMLabel(char *n, XMWidget &parent, char *text, + XMLabel(const char *n, XMWidget &parent, const char *text, ArgList args = NULL, Cardinal arg_count = 0); - XMLabel(char *n, Widget parent, char *text, + XMLabel(const char *n, Widget parent, const char *text, ArgList args = NULL, Cardinal arg_count = 0); - XMLabel(char *n); + XMLabel(const char *n); XMLabel(Widget w); - void SetLabel(char *text); + void SetLabel(const char *text); void SetLabel(XmString lbl); }; #endif Modified: branches/SpecTcl-3.2-maintenance/Display/XMList.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMList.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMList.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -12,17 +12,17 @@ #include "XMList.h" -XMListBaseClass::XMListBaseClass(char *n, WidgetClass cl, XMWidget &parent, +XMListBaseClass::XMListBaseClass(const char *n, WidgetClass cl, XMWidget &parent, ArgList l, Cardinal num_args) : XMWidget(n, cl, parent, l, num_args) {} -XMListBaseClass:: XMListBaseClass(char *n, WidgetClass cl, Widget parent, +XMListBaseClass:: XMListBaseClass(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) : XMWidget(n, cl, parent, l, num_args) {} -XMListBaseClass::XMListBaseClass(char *n) : +XMListBaseClass::XMListBaseClass(const char *n) : XMWidget(n) {} @@ -140,7 +140,7 @@ void XMListBaseClass::AddItem(char *item, int position) { - XmString s = XmStringCreateLtoR(item, XmSTRING_DEFAULT_CHARSET); + XmString s = XmStringCreateLtoR(item, const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); XmListAddItem(id, s, position); XmStringFree(s); } @@ -151,7 +151,7 @@ void XMListBaseClass::DeleteItem(char *item) { - XmString s = XmStringCreateLtoR(item, XmSTRING_DEFAULT_CHARSET); + XmString s = XmStringCreateLtoR(item, const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); XmListDeleteItem(id, s); XmStringFree(s); } @@ -173,7 +173,7 @@ void XMListBaseClass::DeselectItem(char *item) { - XmString s = XmStringCreateLtoR(item, XmSTRING_DEFAULT_CHARSET); + XmString s = XmStringCreateLtoR(item, const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); XmListDeselectItem(id, s); XmStringFree(s); } @@ -198,21 +198,21 @@ ** These files are implemented for the class XMList */ -XMList::XMList(char *n, XMWidget &parent, int rows , +XMList::XMList(const char *n, XMWidget &parent, int rows , ArgList args, Cardinal arg_count ) : XMListBaseClass(n, xmListWidgetClass, parent, args, arg_count) { SetRows(rows); Manage(); } -XMList::XMList(char *n, Widget parent, int rows , +XMList::XMList(const char *n, Widget parent, int rows , ArgList args, Cardinal arg_count) : XMListBaseClass(n, xmListWidgetClass, parent, args, arg_count) { SetRows(rows); Manage(); } -XMList::XMList(char *n) : XMListBaseClass(n) { Manage();} +XMList::XMList(const char *n) : XMListBaseClass(n) { Manage();} XMList::XMList(Widget w) : XMListBaseClass(w) { Manage(); } @@ -221,21 +221,21 @@ ** These functions are implementations for the class XMScrolledList */ -XMScrolledList::XMScrolledList(char *n, XMWidget &parent, int rows , +XMScrolledList::XMScrolledList(const char *n, XMWidget &parent, int rows , ArgList args , Cardinal arg_count) : XMListBaseClass(n) { /* Cheat. */ id = XmCreateScrolledList(parent.getid(), - n, args, arg_count); + const_cast<char*>(n), args, arg_count); scrolled_widget = XtParent(id); SetRows(rows); Manage(); XtManageChild(scrolled_widget); } -XMScrolledList::XMScrolledList(char *n, Widget parent, int rows , +XMScrolledList::XMScrolledList(const char *n, Widget parent, int rows , ArgList args , Cardinal arg_count ) : XMListBaseClass(n) { /* Cheat. */ - id = XmCreateScrolledList(parent, n, args, arg_count); + id = XmCreateScrolledList(parent, const_cast<char*>(n), args, arg_count); scrolled_widget = XtParent(id); SetRows(rows); Manage(); Modified: branches/SpecTcl-3.2-maintenance/Display/XMList.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMList.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMList.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -312,11 +312,11 @@ public: /* Constructors: */ - XMListBaseClass(char *n, WidgetClass cl, XMWidget &parent, + XMListBaseClass(const char *n, WidgetClass cl, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); - XMListBaseClass(char *n, WidgetClass cl, Widget parent, + XMListBaseClass(const char *n, WidgetClass cl, Widget parent, ArgList l = NULL, Cardinal num_args = 0); - XMListBaseClass(char *n); + XMListBaseClass(const char *n); XMListBaseClass(Widget w); /* Manage the attributes: */ @@ -374,11 +374,11 @@ public: /* Constructors and Destructors: */ - XMList(char *n, XMWidget &parent, int rows = 10, + XMList(const char *n, XMWidget &parent, int rows = 10, ArgList args = NULL, Cardinal arg_count = 0); - XMList(char *n, Widget parent, int rows = 10, + XMList(const char *n, Widget parent, int rows = 10, ArgList args =NULL, Cardinal arg_count = 0); - XMList(char *n); + XMList(const char *n); XMList(Widget w); }; /* @@ -392,9 +392,9 @@ Widget scrolled_widget; public: - XMScrolledList(char *n, XMWidget &parent, int rows = 10, + XMScrolledList(const char *n, XMWidget &parent, int rows = 10, ArgList args = NULL, Cardinal arg_count = 0); - XMScrolledList(char *n, Widget parent, int rows = 10, + XMScrolledList(const char *n, Widget parent, int rows = 10, ArgList args = NULL, Cardinal arg_count = 0); /* Get the scrolled widget id: */ Modified: branches/SpecTcl-3.2-maintenance/Display/XMManagers.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMManagers.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMManagers.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -349,22 +349,22 @@ ** These functions are implemented for the class XMManager */ -XMManager::XMManager(char *n) : XMWidget(n) {} +XMManager::XMManager(const char *n) : XMWidget(n) {} XMManager::XMManager(Widget w) : XMWidget(w) {} -XMManager::XMManager(char *n, +XMManager::XMManager(const char *n, WidgetClass cl, XMApplication &parent, ArgList l,Cardinal num_args) : XMWidget(n, cl, parent, l, num_args) {} -XMManager::XMManager(char *n, WidgetClass cl, Widget parent, +XMManager::XMManager(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) : XMWidget(n, cl, parent, l, num_args) {} -XMManager::XMManager(char *n, WidgetClass cl, XMWidget &parent, +XMManager::XMManager(const char *n, WidgetClass cl, XMWidget &parent, ArgList l, Cardinal num_args) : XMWidget(n, cl, parent, l, num_args) { } @@ -414,24 +414,24 @@ ** These functions are implementations for class XMBulletinBoard */ -XMBulletinBoard::XMBulletinBoard(char *n, WidgetClass cl, Widget parent, +XMBulletinBoard::XMBulletinBoard(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) : XMManager(n, cl, parent, l, num_args) {} -XMBulletinBoard::XMBulletinBoard(char *n) : XMManager(n) {} +XMBulletinBoard::XMBulletinBoard(const char *n) : XMManager(n) {} XMBulletinBoard::XMBulletinBoard(Widget w): XMManager(w) {} -XMBulletinBoard::XMBulletinBoard(char *n, XMApplication &parent, +XMBulletinBoard::XMBulletinBoard(const char *n, XMApplication &parent, ArgList l, Cardinal num_args) : XMManager(n, xmBulletinBoardWidgetClass, parent, l, num_args) {} -XMBulletinBoard::XMBulletinBoard(char *n, Widget parent, +XMBulletinBoard::XMBulletinBoard(const char *n, Widget parent, ArgList l, Cardinal num_args) : XMManager(n, xmBulletinBoardWidgetClass, parent, l, num_args) {} -XMBulletinBoard::XMBulletinBoard(char *n, XMWidget &parent, +XMBulletinBoard::XMBulletinBoard(const char *n, XMWidget &parent, ArgList l, Cardinal num_args) : XMManager(n, xmBulletinBoardWidgetClass, parent, l, num_args) {} @@ -462,19 +462,19 @@ ** These functions implement those in class XMFrame */ -XMFrame::XMFrame(char *name) : XMManager(name) {} +XMFrame::XMFrame(const char *name) : XMManager(name) {} XMFrame::XMFrame(Widget id) : XMManager(id) {} -XMFrame::XMFrame(char *n, XMApplication &parent, +XMFrame::XMFrame(const char *n, XMApplication &parent, ArgList l, Cardinal num_args) : XMManager(n, xmFrameWidgetClass, parent, l, num_args) {} -XMFrame::XMFrame(char *n, XMWidget &parent, +XMFrame::XMFrame(const char *n, XMWidget &parent, ArgList l, Cardinal num_args) : XMManager(n, xmFrameWidgetClass, parent, l, num_args) {} -XMFrame::XMFrame(char *n, Widget parent, ArgList l, +XMFrame::XMFrame(const char *n, Widget parent, ArgList l, Cardinal num_args) : XMManager(n, xmFrameWidgetClass, parent, l, num_args) {} @@ -493,21 +493,21 @@ ** These functions are implemented for class XMForm */ -XMForm::XMForm(char *name) : XMBulletinBoard(name) {} +XMForm::XMForm(const char *name) : XMBulletinBoard(name) {} XMForm::XMForm(Widget id) : XMBulletinBoard(id) {} -XMForm::XMForm(char *n, XMApplication &parent, +XMForm::XMForm(const char *n, XMApplication &parent, ArgList l, Cardinal num_args) : XMBulletinBoard(n, xmFormWidgetClass, parent.getid(), l, num_args) {} -XMForm::XMForm(char *n, Widget parent, +XMForm::XMForm(const char *n, Widget parent, ArgList l, Cardinal num_args) : XMBulletinBoard(n, xmFormWidgetClass, parent, l, num_args) {} -XMForm::XMForm(char *n, XMWidget &parent, +XMForm::XMForm(const char *n, XMWidget &parent, ArgList l, Cardinal num_args) : XMBulletinBoard(n, xmFormWidgetClass, parent.getid(), l, num_args) {} @@ -666,19 +666,19 @@ ** These are implementations of functions from class XMRowColumn */ -XMRowColumn::XMRowColumn(char *name) : XMManager(name) {} +XMRowColumn::XMRowColumn(const char *name) : XMManager(name) {} XMRowColumn::XMRowColumn(Widget id) : XMManager(id) {} -XMRowColumn::XMRowColumn(char *name, XMApplication &parent, +XMRowColumn::XMRowColumn(const char *name, XMApplication &parent, ArgList l, Cardinal num_args) : XMManager(name, xmRowColumnWidgetClass, parent, l, num_args) {} -XMRowColumn::XMRowColumn(char *name, XMWidget &parent, +XMRowColumn::XMRowColumn(const char *name, XMWidget &parent, ArgList l, Cardinal num_args) : XMManager(name, xmRowColumnWidgetClass, parent, l, num_args) {} -XMRowColumn::XMRowColumn(char *name, Widget parent, +XMRowColumn::XMRowColumn(const char *name, Widget parent, ArgList l, Cardinal num_args) : XMManager(name, xmRowColumnWidgetClass, parent, l, num_args) {} @@ -754,15 +754,15 @@ ** The following are implementations of functions for class XMPanedWindow */ -XMPanedWindow::XMPanedWindow(char *name) : XMManager(name) {} +XMPanedWindow::XMPanedWindow(const char *name) : XMManager(name) {} XMPanedWindow::XMPanedWindow(Widget id) : XMManager(id) {} -XMPanedWindow::XMPanedWindow(char *n, XMWidget &parent, +XMPanedWindow::XMPanedWindow(const char *n, XMWidget &parent, ArgList l, Cardinal num_args) : XMManager(n, xmPanedWindowWidgetClass, parent, l, num_args) {} -XMPanedWindow::XMPanedWindow(char *n, Widget parent, +XMPanedWindow::XMPanedWindow(const char *n, Widget parent, ArgList l, Cardinal num_args) : XMManager(n, xmPanedWindowWidgetClass, parent, l, num_args) {} @@ -816,19 +816,19 @@ ** The following are implemented for class XMMainWindow */ -XMMainWindow::XMMainWindow(char *name) : XMManager(name) {} +XMMainWindow::XMMainWindow(const char *name) : XMManager(name) {} XMMainWindow::XMMainWindow(Widget id) : XMManager(id ) {} -XMMainWindow::XMMainWindow(char *name, XMApplication &parent, +XMMainWindow::XMMainWindow(const char *name, XMApplication &parent, ArgList l, Cardinal arg_count) : XMManager(name, xmMainWindowWidgetClass, parent, l, arg_count) {} -XMMainWindow::XMMainWindow(char *name, XMWidget &parent, +XMMainWindow::XMMainWindow(const char *name, XMWidget &parent, ArgList l, Cardinal arg_count) : XMManager(name, xmMainWindowWidgetClass, parent, l, arg_count) {} -XMMainWindow::XMMainWindow(char *name, Widget &parent, +XMMainWindow::XMMainWindow(const char *name, Widget &parent, ArgList l, Cardinal arg_count) : XMManager(name, xmMainWindowWidgetClass, parent, l, arg_count) {} Modified: branches/SpecTcl-3.2-maintenance/Display/XMManagers.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMManagers.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMManagers.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -317,15 +317,15 @@ public: /* Constructors */ - XMManager(char *n); + XMManager(const char *n); XMManager(Widget w); - XMManager(char *n, + XMManager(const char *n, WidgetClass cl, XMApplication &parent, ArgList l= NULL,Cardinal num_args = 0); - XMManager(char *n, WidgetClass cl, Widget parent, + XMManager(const char *n, WidgetClass cl, Widget parent, ArgList l=NULL, Cardinal num_args = 0); - XMManager(char *n, WidgetClass cl, XMWidget &parent, + XMManager(const char *n, WidgetClass cl, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); /* The following functions manipulate generic manager resources: */ @@ -353,19 +353,19 @@ */ class XMBulletinBoard : public XMManager { protected: - XMBulletinBoard(char *n, WidgetClass cl, Widget parent, + XMBulletinBoard(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args); public: /* Constructors: */ - XMBulletinBoard(char *n); + XMBulletinBoard(const char *n); XMBulletinBoard(Widget w); - XMBulletinBoard(char *n, XMApplication &parent, + XMBulletinBoard(const char *n, XMApplication &parent, ArgList l = NULL, Cardinal num_args = 0); - XMBulletinBoard(char *n, Widget parent, + XMBulletinBoard(const char *n, Widget parent, ArgList l = NULL, Cardinal num_args=0); - XMBulletinBoard(char *n, XMWidget &parent, + XMBulletinBoard(const char *n, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); /* The following modify attributes of the bulletin board itself: */ @@ -387,13 +387,13 @@ public: /* Constructors: */ - XMFrame(char *name); + XMFrame(const char *name); XMFrame(Widget id); - XMFrame(char *n, XMApplication &parent, + XMFrame(const char *n, XMApplication &parent, ArgList l = NULL, Cardinal num_args = 0); - XMFrame(char *n, XMWidget &parent, + XMFrame(const char *n, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); - XMFrame(char *n, Widget parent, ArgList l = NULL, Cardinal num_args = 0); + XMFrame(const char *n, Widget parent, ArgList l = NULL, Cardinal num_args = 0); /* Set frame attributes: */ @@ -409,13 +409,13 @@ class XMForm : public XMBulletinBoard { public: /* Constructors: */ - XMForm(char *name); + XMForm(const char *name); XMForm(Widget id); - XMForm(char *n, XMApplication &parent, + XMForm(const char *n, XMApplication &parent, ArgList l = NULL, Cardinal num_args = 0); - XMForm(char *n, Widget parent, + XMForm(const char *n, Widget parent, ArgList l=NULL, Cardinal num_args = 0); - XMForm(char *n, XMWidget &parent, + XMForm(const char *n, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); /* Methods which set attributes of the form as a whole */ @@ -468,13 +468,13 @@ public: /* Constructors: */ - XMRowColumn(char *name); + XMRowColumn(const char *name); XMRowColumn(Widget id); - XMRowColumn(char *name, XMApplication &parent, + XMRowColumn(const char *name, XMApplication &parent, ArgList l = NULL, Cardinal num_args = 0); - XMRowColumn(char *name, XMWidget &parent, + XMRowColumn(const char *name, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); - XMRowColumn(char *name, Widget parent, + XMRowColumn(const char *name, Widget parent, ArgList l = NULL, Cardinal num_args = 0); /* Methods to set the major attributes of a row column widget */ @@ -504,11 +504,11 @@ class XMPanedWindow : public XMManager { public: /* Constructors: */ - XMPanedWindow(char *name); + XMPanedWindow(const char *name); XMPanedWindow(Widget id); - XMPanedWindow(char *n, XMWidget &parent, + XMPanedWindow(const char *n, XMWidget &parent, ArgList l = NULL, Cardinal num_args = 0); - XMPanedWindow(char *n, Widget parent, + XMPanedWindow(const char *n, Widget parent, ArgList l = NULL, Cardinal num_args = 0); /* Set attributes of the manager itself. */ @@ -534,13 +534,13 @@ */ class XMMainWindow : public XMManager { public: - XMMainWindow(char *name); + XMMainWindow(const char *name); XMMainWindow(Widget id); - XMMainWindow(char *name, XMApplication &parent, + XMMainWindow(const char *name, XMApplication &parent, ArgList l = NULL, Cardinal arg_count = 0); - XMMainWindow(char *name, XMWidget &parent, + XMMainWindow(const char *name, XMWidget &parent, ArgList l = NULL, Cardinal arg_count = 0); - XMMainWindow(char *name, Widget &parent, + XMMainWindow(const char *name, Widget &parent, ArgList l = NULL, Cardinal arg_count = 0); /* Modify attributes of the main window: */ Modified: branches/SpecTcl-3.2-maintenance/Display/XMMenus.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMMenus.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMMenus.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -443,7 +443,7 @@ ** Cardinal num_args: ** Possibly zero argument list size. */ -XMPushButton *XMPulldown::AddMenuButton(char *n, +XMPushButton *XMPulldown::AddMenuButton(const char *n, void (*callback)(XMWidget *, XtPointer, XtPointer), @@ -460,15 +460,16 @@ ); exit(-1); } - menu_items[menu_count].item = pb = new XMPushButton(n, - *this, - callback, - client_data); + pb = new XMPushButton(const_cast<char*>(n), + *this, + callback, + client_data); if(pb == NULL) { fprintf(stderr, "Error in XMPulldown::AddmenuButton - unable to new pushbutton\n"); exit(-1); } + menu_items[menu_count].item = pb; /* Set the item list properties: */ for(int i = 0; i < num_args; i++) { @@ -601,7 +602,7 @@ ** Returns: ** Pointer to the created widget object. */ -XMPulldown *XMPulldown::AddSubmenu(char *n, int size, ArgList l, Cardinal num_args) +XMPulldown *XMPulldown::AddSubmenu(const char *n, int size, ArgList l, Cardinal num_args) { XMPulldown *pd; @@ -614,14 +615,15 @@ } /* Generate the new pulldown: */ - menu_items[menu_count].item = pd = - new XMPulldown(n, *this, size, l, num_args); + pd = new XMPulldown(const_cast<char*>(n), *this, size, l, num_args); + if(pd == NULL) { fprintf(stderr, "Error in XMPulldown::AddSubmenu - new XMPulldown failed\n"); exit(-1); } + menu_items[menu_count].item = pd; /* Set type, increment the size and return the pulldown */ menu_items[menu_count].type = Submenu; @@ -942,9 +944,9 @@ } void -XMPulldown::Label(char *label) +XMPulldown::Label(const char *label) { - pd_button->Label(label); + pd_button->Label(const_cast<char*>(label)); } void Modified: branches/SpecTcl-3.2-maintenance/Display/XMMenus.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMMenus.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMMenus.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -340,7 +340,7 @@ ~XMPulldown(); /* Label the pulldown button */ - void Label(char *label); + void Label(const char *label); /* Set the toggle button policy */ @@ -350,7 +350,7 @@ void RadioNoForceOne(); /* Add entries to the menu: */ - XMPushButton *AddMenuButton(char *n, + XMPushButton *AddMenuButton(const char *n, void (*callback)(XMWidget *, XtPointer, XtPointer) = NULL, @@ -369,7 +369,7 @@ Cardinal num_args = 0 ); XMWidget *AddSeparator(); - XMPulldown *AddSubmenu(char *n, int max_items, + XMPulldown *AddSubmenu(const char *n, int max_items, ArgList l = NULL, Cardinal num_args=0); Modified: branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -1,11 +1,11 @@ #include <config.h> #include "XMPushbutton.h" -XMButton::XMButton(char *n, WidgetClass c, Widget parent) +XMButton::XMButton(const char *n, WidgetClass c, Widget parent) : XMManagedWidget(n, c, parent) {} -XMButton::XMButton(char *n, WidgetClass c, XMWidget &parent) +XMButton::XMButton(const char *n, WidgetClass c, XMWidget &parent) : XMManagedWidget(n, c, parent) {} @@ -31,11 +31,11 @@ } void -XMButton::Label(String label) +XMButton::Label(const String label) { XmString s; - s = XmStringCreateLtoR(label, - XmSTRING_DEFAULT_CHARSET); + s = XmStringCreateLtoR(const_cast<char*>(label), + const_cast<char*>(XmSTRING_DEFAULT_CHARSET)); Label(s); XmStringFree(s); } @@ -47,9 +47,9 @@ } void -XMButton::SetAccelerator(char *translation, char *prompt) +XMButton::SetAccelerator(const char *translation, const char *prompt) { - XmString acctext = XmStringCreateSimple(prompt); + XmString acctext = XmStringCreateSimple( const_cast<char*>(prompt)); XtVaSetValues(id, XmNaccelerator, translation, XmNacceleratorText, acctext, @@ -58,7 +58,7 @@ } -XMPushButton::XMPushButton(char *n, Widget parent, +XMPushButton::XMPushButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer), XtPointer cd ): XMButton(n, xmPushButtonWidgetClass, parent) @@ -68,7 +68,7 @@ XMWidget::AddCallback(XmNactivateCallback, cb, cd); } -XMPushButton::XMPushButton(char *n, XMWidget &parent, +XMPushButton::XMPushButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer), XtPointer cd): XMButton(n, xmPushButtonWidgetClass, parent) @@ -90,7 +90,7 @@ } -XMCascadeButton::XMCascadeButton(char *n, Widget parent, +XMCascadeButton::XMCascadeButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer), XtPointer cd): XMButton(n, xmCascadeButtonWidgetClass, parent) @@ -100,7 +100,7 @@ XMWidget::AddCallback(XmNactivateCallback, cb, cd); } -XMCascadeButton::XMCascadeButton(char *n, XMWidget &parent, +XMCascadeButton::XMCascadeButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer), XtPointer cd): XMButton(n, xmCascadeButtonWidgetClass, parent) @@ -134,7 +134,7 @@ } -XMToggleButton::XMToggleButton(char *n, Widget parent, +XMToggleButton::XMToggleButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer) , XtPointer cd) : XMButton(n, xmToggleButtonWidgetClass, parent) @@ -145,7 +145,7 @@ cb, cd); } -XMToggleButton::XMToggleButton(char *n, XMWidget &parent, +XMToggleButton::XMToggleButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer) , XtPointer cd) : XMButton(n, xmToggleButtonWidgetClass, parent) @@ -219,7 +219,7 @@ } -XMArrowButton::XMArrowButton(char *n, Widget parent, +XMArrowButton::XMArrowButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer) , XtPointer cd ) : XMButton(n, xmArrowButtonWidgetClass, parent) @@ -229,7 +229,7 @@ XMWidget::AddCallback(XmNactivateCallback, cb, cd); } -XMArrowButton::XMArrowButton(char *n, XMWidget &parent, +XMArrowButton::XMArrowButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer) , XtPointer cd ) : XMButton(n, xmArrowButtonWidgetClass, parent) @@ -284,7 +284,7 @@ {} void -XMArrowButton::Label(String label) +XMArrowButton::Label(const String label) {} void Modified: branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMPushbutton.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -323,7 +323,7 @@ /* PIXMAP subtype */ virtual void Label(XmString label); - virtual void Label(String label); + virtual void Label(const String label); /* Set the button trigger mnemonic: */ @@ -331,11 +331,11 @@ /* Constructors: */ - XMButton(char *n, WidgetClass c, Widget parent); - XMButton(char *n, WidgetClass c, XMWidget &parent); + XMButton(const char *n, WidgetClass c, Widget parent); + XMButton(const char *n, WidgetClass c, XMWidget &parent); XMButton(Widget w); - void SetAccelerator(char *translation, char *prompt); + void SetAccelerator(const char *translation, const char *prompt); }; /* @@ -346,11 +346,11 @@ public: /* Constructors... make the widget */ - XMPushButton(char *n, Widget parent, + XMPushButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd = NULL); - XMPushButton(char *n, XMWidget &parent, + XMPushButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd=NULL); @@ -380,11 +380,11 @@ /* Constructors... make the widget */ - XMCascadeButton(char *n, Widget parent, + XMCascadeButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd = NULL); - XMCascadeButton(char *n, XMWidget &parent, + XMCascadeButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd=NULL); @@ -406,10 +406,10 @@ public: /* Constructors: */ - XMToggleButton(char *n, Widget parent, + XMToggleButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd = NULL); - XMToggleButton(char *n, XMWidget &parent, + XMToggleButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd = NULL); XMToggleButton(Widget w); @@ -444,10 +444,10 @@ public: /* Constructors/destructors */ - XMArrowButton(char *n, Widget parent, + XMArrowButton(const char *n, Widget parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd = NULL); - XMArrowButton(char *n, XMWidget &parent, + XMArrowButton(const char *n, XMWidget &parent, void (*cb)(XMWidget *, XtPointer, XtPointer) = NULL, XtPointer cd = NULL); @@ -465,7 +465,7 @@ /* Overrides of virtual functions in the base class */ virtual void Label(XmString label); - virtual void Label(String label); + virtual void Label(const String label); virtual void SetMnemonic(KeySym k); }; #endif Modified: branches/SpecTcl-3.2-maintenance/Display/XMText.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMText.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMText.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -434,7 +434,7 @@ void XMScrolledText::ClearText() { text_length = 0; - XmTextSetString(id, ""); /* Set text value to empty string. */ + XmTextSetString(id, const_cast<char*>("")); /* Set text value to empty string. */ } void Modified: branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc 2009-05-01 17:30:33 UTC (rev 1603) @@ -5,7 +5,7 @@ ** Implementation of functions from class XMApplication */ -XMApplication::XMApplication(char *cl, Cardinal *argc, char **argv, +XMApplication::XMApplication(const char *cl, Cardinal *argc, char **argv, XrmOptionDescList options , Cardinal noptions, const char **fallback_resources, @@ -89,7 +89,7 @@ ** Implementation of functions for class XMWidget */ -XMWidget::XMWidget(char *n) +XMWidget::XMWidget(const char *n) { strcpy(name, n); /* Null constructor to allow full override. */ @@ -101,19 +101,19 @@ strcpy(name, XtName(id)); } -XMWidget::XMWidget(char *n, WidgetClass cl, XMApplication &parent, +XMWidget::XMWidget(const char *n, WidgetClass cl, XMApplication &parent, ArgList l, Cardinal num_args) { Create(n, cl, parent.getid(), l, num_args); } -XMWidget::XMWidget(char *n, WidgetClass cl, Widget parent, +XMWidget::XMWidget(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) { Create(n, cl, parent, l, num_args); } -XMWidget::XMWidget(char *n, WidgetClass cl, XMWidget &parent, +XMWidget::XMWidget(const char *n, WidgetClass cl, XMWidget &parent, ArgList l, Cardinal num_args) { Create(n, cl, parent.getid(), l, num_args); @@ -238,31 +238,32 @@ XMWidget::UnRealize() { XtUnrealizeWidget(id); } void -XMWidget::Create(char *n, WidgetClass cl, Widget parent, +XMWidget::Create(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) { strcpy(name,n); - id = XtCreateWidget(name, cl, parent, l, num_args); + id = XtCreateWidget(const_cast<char*>(name), cl, parent, l, num_args); } /* ** Implementation of functions from class XMManagedWidget */ -XMManagedWidget::XMManagedWidget(char *n) : - XMWidget(n) +XMManagedWidget::XMManagedWidget(const char *n) : + XMWidget(const_cast<char*>(n)) { /* Null default constructor to allow full override */ } -XMManagedWidget::XMManagedWidget(char *n, WidgetClass cl, Widget parent, +XMManagedWidget::XMManagedWidget(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) : - XMWidget(n, cl, parent, l, num_args) + XMWidget(const_cast<char*>(n), cl, parent, l, num_args) { Manage(); } -XMManagedWidget::XMManagedWidget(char *n, WidgetClass cl, XMWidget &parent, +XMManagedWidget::XMManagedWidget(const char *n, + WidgetClass cl, XMWidget &parent, ArgList l, Cardinal num_args) : - XMWidget(n, cl, parent, l, num_args) + XMWidget(const_cast<char*>(n), cl, parent, l, num_args) { Manage(); } Modified: branches/SpecTcl-3.2-maintenance/Display/XMWidget.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMWidget.h 2009-03-25 09:19:12 UTC (rev 1602) +++ branches/SpecTcl-3.2-maintenance/Display/XMWidget.h 2009-05-01 17:30:33 UTC (rev 1603) @@ -61,7 +61,7 @@ public: - XMApplication(char *cl, Cardinal *argc, char **argv, + XMApplication(const char *cl, Cardinal *argc, char **argv, XrmOptionDescList options = NULL, Cardinal noptions = 0, const char **fallback_resources = NULL, @@ -91,19 +91,19 @@ protected: Widget id; XMWidgetName name; - void Create(char *n, WidgetClass cl, Widget parent, + void Create(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args); public: /* Construc... [truncated message content] |
From: <ro...@us...> - 2009-05-20 20:31:28
|
Revision: 1611 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1611&view=rev Author: ron-fox Date: 2009-05-20 20:31:11 +0000 (Wed, 20 May 2009) Log Message: ----------- In reading scripts and catching errors, add back a newline after each line of an imcomplete command to preserve the syntax Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-05-20 10:59:17 UTC (rev 1610) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-05-20 20:31:11 UTC (rev 1611) @@ -820,4 +820,6 @@ which causes them to be grossly underincremented. May 1, 2009 - Complete a raft of editing so that SpecTcl compiles and runs with minimal error messages on debian lenny...really - Debina g++-4.3.2-1.1 \ No newline at end of file + Debina g++-4.3.2-1.1 +May 20, 2009 - Fix sourcing from new gui.. was stripping newlines from multiline + definintions (e.g. psuedos). which caused them to fail. \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl =================================================================== --- branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl 2009-05-20 10:59:17 UTC (rev 1610) +++ branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl 2009-05-20 20:31:11 UTC (rev 1611) @@ -172,7 +172,7 @@ set info [getLine $fd] set fragment [lindex $info 0] - append command $fragment + append command $fragment "\n" incr lineNumber [lindex $info 1] } # If we got here, the command is complete or we've This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-05-27 14:15:25
|
Revision: 1614 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1614&view=rev Author: ron-fox Date: 2009-05-27 14:15:18 +0000 (Wed, 27 May 2009) Log Message: ----------- Fix error in switch/case handling for gamma 2-d gates that led to an uncaught exception thrown from the gate factory. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/SpecTcl/XamineEventHandler.cpp Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-05-27 14:01:36 UTC (rev 1613) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-05-27 14:15:18 UTC (rev 1614) @@ -822,4 +822,6 @@ with minimal error messages on debian lenny...really Debina g++-4.3.2-1.1 May 20, 2009 - Fix sourcing from new gui.. was stripping newlines from multiline - definintions (e.g. psuedos). which caused them to fail. \ No newline at end of file + definintions (e.g. psuedos). which caused them to fail. +May 27, 2009 - Fix an error in the handling of contours on gamma spectra + \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/SpecTcl/XamineEventHandler.cpp =================================================================== --- branches/SpecTcl-3.2-maintenance/SpecTcl/XamineEventHandler.cpp 2009-05-27 14:01:36 UTC (rev 1613) +++ branches/SpecTcl-3.2-maintenance/SpecTcl/XamineEventHandler.cpp 2009-05-27 14:15:18 UTC (rev 1614) @@ -303,11 +303,7 @@ UInt_t yIndex = 1; // For typcial 2d, this index into the switch(spType) { - case keG2D: // For a gamma all x transforms are first. - { - CGamma2DW* pGSpectrum = (CGamma2DW*)pSpec; - yIndex = pGSpectrum->getnParams(); - } + case ke1D: case keG1D: { @@ -323,7 +319,7 @@ } // Note that high is offset by 1 channel to put it on the right side // of our channel: - + // Float_t xlow = pSpec->AxisToParameter(0, low); Float_t xhigh= pSpec->AxisToParameter(0, high+1); @@ -334,6 +330,11 @@ } break; + case keG2D: // For a gamma all x transforms are first. + { + CGamma2DW* pGSpectrum = (CGamma2DW*)pSpec; + yIndex = pGSpectrum->getnParams(); + } case ke2D: case keG2DD: { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-08-13 10:26:00
|
Revision: 1622 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1622&view=rev Author: ron-fox Date: 2009-08-13 10:25:54 +0000 (Thu, 13 Aug 2009) Log Message: ----------- Fix error in Strip chart spectra -- require both parameters to be valid. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp branches/SpecTcl-3.2-maintenance/configure.in Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-08-07 11:30:08 UTC (rev 1621) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-08-13 10:25:54 UTC (rev 1622) @@ -824,4 +824,5 @@ May 20, 2009 - Fix sourcing from new gui.. was stripping newlines from multiline definintions (e.g. psuedos). which caused them to fail. May 27, 2009 - Fix an error in the handling of contours on gamma spectra - \ No newline at end of file + August 13, 2009 - Fix error in Strip chart spectrum was not requiring + that target parameter was defined. \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp =================================================================== --- branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp 2009-08-07 11:30:08 UTC (rev 1621) +++ branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp 2009-08-13 10:25:54 UTC (rev 1622) @@ -420,7 +420,7 @@ CParameterValue& rParam(rEvent[m_nParameter]); - if(rTime.isValid()) { // Only increment if param present. + if(rTime.isValid() && rParam.isValid()) { // Only increment if param present. Int_t nChannel = (Int_t)ParameterToAxis(0, rTime)- m_nOffset; if (nChannel > m_nChannels ) { Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2009-08-07 11:30:08 UTC (rev 1621) +++ branches/SpecTcl-3.2-maintenance/configure.in 2009-08-13 10:25:54 UTC (rev 1622) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-003) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-004) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-08-13 11:25:48
|
Revision: 1626 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1626&view=rev Author: ron-fox Date: 2009-08-13 11:25:39 +0000 (Thu, 13 Aug 2009) Log Message: ----------- Fix mishandling of shiftup/down when shifts are wider than the spectrum. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-08-13 11:25:01 UTC (rev 1625) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-08-13 11:25:39 UTC (rev 1626) @@ -825,4 +825,6 @@ definintions (e.g. psuedos). which caused them to fail. May 27, 2009 - Fix an error in the handling of contours on gamma spectra August 13, 2009 - Fix error in Strip chart spectrum was not requiring - that target parameter was defined. \ No newline at end of file + - Fix error in strip chart shift. If shift is larger than spectrum + channel count would segfault.that target parameter was defined. + \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp =================================================================== --- branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp 2009-08-13 11:25:01 UTC (rev 1625) +++ branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp 2009-08-13 11:25:39 UTC (rev 1626) @@ -573,6 +573,11 @@ { UInt_t* p = (UInt_t*)getStorage(); assert(p != (UInt_t*)kpNULL); + + if (nShift >= m_nChannels) { // chase where shift is more than channels + Clear(); + return; + } for (int i = 0; i < m_nChannels-nShift; i++) { p[i] = p[i+nShift]; } @@ -587,6 +592,11 @@ { UInt_t* p = (UInt_t*)getStorage(); assert(p != (UInt_t*)kpNULL); + + if (m_nChannels <= (-nShift)) { // Case where shift is more than channels. + Clear(); + return; + } for (int i = m_nChannels ; i >= (nShift * -1); i--) { p[i] = p[i+nShift]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-10-14 11:14:53
|
Revision: 1639 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1639&view=rev Author: ron-fox Date: 2009-10-14 11:14:44 +0000 (Wed, 14 Oct 2009) Log Message: ----------- Fix error in strip chart spectra found at Duke - sliding spectra to the left calculated m_nOffset incorrectly causing a gap in the strip chart. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp branches/SpecTcl-3.2-maintenance/configure.in Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-10-13 14:02:23 UTC (rev 1638) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-10-14 11:14:44 UTC (rev 1639) @@ -832,6 +832,9 @@ September 4, 2009 - Fix BZ 378 - CHistogrammer::createTitle had typos in the reduction of the y parameter list that led to segfaults when g2d spectra titles were created. +3.2-005 +October 14, 2009 - Fix error in strip chart spectrum. After a slide left, the + offset was off by one causing continuous parameters to have a + 1-channel hole in their spectra. - \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp =================================================================== --- branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp 2009-10-13 14:02:23 UTC (rev 1638) +++ branches/SpecTcl-3.2-maintenance/Sorter/SpectrumS.cpp 2009-10-14 11:14:44 UTC (rev 1639) @@ -423,9 +423,9 @@ if(rTime.isValid() && rParam.isValid()) { // Only increment if param present. Int_t nChannel = (Int_t)ParameterToAxis(0, rTime)- m_nOffset; - if (nChannel > m_nChannels ) { + if (nChannel >= m_nChannels ) { ShiftDataDown (static_cast<int>(nChannel + (.25 * m_nChannels) - m_nChannels)); - m_nOffset = static_cast<int>(m_nOffset + nChannel + (.25 * m_nChannels) - m_nChannels); + m_nOffset = static_cast<int>(m_nOffset + nChannel + (.25 * m_nChannels) - m_nChannels) + 1; nChannel = nChannel - m_nOffset; }else if (nChannel < 0) { ShiftDataUp(nChannel); Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2009-10-13 14:02:23 UTC (rev 1638) +++ branches/SpecTcl-3.2-maintenance/configure.in 2009-10-14 11:14:44 UTC (rev 1639) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-004) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-005) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-12-04 20:25:44
|
Revision: 1642 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1642&view=rev Author: ron-fox Date: 2009-12-04 20:25:34 +0000 (Fri, 04 Dec 2009) Log Message: ----------- BZ 384 - Provide some fallback fonts for labeling spectra including some from the core X11 font list. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc branches/SpecTcl-3.2-maintenance/Display/Xamine.cc branches/SpecTcl-3.2-maintenance/Display/text.cc branches/SpecTcl-3.2-maintenance/configure.in Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-12-03 11:03:10 UTC (rev 1641) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-12-04 20:25:34 UTC (rev 1642) @@ -836,5 +836,10 @@ October 14, 2009 - Fix error in strip chart spectrum. After a slide left, the offset was off by one causing continuous parameters to have a 1-channel hole in their spectra. - - \ No newline at end of file +3.2-006 +December 3, 2009 - Fix error in XMDialogs.cc XMWarningDialog::XMWarningDialog + references the buttons prior to ensuring their creation. +December 4, 2009 - BZ 384 provide a list of fallback fonts in case + adobe courier is missing (e.g. Xming without font pack). + If no fonts in the list of fonts are available, do a popup + error rather than an stderr message before exiting. \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc 2009-12-03 11:03:10 UTC (rev 1641) +++ branches/SpecTcl-3.2-maintenance/Display/XMDialogs.cc 2009-12-04 20:25:34 UTC (rev 1642) @@ -1923,10 +1923,10 @@ list, argcount); SetText(msg); + GetButtons(); LabelOkButton("Dismiss"); cancelbutton->Disable(); helpbutton->Disable(); - GetButtons(); if(cb) AddOkCallback(cb, cbd); Manage(); Modified: branches/SpecTcl-3.2-maintenance/Display/Xamine.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/Xamine.cc 2009-12-03 11:03:10 UTC (rev 1641) +++ branches/SpecTcl-3.2-maintenance/Display/Xamine.cc 2009-12-04 20:25:34 UTC (rev 1642) @@ -445,6 +445,8 @@ XtVaSetValues(w, XmNiconPixmap, icon, NULL); } +XMWidget* Xamine_TopLevel; // Point to the top level widget. + int main(int argc, char **argv) { @@ -458,6 +460,8 @@ XMForm panes(const_cast<char*>("PaneManager"), work_area); XMWidget *status_area = Xamine_SetupLocator(&work_area); + Xamine_TopLevel = reinterpret_cast<XMWidget*>(&main_win); + /* ** Set up the work area with the panes on top and the status form on the ** Bottom. Modified: branches/SpecTcl-3.2-maintenance/Display/text.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/text.cc 2009-12-03 11:03:10 UTC (rev 1641) +++ branches/SpecTcl-3.2-maintenance/Display/text.cc 2009-12-04 20:25:34 UTC (rev 1642) @@ -49,6 +49,10 @@ #include <X11/Xos.h> #include <X11/Xatom.h> +/* Xamine utilities: */ + +#include "errormsg.h" + /* Local function prototypes. */ #include "text.h" @@ -60,11 +64,26 @@ extern "C" { void exit(int); } #endif +extern XMWidget* Xamine_TopLevel; + /* ** Constant definitions: */ #define XAMINE_FONT_FAMILY "-adobe-courier-medium-r*" +#define ALTERNATE_XAMINE_FONT_FAMILY "-*-fixed-*-r*" + +// List of fonts that are acceptable to us: + +static const char* FontList[] = { + XAMINE_FONT_FAMILY, + "*courier-medium-r*", + "*courier*", + ALTERNATE_XAMINE_FONT_FAMILY, + NULL +}; + + /* ** Class definitions */ @@ -283,25 +302,37 @@ ** First get the list of fonts that are in the font family used ** by Xamine: */ - font_names = XListFonts(display, XAMINE_FONT_FAMILY, 100, &nfonts); - if(font_names == NULL) { - fprintf(stderr, "This server does not have the font family %s\n", - XAMINE_FONT_FAMILY); - fprintf(stderr, "Unfortunately Xamine cannot continue from that error\n"); - exit(-1); + const char** pFontFamily = FontList; + while(*pFontFamily) { + font_names = XListFonts(display, *pFontFamily, 100, &nfonts); + if (font_names) { + font_namelist = font_names; + /* + ** now load the fonts into the database one by one: + */ + fonts = new FontDatabase(nfonts); + + while(nfonts > 0) { + fonts->AddFont(*font_names, XLoadQueryFont(display, *font_names)); + font_names++; + nfonts--; + } + return; + } + else { + pFontFamily++; + } } - font_namelist = font_names; - /* - ** now load the fonts into the database one by one: - */ - fonts = new FontDatabase(nfonts); - while(nfonts > 0) { - fonts->AddFont(*font_names, XLoadQueryFont(display, *font_names)); - font_names++; - nfonts--; - } + // Control landed here if none of the font families could be located. + Xamine_error_msg(Xamine_TopLevel, + "This server does not have a font family suitable for labeling the spectra"); + fprintf(stderr, "No fonts we can use!!\n"); + exit(-1); + + + } /* Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2009-12-03 11:03:10 UTC (rev 1641) +++ branches/SpecTcl-3.2-maintenance/configure.in 2009-12-04 20:25:34 UTC (rev 1642) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-005) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-006) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-12-04 21:39:28
|
Revision: 1645 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1645&view=rev Author: ron-fox Date: 2009-12-04 21:39:20 +0000 (Fri, 04 Dec 2009) Log Message: ----------- BZ 384 - Supply a catch handler in main() for const char* exceptions. The handler displays a warning dialog that is modal and which when dismissed exits Xamine - In text.cc:LoadFonts throw a const char* error message if no suitable fonts are found. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/Xamine.cc branches/SpecTcl-3.2-maintenance/Display/text.cc Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-12-04 21:32:26 UTC (rev 1644) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2009-12-04 21:39:20 UTC (rev 1645) @@ -842,4 +842,11 @@ December 4, 2009 - BZ 384 provide a list of fallback fonts in case adobe courier is missing (e.g. Xming without font pack). If no fonts in the list of fonts are available, do a popup - error rather than an stderr message before exiting. \ No newline at end of file + error rather than an stderr message before exiting. + BZ384 - Provide a const char* exception handler in main() + when caught displays a modal warning box with the + exception displayed and when dismissed exits Xamine. + - Throw an appropriate const char* exception when + no suitable fonts can be found in text.cc:LoadFonts + + \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Display/Xamine.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/Xamine.cc 2009-12-04 21:32:26 UTC (rev 1644) +++ branches/SpecTcl-3.2-maintenance/Display/Xamine.cc 2009-12-04 21:39:20 UTC (rev 1645) @@ -444,6 +444,14 @@ XtVaSetValues(w, XmNiconPixmap, icon, NULL); } +/* + * Exit callback for for the error handler + */ +void +ExitOnError(XMWidget* pWidget, XtPointer ed, XtPointer cd) +{ + exit(-1); +} XMWidget* Xamine_TopLevel; // Point to the top level widget. @@ -460,117 +468,131 @@ XMForm panes(const_cast<char*>("PaneManager"), work_area); XMWidget *status_area = Xamine_SetupLocator(&work_area); - Xamine_TopLevel = reinterpret_cast<XMWidget*>(&main_win); + try { + Xamine_TopLevel = reinterpret_cast<XMWidget*>(&main_win); - /* - ** Set up the work area with the panes on top and the status form on the - ** Bottom. - */ + /* + ** Set up the work area with the panes on top and the status form on the + ** Bottom. + */ - work_area.SetFractionBase(100); - work_area.SetTopAttachment(panes, XmATTACH_FORM); - work_area.SetLeftAttachment(panes, XmATTACH_FORM); - work_area.SetRightAttachment(panes, XmATTACH_FORM); + work_area.SetFractionBase(100); + work_area.SetTopAttachment(panes, XmATTACH_FORM); + work_area.SetLeftAttachment(panes, XmATTACH_FORM); + work_area.SetRightAttachment(panes, XmATTACH_FORM); - work_area.SetLeftAttachment(*status_area, XmATTACH_FORM); - work_area.SetBottomAttachment(*status_area, XmATTACH_FORM); - work_area.SetRightAttachment(*status_area, XmATTACH_FORM); - work_area.SetTopAttachment(*status_area, XmATTACH_POSITION); - work_area.SetTopPosition(*status_area, 95); + work_area.SetLeftAttachment(*status_area, XmATTACH_FORM); + work_area.SetBottomAttachment(*status_area, XmATTACH_FORM); + work_area.SetRightAttachment(*status_area, XmATTACH_FORM); + work_area.SetTopAttachment(*status_area, XmATTACH_POSITION); + work_area.SetTopPosition(*status_area, 95); - work_area.SetBottomAttachment(panes, XmATTACH_POSITION); - work_area.SetBottomPosition(panes, 94); + work_area.SetBottomAttachment(panes, XmATTACH_POSITION); + work_area.SetBottomPosition(panes, 94); - Arg arg[10]; - XtSetArg(arg[0], XmNscrollingPolicy, XmAUTOMATIC); - XtSetArg(arg[1], XmNscrollBarDisplayPolicy, XmAS_NEEDED); - XtSetArg(arg[2], XmNresizable, False); - XMWidget *cmd_area = new XMWidget(const_cast<char*>("button_bar"), - xmScrolledWindowWidgetClass, main_win, - arg, 3); - XMMenuBar *mb; + Arg arg[10]; + XtSetArg(arg[0], XmNscrollingPolicy, XmAUTOMATIC); + XtSetArg(arg[1], XmNscrollBarDisplayPolicy, XmAS_NEEDED); + XtSetArg(arg[2], XmNresizable, False); + XMWidget *cmd_area = new XMWidget(const_cast<char*>("button_bar"), + xmScrolledWindowWidgetClass, main_win, + arg, 3); + XMMenuBar *mb; - /* We need to set up the mechanism for getting Xt notification of */ - /* gate events from the users. This will also create the appropriate */ - /* pipe/mailboxes to communicate between Xamine and the client. */ + /* We need to set up the mechanism for getting Xt notification of */ + /* gate events from the users. This will also create the appropriate */ + /* pipe/mailboxes to communicate between Xamine and the client. */ - Xamine_SetupRequestNotification(XtWidgetToApplicationContext(top.getid()), - (XtInputCallbackProc)Xamine_ProcessClientRequests); + Xamine_SetupRequestNotification(XtWidgetToApplicationContext(top.getid()), + (XtInputCallbackProc)Xamine_ProcessClientRequests); - /* Initialize access to the shared memory spectra. */ + /* Initialize access to the shared memory spectra. */ - Xamine_initspectra(); + Xamine_initspectra(); - /* Set up the icon for the application */ + /* Set up the icon for the application */ #ifdef HOME - char IconName[100]; - sprintf(IconName,"%s/etc/Xamine.ico" ,HOME); - SetIcon(main_win.getid(), IconName); + char IconName[100]; + sprintf(IconName,"%s/etc/Xamine.ico" ,HOME); + SetIcon(main_win.getid(), IconName); #else - SetIcon(main_win.getid(), ICON_FILENAME); + SetIcon(main_win.getid(), ICON_FILENAME); #endif - /* Set up the user interface */ + /* Set up the user interface */ - mb = Xamine_setup_menus(&main_win); /* Set up the menu bar. */ + mb = Xamine_setup_menus(&main_win); /* Set up the menu bar. */ - Xamine_SetupButtonBar(cmd_area); - Xamine_Initialize_panedb(&panes); /* Set up the spectrum display panes */ + Xamine_SetupButtonBar(cmd_area); + Xamine_Initialize_panedb(&panes); /* Set up the spectrum display panes */ - main_win.SetAreas(mb, cmd_area, NULL, NULL, &work_area); - main_win.SetAttribute(XmNcommandWindowLocation, XmCOMMAND_BELOW_WORKSPACE); + main_win.SetAreas(mb, cmd_area, NULL, NULL, &work_area); + main_win.SetAttribute(XmNcommandWindowLocation, XmCOMMAND_BELOW_WORKSPACE); - XMWidget *panemgr = Xamine_Getpanemgr(); - panemgr->Manage(); - panes.Manage(); - status_area->Manage(); - work_area.Manage(); - cmd_area->Manage(); - main_win.Manage(); + XMWidget *panemgr = Xamine_Getpanemgr(); + panemgr->Manage(); + panes.Manage(); + status_area->Manage(); + work_area.Manage(); + cmd_area->Manage(); + main_win.Manage(); - Xamine_EnableBasePackage(); - Xamine_DisableMultiwindowPackage(); - Xamine_DisableSpectrumPresentPackage(); - Xamine_DisableSpectrumSelectedPackage(); - Xamine_Disable1dSelectedPackage(); - Xamine_Disable2dSelectedPackage(); + Xamine_EnableBasePackage(); + Xamine_DisableMultiwindowPackage(); + Xamine_DisableSpectrumPresentPackage(); + Xamine_DisableSpectrumSelectedPackage(); + Xamine_Disable1dSelectedPackage(); + Xamine_Disable2dSelectedPackage(); - /* Set up the colormap if any: */ + /* Set up the colormap if any: */ - top.Realize(); - Xamine_InitColors(&main_win); + top.Realize(); + Xamine_InitColors(&main_win); - /* Read default pane properties and modify as needed for the tube */ + /* Read default pane properties and modify as needed for the tube */ - Xamine_ReadDefaultProperties(); - /* - ** BUGBUGBUG -- Here's something I can't figure out... - ** Default properties get updated on all changes - ** This can cause flips between BW/Color renditions - ** depending on what's running... - ** the code below effectively ignores the users's default - ** rendition. - ** possibly later, we'll have two files, one for color, - ** one for B/W. - */ + Xamine_ReadDefaultProperties(); + /* + ** BUGBUGBUG -- Here's something I can't figure out... + ** Default properties get updated on all changes + ** This can cause flips between BW/Color renditions + ** depending on what's running... + ** the code below effectively ignores the users's default + ** rendition. + ** possibly later, we'll have two files, one for color, + ** one for B/W. + */ - if(!Xamine_ColorDisplay()) - Xamine_SetDefault2DRendition(scatter); - else - Xamine_SetDefault2DRendition(color); + if(!Xamine_ColorDisplay()) + Xamine_SetDefault2DRendition(scatter); + else + Xamine_SetDefault2DRendition(color); - /* Start the application */ + /* Start the application */ - usage = (caddr_t)sbrk(0); /* Get current stack/heap break point. */ - XtAppAddTimeOut(top.GetContext(), - 1000, - Monitor, - &top); + usage = (caddr_t)sbrk(0); /* Get current stack/heap break point. */ + XtAppAddTimeOut(top.GetContext(), + 1000, + Monitor, + &top); #ifndef CYGWIN // See the comment for <new> above. - set_new_handler(MemGone); + set_new_handler(MemGone); #endif - top.Begin(); /* Start processing events */ + top.Begin(); /* Start processing events */ + } + catch(const char* msg) { // Error message dialog and exit on accept. + XMWarningDialog error(const_cast<char*>("Exiting"), + reinterpret_cast<XMWidget&>(main_win), + const_cast<char*>(msg), + ExitOnError, + (XtPointer)NULL, + (Arg*)NULL, (Cardinal)0); + error.SetModal(XmDIALOG_APPLICATION_MODAL); + + top.Begin(); // Back into the event loop. + } + } Modified: branches/SpecTcl-3.2-maintenance/Display/text.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/text.cc 2009-12-04 21:32:26 UTC (rev 1644) +++ branches/SpecTcl-3.2-maintenance/Display/text.cc 2009-12-04 21:39:20 UTC (rev 1645) @@ -326,13 +326,11 @@ // Control landed here if none of the font families could be located. - Xamine_error_msg(Xamine_TopLevel, - "This server does not have a font family suitable for labeling the spectra"); - fprintf(stderr, "No fonts we can use!!\n"); - exit(-1); + throw "This server does not have a font family suitable for labeling the spectra"; + } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-05-18 13:43:18
|
Revision: 1685 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1685&view=rev Author: ron-fox Date: 2010-05-18 13:43:12 +0000 (Tue, 18 May 2010) Log Message: ----------- Fix error in gui spectrum usage calculations. Was undercalculating summary spectrum usage. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/ChangeLog branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl branches/SpecTcl-3.2-maintenance/configure.in branches/SpecTcl-3.2-maintenance/gri-2.12.20/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.log branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.status branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/source/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/examples/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/resources/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/screenshots/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/tst_suite/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/Makefile branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/popt/Makefile Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2010-05-18 13:43:12 UTC (rev 1685) @@ -856,3 +856,6 @@ May 14, 2010 - Remove usage of memswap - Remove -lpub from all makefile like artifacts. - fixed BZ 404 overflow in griprint.cc (buffer overflow that is). +3.2-008 +May 18, 2010 - Fixed error in gui spectrumUsage proc. Was miscalculating + summary spectrum usage. Modified: branches/SpecTcl-3.2-maintenance/ChangeLog =================================================================== --- branches/SpecTcl-3.2-maintenance/ChangeLog 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/ChangeLog 2010-05-18 13:43:12 UTC (rev 1685) @@ -0,0 +1 @@ + \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl =================================================================== --- branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/Gui/newGui.tcl 2010-05-18 13:43:12 UTC (rev 1685) @@ -876,11 +876,16 @@ set axes [lindex $spectrum 4] set dtype [lindex $spectrum 5] + set stype [lindex $spectrum 2] set xChannels [lindex [lindex $axes 0] 2] if {[llength $axes] == 1} { set channels $xChannels + if {$stype == "s"} { + set paramcount [llength [lindex $spectrum 3]] + set channels [expr $paramcount * $xChannels] + } } else { set yChannels [lindex [lindex $axes 1] 2] set channels [expr $xChannels * $yChannels] Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/configure.in 2010-05-18 13:43:12 UTC (rev 1685) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-007) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-008) AC_EXEEXT Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -159,7 +159,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.log =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.log 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.log 2010-05-18 13:43:12 UTC (rev 1685) @@ -4,7 +4,7 @@ It was created by gri configure 2.12.20, which was generated by GNU Autoconf 2.61. Invocation command line was - $ ./configure --prefix=/usr/opt/spectcl/3.2 + $ ./configure ## --------- ## ## Platform. ## @@ -346,13 +346,13 @@ configure:6050: result: yes configure:5970: checking for tmpnam configure:6026: g++ -o conftest -g -O2 conftest.cpp -lreadline >&5 -/tmp/ccAnd414.o: In function `main': +/tmp/ccWVUffV.o: In function `main': /scratch/fox/SpecTcl/3.2/gri-2.12.20/conftest.cpp:64: warning: the use of `tmpnam' is dangerous, better use `mkstemp' configure:6032: $? = 0 configure:6050: result: yes configure:5970: checking for tempnam configure:6026: g++ -o conftest -g -O2 conftest.cpp -lreadline >&5 -/tmp/cc6GOCDg.o: In function `main': +/tmp/cc4IXqR8.o: In function `main': /scratch/fox/SpecTcl/3.2/gri-2.12.20/conftest.cpp:65: warning: the use of `tempnam' is dangerous, better use `mkstemp' configure:6032: $? = 0 configure:6050: result: yes @@ -615,7 +615,7 @@ mkdir_p='/bin/mkdir -p' oldincludedir='/usr/include' pdfdir='${docdir}' -prefix='/usr/opt/spectcl/3.2' +prefix='/usr/local' program_transform_name='s,x,x,' psdir='${docdir}' sbindir='${exec_prefix}/sbin' Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.status =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.status 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/config.status 2010-05-18 13:43:12 UTC (rev 1685) @@ -329,7 +329,7 @@ ac_cs_version="\ gri config.status 2.12.20 configured by ./configure, generated by GNU Autoconf 2.61, - with options \"'--prefix=/usr/opt/spectcl/3.2'\" + with options \"\" Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -395,10 +395,10 @@ fi if $ac_cs_recheck; then - echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/usr/opt/spectcl/3.2' $ac_configure_extra_args " --no-create --no-recursion" >&6 + echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6 CONFIG_SHELL=/bin/sh export CONFIG_SHELL - exec /bin/sh "./configure" '--prefix=/usr/opt/spectcl/3.2' $ac_configure_extra_args --no-create --no-recursion + exec /bin/sh "./configure" $ac_configure_extra_args --no-create --no-recursion fi exec 5>>config.log @@ -495,7 +495,7 @@ s,@PACKAGE_STRING@,|#_!!_#|gri 2.12.20,g s,@PACKAGE_BUGREPORT@,|#_!!_#|,g s,@exec_prefix@,|#_!!_#|${prefix},g -s,@prefix@,|#_!!_#|/usr/opt/spectcl/3.2,g +s,@prefix@,|#_!!_#|/usr/local,g s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g s,@bindir@,|#_!!_#|${exec_prefix}/bin,g s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -150,7 +150,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/source/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/source/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/debian/source/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -133,7 +133,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -166,7 +166,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/examples/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/examples/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/examples/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -133,7 +133,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/resources/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/resources/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/resources/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -133,7 +133,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/screenshots/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/screenshots/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/screenshots/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -135,7 +135,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/tst_suite/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/tst_suite/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/doc/tst_suite/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -133,7 +133,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -187,7 +187,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin Modified: branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/popt/Makefile =================================================================== --- branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/popt/Makefile 2010-05-14 20:43:18 UTC (rev 1684) +++ branches/SpecTcl-3.2-maintenance/gri-2.12.20/src/popt/Makefile 2010-05-18 13:43:12 UTC (rev 1685) @@ -151,7 +151,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/opt/spectcl/3.2 +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-06-02 14:24:11
|
Revision: 1693 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1693&view=rev Author: ron-fox Date: 2010-06-02 14:24:03 +0000 (Wed, 02 Jun 2010) Log Message: ----------- Fixed errors in tree gui - mclistbox.tcl now tcl 8.5 clean - Gate dependency calculations flawed if there's only one gate defined..and that would cause saves to fail. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/TreeParam/SpectrumGenerator.tcl branches/SpecTcl-3.2-maintenance/TreeParam/mclistbox.tcl Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2010-06-02 14:20:56 UTC (rev 1692) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2010-06-02 14:24:03 UTC (rev 1693) @@ -1,4 +1,3 @@ -] 2.1-006 - Incorporate fix 113 - low level cutoffs lead to corrupted 1-d displays. - Have build procedures clean any pre-built Gri prior to @@ -859,3 +858,7 @@ 3.2-008 May 18, 2010 - Fixed error in gui spectrumUsage proc. Was miscalculating summary spectrum usage. +June 2, 2010 - Fixed two errors in the old tree parameter GUI: + * mclistbox.tcl - needs -state defined to work in Tcl 8.5 + * Gate dependencies not correctly calculated causing + saves to fail if there was only one gate defined. \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/TreeParam/SpectrumGenerator.tcl =================================================================== --- branches/SpecTcl-3.2-maintenance/TreeParam/SpectrumGenerator.tcl 2010-06-02 14:20:56 UTC (rev 1692) +++ branches/SpecTcl-3.2-maintenance/TreeParam/SpectrumGenerator.tcl 2010-06-02 14:24:03 UTC (rev 1693) @@ -1366,6 +1366,7 @@ } } } + return false } } Modified: branches/SpecTcl-3.2-maintenance/TreeParam/mclistbox.tcl =================================================================== --- branches/SpecTcl-3.2-maintenance/TreeParam/mclistbox.tcl 2010-06-02 14:20:56 UTC (rev 1692) +++ branches/SpecTcl-3.2-maintenance/TreeParam/mclistbox.tcl 2010-06-02 14:24:03 UTC (rev 1693) @@ -110,6 +110,7 @@ -selectforeground {selectForeground Background} \ -selectmode {selectMode SelectMode} \ -setgrid {setGrid SetGrid} \ + -state {state State} \ -takefocus {takeFocus TakeFocus} \ -width {width Width} \ -xscrollcommand {xScrollCommand ScrollCommand} \ @@ -1098,6 +1099,7 @@ proc ::mclistbox::WidgetProc {w command args} { variable widgetOptions + upvar ::mclistbox::${w}::widgets widgets upvar ::mclistbox::${w}::options options upvar ::mclistbox::${w}::misc misc @@ -1309,6 +1311,7 @@ if {[llength $args] != 1} { error "wrong # args: should be $w cget option" } + set opt [::mclistbox::Canonize $w option [lindex $args 0]] set result $options($opt) @@ -1775,6 +1778,7 @@ variable columnCommands variable labelCommands + switch $object { command { if {[lsearch -exact $widgetCommands $opt] >= 0} { @@ -1831,6 +1835,7 @@ } set list [array names widgetOptions] set matches [array names widgetOptions ${opt}*] + } {column option} { @@ -2454,6 +2459,7 @@ upvar ::mclistbox::${w}::misc misc upvar ::mclistbox::${w}::columnID columnID + # if the widget doesn't allow resizable cursors, there's # nothing here to do... if {!$options(-resizablecolumns)} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-07-13 18:21:58
|
Revision: 1705 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1705&view=rev Author: ron-fox Date: 2010-07-13 18:21:51 +0000 (Tue, 13 Jul 2010) Log Message: ----------- Fix some double deallocation issues found by Coupland. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/XMCallback.cc branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc branches/SpecTcl-3.2-maintenance/Display/XMWidget.h branches/SpecTcl-3.2-maintenance/Display/acceptgates.cc branches/SpecTcl-3.2-maintenance/Display/expand.cc branches/SpecTcl-3.2-maintenance/Display/grafinput.cc branches/SpecTcl-3.2-maintenance/Display/grafinput.h branches/SpecTcl-3.2-maintenance/Display/grobjinput.cc branches/SpecTcl-3.2-maintenance/Display/grobjinput.h branches/SpecTcl-3.2-maintenance/Display/marker.cc branches/SpecTcl-3.2-maintenance/Display/ptlist.cc branches/SpecTcl-3.2-maintenance/Display/sumregion.cc branches/SpecTcl-3.2-maintenance/Display/sumregion.h branches/SpecTcl-3.2-maintenance/configure.in Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2010-07-13 18:21:51 UTC (rev 1705) @@ -861,4 +861,6 @@ June 2, 2010 - Fixed two errors in the old tree parameter GUI: * mclistbox.tcl - needs -state defined to work in Tcl 8.5 * Gate dependencies not correctly calculated causing - saves to fail if there was only one gate defined. \ No newline at end of file + saves to fail if there was only one gate defined. + +3.2-009 - Fix some memory double deallocation errors found by Coupland. Modified: branches/SpecTcl-3.2-maintenance/Display/XMCallback.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMCallback.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/XMCallback.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -402,8 +402,9 @@ ** Then delete the callback data structure since it was the source of ** memory leaks else where. */ - delete [] cbd->reason; - delete cbd; /* Prevent memory leaks. */ + // Fuzzy thinking will eventually get deleted by XMWidget's destructor. + // delete [] cbd->reason; + // delete cbd; /* Prevent memory leaks. */ } Modified: branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/XMWidget.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -135,6 +135,7 @@ } // std::list can clean up after itself now. + m_callbacks.clear(); } Widget @@ -143,8 +144,11 @@ Widget XMWidget::getparent() { return XtParent(id); } -char* -XMWidget::getname() { return name; } +const char* +XMWidget::getname() const +{ + return name; +} void XMWidget::SetAttribute(String attribute, XtArgVal value) @@ -209,6 +213,8 @@ XMRemoveCallback(cbd); // This deletes cbd and the string m_callbacks.erase(i); // Get rid of the list element. + delete []cbd->reason; + delete cbd; // Get rid of the dynamic storage. return; } @@ -242,7 +248,7 @@ ArgList l, Cardinal num_args) { strcpy(name,n); - id = XtCreateWidget(const_cast<char*>(name), cl, parent, l, num_args); + id = XtCreateWidget(name, cl, parent, l, num_args); } /* @@ -250,20 +256,19 @@ */ XMManagedWidget::XMManagedWidget(const char *n) : - XMWidget(const_cast<char*>(n)) + XMWidget(n) { /* Null default constructor to allow full override */ } XMManagedWidget::XMManagedWidget(const char *n, WidgetClass cl, Widget parent, ArgList l, Cardinal num_args) : - XMWidget(const_cast<char*>(n), cl, parent, l, num_args) + XMWidget(n, cl, parent, l, num_args) { Manage(); } -XMManagedWidget::XMManagedWidget(const char *n, - WidgetClass cl, XMWidget &parent, +XMManagedWidget::XMManagedWidget(const char *n, WidgetClass cl, XMWidget &parent, ArgList l, Cardinal num_args) : - XMWidget(const_cast<char*>(n), cl, parent, l, num_args) + XMWidget(n, cl, parent, l, num_args) { Manage(); } Modified: branches/SpecTcl-3.2-maintenance/Display/XMWidget.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/XMWidget.h 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/XMWidget.h 2010-07-13 18:21:51 UTC (rev 1705) @@ -111,7 +111,7 @@ Widget getid(); Widget getparent(); - char *getname(); + const char *getname() const; /* Get/Modify X resources: */ void SetAttribute(String attribute, XtArgVal value); Modified: branches/SpecTcl-3.2-maintenance/Display/acceptgates.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/acceptgates.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/acceptgates.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -213,7 +213,7 @@ ** Help text pointer, or NULL If help is not available for the dialog. */ AcceptCut::AcceptCut(char* name, XMWidget* parent, char** help_text) : - AcceptSummingRegion(name, parent, help_text) + AcceptSummingRegion(const_cast<const char*>(name), parent, const_cast<const char**>(help_text)) { object = (grobj_generic *)new grobj_cut1d; } @@ -232,7 +232,7 @@ ** Help text if present or NULL if there is no help. */ AcceptContour::AcceptContour(char *name, XMWidget *parent, char **help_text) : - AcceptSummingRegion(name, parent, help_text) + AcceptSummingRegion(const_cast<const char*>(name), parent, const_cast<const char**>(help_text)) { object = (grobj_generic *) new grobj_contour; } @@ -250,7 +250,7 @@ ** Help text if any, NULL If none. */ AcceptBand::AcceptBand(char *name, XMWidget *parent, char **help_text) : - AcceptSummingRegion(name, parent, help_text) + AcceptSummingRegion(const_cast<const char*>(name), parent, const_cast<const char**>(help_text)) { object = (grobj_generic *)new grobj_band; } Modified: branches/SpecTcl-3.2-maintenance/Display/expand.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/expand.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/expand.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -368,7 +368,7 @@ public: /* Constructors and destructors: */ - Expand(XMWidget *parent, char *name, char **help_text = NULL); + Expand(XMWidget *parent, const char *name, const char **help_text = NULL); virtual ~Expand() { } /* Get the hierarchy destroyed. */ /* The following functions replace the virtual function set that @@ -456,7 +456,7 @@ ** by the parent constructors. We just have to clear the internal state ** and dialogs. */ -Expand::Expand(XMWidget *parent, char *name, char **help_text) : +Expand::Expand(XMWidget *parent, const char *name, const char **help_text) : GraphicalInput(parent, name, help_text), Xamine_Select2(this, *work_area) { @@ -1270,8 +1270,8 @@ /* If the dialog does not exist, then instantiate it. */ if(dialog == NULL) { - dialog = new Expand(w, const_cast<char*>("Expand"), - const_cast<char**>(help_text)); + dialog = new Expand(w, "Expand", + help_text); dialog->SetPoint1Label(const_cast<char*>("Limit 1")); dialog->SetPoint2Label(const_cast<char*>("Limit 2")); Modified: branches/SpecTcl-3.2-maintenance/Display/grafinput.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/grafinput.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/grafinput.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -358,16 +358,16 @@ ** char **help_text: ** Possibly null pointer to the help text strings. */ - GraphicalInput::GraphicalInput(XMWidget *parent, char *name, - char **help_text) : - XMCustomDialog(name, *parent, const_cast<char*>("Graphical Input")) + GraphicalInput::GraphicalInput(XMWidget *parent, const char *name, + const char **help_text) : + XMCustomDialog(name, *parent, "Graphical Input") { /* Set up the help button */ if(help_text) { - help.name = const_cast<char*>("Help_Popup"); + help.name = "Help_Popup"; help.dialog = NULL; - help.text = help_text; + help.text = const_cast<char**>(help_text); AddHelpCallback(Xamine_display_help, &help); } else { @@ -654,7 +654,10 @@ ClearState(); ClearDialog(); ClearStandardCallbacks(); - UnManage(); + XtCallCallbacks(getid(), XmNpopdownCallback, call_d); + + // UnManage(); + } /* @@ -683,10 +686,7 @@ void GraphicalInput::OkCallback(XtPointer call_d) { if(DoAccept()) { - ClearDialog(); - ClearState(); - ClearStandardCallbacks(); - UnManage(); + CancelCallback(call_d); } } @@ -755,7 +755,7 @@ pInput->RemoveCallback(XmNpopdownCallback, Xamine_DestroyGraphicalInput, pClientData); - pInput->CancelCallback(NULL); // Doing this here prevents recursion. + // pInput->CancelCallback(NULL); // Doing this here prevents recursion. NullPointer(pWidget, pClientData, pEvent); Modified: branches/SpecTcl-3.2-maintenance/Display/grafinput.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/grafinput.h 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/grafinput.h 2010-07-13 18:21:51 UTC (rev 1705) @@ -60,8 +60,8 @@ /* Constructors and destructors: */ - GraphicalInput(XMWidget *parent, char *name, - char **help_text); + GraphicalInput(XMWidget *parent, const char *name, + const char **help_text); virtual ~GraphicalInput(); Modified: branches/SpecTcl-3.2-maintenance/Display/grobjinput.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/grobjinput.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/grobjinput.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -314,7 +314,7 @@ ** char **help_text ** Pointer to the help text list, NULL means no help available. */ -ObjectInput::ObjectInput(XMWidget *parent, char *name, char **help_text) : +ObjectInput::ObjectInput(XMWidget *parent, const char *name, const char **help_text) : GraphicalInput(parent, name, help_text) { /* Instantiate the widgets: */ Modified: branches/SpecTcl-3.2-maintenance/Display/grobjinput.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/grobjinput.h 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/grobjinput.h 2010-07-13 18:21:51 UTC (rev 1705) @@ -325,7 +325,7 @@ public: /* Constructors and destructors: */ - ObjectInput(XMWidget *parent, char *name, char **help_text = NULL); + ObjectInput(XMWidget *parent, const char *name, const char **help_text = NULL); ~ObjectInput() { delete name_prompt; delete name_label; Modified: branches/SpecTcl-3.2-maintenance/Display/marker.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/marker.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/marker.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -377,7 +377,7 @@ /* Class constructors and destructors. */ - AcceptMarker(XMWidget *parent, char *name, char **hlp_text); + AcceptMarker(XMWidget *parent, const char *name, const char **hlp_text); ~AcceptMarker() { if(object != NULL) delete object; delete point; @@ -633,7 +633,7 @@ ** type of marker. ** Formal Parameters: (all passed to parent types). */ -AcceptMarker::AcceptMarker(XMWidget *parent, char *name, char **hlp_text) : +AcceptMarker::AcceptMarker(XMWidget *parent, const char *name, const char **hlp_text) : ObjectInput(parent, name, hlp_text) { /* Build the appropriate graphical object: */ @@ -970,7 +970,7 @@ ** instantiate it now and set up the invariant behavior. */ if(dialog == NULL) { - dialog = new AcceptMarker(wid, const_cast<char*>("Define_Marker"), const_cast<char**>(help_text)); + dialog = new AcceptMarker(wid, "Define_Marker", help_text); dialog->AddOkCallback(&AcceptMarker::Marker_ok, (XtPointer)dialog); dialog->AddCancelCallback(&AcceptMarker::Marker_cancel, (XtPointer)dialog); Modified: branches/SpecTcl-3.2-maintenance/Display/ptlist.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/ptlist.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/ptlist.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -355,10 +355,10 @@ AcceptPointList::AcceptPointList(char *name, XMWidget *parent, int minpts, int maxpts, char **help_text) : - AcceptSummingRegion(name, parent, + AcceptSummingRegion(const_cast<const char*>(name), parent, help_text == NULL ? - const_cast<char**>(default_help) : - help_text) + const_cast<const char**>(default_help) : + const_cast<const char**>(help_text)) { if(minpts > 0) min_pts = minpts; else min_pts = 1; Modified: branches/SpecTcl-3.2-maintenance/Display/sumregion.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/sumregion.cc 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/sumregion.cc 2010-07-13 18:21:51 UTC (rev 1705) @@ -422,8 +422,8 @@ ** char **help_text: ** Pointer to the list of help strings. */ -AcceptSummingRegion::AcceptSummingRegion(char *name, XMWidget *parent, - char **help_text) : +AcceptSummingRegion::AcceptSummingRegion(const char *name, XMWidget *parent, + const char **help_text) : ObjectInput(parent, name, help_text) { /* Build the widgets that will live in the point_prompts form: */ @@ -433,7 +433,7 @@ this); DeleteLast->Label(const_cast<char*>("Delete Last")); NextLabel = new XMLabel(name, *point_prompts, const_cast<char*>("Next Point:")); - NextPoint = new XMTextField(name, *point_prompts); + NextPoint = new XMTextField(const_cast<char*>(name), *point_prompts); object = NULL; /* Null out the object so that Rebuild works. */ @@ -955,8 +955,8 @@ /* If the dialog does not exist, then we build it. */ if(dialog == NULL) { - dialog = new AcceptSummingRegion(const_cast<char*>("Summing region"), - w, const_cast<char**>(help_text)); + dialog = new AcceptSummingRegion("Summing region", + w, help_text); dialog->AddCallback(XtNdestroyCallback, Xamine_DestroyGraphicalInput, (XtPointer)&dialog); dialog->AddCallback(XtNpopdownCallback, Xamine_DestroyGraphicalInput, Modified: branches/SpecTcl-3.2-maintenance/Display/sumregion.h =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/sumregion.h 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/Display/sumregion.h 2010-07-13 18:21:51 UTC (rev 1705) @@ -118,7 +118,7 @@ /* Constructors and destructors: */ - AcceptSummingRegion(char *name, XMWidget *parent, char **help_text = NULL); + AcceptSummingRegion(const char *name, XMWidget *parent, const char **help_text = NULL); virtual ~AcceptSummingRegion(); /* Virtual functions which are pure in the base class: */ Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2010-07-13 18:18:09 UTC (rev 1704) +++ branches/SpecTcl-3.2-maintenance/configure.in 2010-07-13 18:21:51 UTC (rev 1705) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-008) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-009) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2011-11-14 15:47:20
|
Revision: 1901 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1901&view=rev Author: ron-fox Date: 2011-11-14 15:47:13 +0000 (Mon, 14 Nov 2011) Log Message: ----------- Increase the capacity of the guintegrate widget -> 50,000 bytes. Modified Paths: -------------- branches/SpecTcl-3.2-maintenance/CHANGELOG branches/SpecTcl-3.2-maintenance/Display/Xamine.cc branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc branches/SpecTcl-3.2-maintenance/configure.in Modified: branches/SpecTcl-3.2-maintenance/CHANGELOG =================================================================== --- branches/SpecTcl-3.2-maintenance/CHANGELOG 2011-11-07 17:45:10 UTC (rev 1900) +++ branches/SpecTcl-3.2-maintenance/CHANGELOG 2011-11-14 15:47:13 UTC (rev 1901) @@ -864,3 +864,4 @@ saves to fail if there was only one gate defined. 3.2-009 - Fix some memory double deallocation errors found by Coupland. +3.2-010 - Add additionall lines of text to integration widget. \ No newline at end of file Modified: branches/SpecTcl-3.2-maintenance/Display/Xamine.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/Xamine.cc 2011-11-07 17:45:10 UTC (rev 1900) +++ branches/SpecTcl-3.2-maintenance/Display/Xamine.cc 2011-11-14 15:47:13 UTC (rev 1901) @@ -459,6 +459,7 @@ int main(int argc, char **argv) { + printf("Xamine with extra long integration window\n"); XMApplication top("Xamine", reinterpret_cast<Cardinal*>(&argc), argv); /* Top level/init ap. */ Modified: branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc =================================================================== --- branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc 2011-11-07 17:45:10 UTC (rev 1900) +++ branches/SpecTcl-3.2-maintenance/Display/guintegrate.cc 2011-11-14 15:47:13 UTC (rev 1901) @@ -67,7 +67,7 @@ ** Constants: */ #define GAMMA 2.354 /* Number of sigmas in FWHM for Gaussian. */ -#define SCROLL_WINDOW_CHARS 5000 /* Max chars allowed in scrolled window. */ +#define SCROLL_WINDOW_CHARS 50000 /* Max chars allowed in scrolled window. */ /* ** External References: */ Modified: branches/SpecTcl-3.2-maintenance/configure.in =================================================================== --- branches/SpecTcl-3.2-maintenance/configure.in 2011-11-07 17:45:10 UTC (rev 1900) +++ branches/SpecTcl-3.2-maintenance/configure.in 2011-11-14 15:47:13 UTC (rev 1901) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.2-009) +AM_INIT_AUTOMAKE(SpecTcl, 3.2-010) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |