Thread: [Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl: [1441] trunk/SpecTcl

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 1441
          http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1441&view=rev
Author:   ron-fox
Date:     2007-11-26 11:09:12 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
BZ 327 - Fix those issues.

Modified Paths:
--------------
    trunk/SpecTcl/CHANGELOG
    trunk/SpecTcl/TreeParam/CTreeParameter.cpp
    trunk/SpecTcl/TreeParam/ParameterManipulator.tcl
    trunk/SpecTcl/radware/CRWWrite.cpp

Modified: trunk/SpecTcl/CHANGELOG
===================================================================

--- trunk/SpecTcl/CHANGELOG	2007-11-26 18:45:49 UTC (rev 1440)
+++ trunk/SpecTcl/CHANGELOG	2007-11-26 19:09:12 UTC (rev 1441)
@@ -717,4 +717,6 @@
                  - added version specific daq locations to search path for
                    spectcldaq (gui).
 
-November 6, 2007 - Convert to svn repository
\ No newline at end of file
+November  6, 2007 - Convert to svn repository
+November 26, 2007 - BZ 327 - Fix multicolored monster problems with changing spectra
+                    in resopnse to tree parameter range changes.
\ No newline at end of file

Modified: trunk/SpecTcl/TreeParam/CTreeParameter.cpp
===================================================================
--- trunk/SpecTcl/TreeParam/CTreeParameter.cpp	2007-11-26 18:45:49 UTC (rev 1440)
+++ trunk/SpecTcl/TreeParam/CTreeParameter.cpp	2007-11-26 19:09:12 UTC (rev 1441)
@@ -935,7 +935,7 @@
 void
 CTreeParameter::setUnit(string units)
 {
-  m_sUnits = units;
+  m_sUnits = units.c_str();	// Force a copy to prevent string pooling.
   m_fDefinitionChanged = true;
 }
 

Modified: trunk/SpecTcl/TreeParam/ParameterManipulator.tcl
===================================================================
--- trunk/SpecTcl/TreeParam/ParameterManipulator.tcl	2007-11-26 18:45:49 UTC (rev 1440)
+++ trunk/SpecTcl/TreeParam/ParameterManipulator.tcl	2007-11-26 19:09:12 UTC (rev 1441)
@@ -1,7 +1,8 @@
 # (C) Copyright Michigan State University 2019, All rights reserved 
 # ParameterManipulator.tcl
-# Author: D. Bazin
-# Date: July 2001 - Modified September 2002
+# Author: D. Bazin, R. Fox
+# Date: July 2001 - see svn revision history for full modification history.
+#
 # Version 1.2 - November 2003
 
 proc SetupParameterManipulator {parent} {
@@ -26,7 +27,6 @@
 	label $mod.labelname -text Name -background $modcolor
 	label $mod.labelstart -text Low -background $modcolor
 	label $mod.labelstop -text High -background $modcolor
-#	label $mod.labelinc -text Increment -background $modcolor
 	label $mod.labelunit -text Unit -background $modcolor
 	checkbutton $mod.array -text "Array" -variable parameter(Array) -background $modcolor
 	grid $mod.parameter $mod.labelname $mod.labelstart $mod.labelstop $mod.labelunit x $mod.array - -sticky news
@@ -52,14 +52,10 @@
 	set modcolor lightblue
 	set mod $topp.modify
 
-#	menubutton $mod.parameter$id -width 8 -text Parameter -background $modcolor
-#	GenerateTreeMenu $mod.parameter$id "MenuLoadParameter $id"
-#	GenerateTreeMenu $mod.parameter$id "set parameter(Name$id)"
 	radiobutton $mod.select$id -width 8 -text "" -variable parameter(select) -value $id -bg $modcolor
 	entry $mod.labelparameter$id -textvariable parameter(Name$id) -background $modcolor
 	entry $mod.start$id -width 8 -textvariable parameter(Start$id) -background $modcolor
 	entry $mod.stop$id -width 8 -textvariable parameter(Stop$id) -background $modcolor
-#	entry $mod.inc$id -width 8 -textvariable parameter(Inc$id) -background $modcolor
 	entry $mod.unit$id -width 6 -textvariable parameter(Unit$id) -background $modcolor
 	button $mod.set$id -text Set -command "SetParameter $id" -background $modcolor
 	button $mod.load$id -text Load -command "LoadParameter $id" -background $modcolor
@@ -67,23 +63,9 @@
 	grid $mod.select$id $mod.labelparameter$id $mod.start$id $mod.stop$id $mod.unit$id \
 	$mod.load$id $mod.set$id $mod.change$id -sticky news
 
-#	trace variable parameter(Start$id) w "SetParameterStopInc $id"
-#	trace variable parameter(Stop$id) w "SetParameterStopInc $id"
-#	trace variable parameter(Inc$id) w "SetParameterStopInc $id"
+
 }
 
-#proc SetParameterStopInc {id name1 name2 op} {
-#	global topp parameter
-#	if {[string equal [focus -displayof $topp] $topp.modify$id.stop]} {
-#		set parameter(Inc$id) [expr ($parameter(Stop$id) - $parameter(Start$id)) / ($parameter(Bins$id) - 1.0)]
-#	} elseif {[string equal [focus -displayof $topp] $topp.modify$id.start]} {
-#		set parameter(Inc$id) [expr ($parameter(Stop$id) - $parameter(Start$id)) / ($parameter(Bins$id) - 1.0)]
-#	} elseif {[string equal [focus -displayof $topp] $topp.modify$id.inc]} {
-#		set parameter(Stop$id) [expr $parameter(Start$id) + $parameter(Inc$id) * ($parameter(Bins$id) - 1.0)]
-#	} elseif {[string equal [focus -displayof $topp] $topp.modify$id.bins]} {
-#		set parameter(Inc$id) [expr ($parameter(Stop$id) - $parameter(Start$id)) / ($parameter(Bins$id) - 1.0)]
-#	}
-#}
 
 proc SetParameter {id} {
 	global parameter
@@ -93,8 +75,8 @@
 	global spectrumLowY spectrumHighY spectrumBinsY spectrumUnitY
 	if {$parameter(Array) && [IsParameterArray $id]} {
 		foreach p [ListParameterArray $id] {
-			treeparameter -setunit $p $parameter(Unit$id)
-			treeparameter -setlimits $p $parameter(Start$id) $parameter(Stop$id)
+		    treeparameter -setunit $p $parameter(Unit$id)
+		    treeparameter -setlimits $p $parameter(Start$id) $parameter(Stop$id)
 		}
 		UpdateTreeParameters
 	} else {
@@ -102,17 +84,14 @@
 		treeparameter -setlimits $parameter(Name$id) $parameter(Start$id) $parameter(Stop$id)
 		UpdateTreeParameter $parameter(Name$id)
 	}
-#	set spectrumInfoX [GetParameterInfo $spectrumParameterX]
-#	set spectrumInfoY [GetParameterInfo $spectrumParameterY]
 	set spectrumLowX [GetParameterLow $spectrumParameterX]
 	set spectrumHighX [GetParameterHigh $spectrumParameterX]
-#	set spectrumBinsX [GetParameterBins $spectrumParameterX]
 	set spectrumUnitX [GetParameterUnit $spectrumParameterX]
 	set spectrumLowY [GetParameterLow $spectrumParameterY]
 	set spectrumHighY [GetParameterHigh $spectrumParameterY]
 	set spectrumBinsY [GetParameterBins $spectrumParameterY]
 	set spectrumUnitY [GetParameterUnit $spectrumParameterY]
-	Modified
+ 	Modified
 }
 
 proc IsParameterArray {id} {
@@ -136,64 +115,221 @@
 	}
 	return $pList
 }
+#
+# changeAxisLimits
+#   Given a spectrum axis definition (could be more than one axis def
+#   modifes one of the axis definitions to have a new low/high value.
+#
+# Parameters:
+#    axes     - Old axis definitions.
+#    which    - Which axis to change.
+#    low      - new low value
+#    high     - new high value
+# Returns:
+#    new axis definitions.
+#
+proc changeAxisLimits {axes which low high} {
+    set axis [lindex $axes $which]
+    set axis [lreplace $axis 0 1 $low $high]
+    set axes [lreplace $axes $which $which $axis]
 
+    return $axes
+}
+
+#
+#  Change the definition of a spectrum after a dependent parameter
+#  has been modified.  What this should mean is that for every parameter
+#  that has been modified (remember you can modify an array of parameters),
+#  Spectra that depend on at least one of those parameters will be re-created
+#  with axis specifications for the modified parameters modifed to reflect the
+#  parameter's new low/high limits (same number of channels as before I'm presuming).
+#
+#  Parameters:
+#    id    - The id of the parameter that has been modified.
+#  Implicit inputs:
+#    SpecTcl parameter list,
+#    parameter(Array) is true if the array checkbox is lit indicating
+#                     the base of the parameter should be treated as an
+#                     array for which all parameters must be changed.
+#
 proc ChangeSpectra {id} {
-	global parameter
-	set theList [spectrum -list]
-	set sList ""
-	set nList ""
-	foreach s $theList {
-		set sName [lindex $s 1]
-		set parList [lindex $s 3]
-		if {$parameter(Array) && [IsParameterArray $id]} {
-			foreach p [ListParameterArray $id] {
-				if {[lsearch $parList $p] != -1} {
-					lappend sList $sName
-					lappend nList [lsearch $parList $p]
-					break
-				}
+    global parameter
+    set theList [spectrum -list]
+    set sList ""
+    set nList ""
+    # Create the list of parameters that will be modified:
+    #
+    
+    if {$parameter(Array) && [IsParameterArray $id]} {
+	set parameterList [ListParameterArray $id]
+    } else {
+	set parameterList $parameter(Name$id)
+    }
+    foreach s $theList {
+	set sName [lindex $s 1]
+	set parList [lindex $s 3]
+	foreach p $parameterList {
+	    if {[lsearch $parList $p] != -1} {
+		lappend sList $sName
+		break
+	    }
+	}
+    }
+
+    
+    # 
+    #  At this point, slist is the list of spectra that will be changed if the
+    #  user confirms.
+    
+    
+    set response [tk_messageBox -icon warning -type yesno -parent .gui\
+		      -message "The following spectra will be erased and replaced:\n$sList\nDo you wish to continue?"]
+    if {[string equal $response no]} {
+	return
+    }
+    
+    # Iterate through sList and modify each spectrum according to the type
+    # and set of parameters that match.
+    # There are several sorts of spectra:
+    #   Spectra for which the parameter index indicates the axis index to modify
+    #  (1-d, 2-d)
+    #  Spectra that don't get modified at all:
+    #    Currently only the strip chart.
+    #  Spectra where if there is any parameter match, all axes are modified:
+    #   g1, g2, s
+    #  Spectra that have to be handled specially:
+    #   m2, gd, b
+    #
+
+    foreach spectrum $sList {
+	set definition [lindex [spectrum -list $spectrum] 0];
+	set name       [lindex $definition 1]
+	set type       [lindex $definition 2]
+	set parameters [lindex $definition 3]
+	set axes       [lindex $definition 4]
+	set dataType   [lindex $definition 5]
+
+	switch -exact --  $type {
+	    1 - 2 {
+		# The index of the parameter match defines which axis is modified.
+                # both axes could conceivably change!
+		foreach p $parameterList {
+		    set which [lsearch -exact $parameters $p]
+		    if {$which >= 0} {
+			set parameterDef [lindex [treeparameter -list $p] 0]
+			set low [lindex $parameterDef 2]
+			set high [lindex $parameterDef 3]
+			set axes [changeAxisLimits $axes $which $low $high]
+
+		    }
+		}
+	    }
+	    g1 - g2 - s {
+		# For the first match, all axes are changed.
+		# all axes will change, first match is ok because if its an array parameter set,
+		# all parmeters will get the same limits
+		#
+		set axisCount [llength $axes]
+		foreach p $parameterList {
+		    set which [lsearch -exact $parameters $p]
+		    if {$which >= 0} {
+			set parameterDef [lindex [treeparameter -list $p] 0]
+			set low          [lindex $parameterDef 2]
+			set high         [lindex $parameterDef 3]
+
+			# Change all axes:
+
+			for {set i 0} {$i < $axisCount} {incr i} {
+			    set axes [changeAxisLimits $axes $i $low $high]
 			}
-		} else {
-			if {[lsearch $parList $parameter(Name$id)] != -1} {
-				lappend sList $sName
-				lappend nList [lsearch $parList $parameter(Name$id)]
-			}
+			break
+		    }
 		}
-	}
-	set response [tk_messageBox -icon warning -type yesno -parent .gui\
-	-message "The following spectra will be erased and replaced:\n$sList\nDo you wish to continue?"]
-	if {[string equal $response no]} {
-		return
-	}
-	SetParameter $id
-	set index 0
-	foreach s $sList {
-		set ss [spectrum -list $s]
-		set sType [lindex $ss 2]
-		set sParam [lindex $ss 3]
-		set sReso [lindex $ss 4]
-		set sData [lindex $ss 5]
-		set sNew ""
-		for {set i 0} {$i < [llength $sReso]} {incr i} {
-			if {$i == [lindex $nList $index]} {
-				set bins [lindex [lindex $sReso $i] 2]
-				lappend sNew [list $parameter(Start$id) $parameter(Stop$id) $bins]
+	    }
+	    m2 {
+		# The parameter list are x/y pairs.  Therefore
+		# we go for all matches, even matches modify the x axis
+		# odd matches the y.
+
+		foreach p $parameterList {
+		    set which [lsearch -exact $parameters $p]
+		    if {$which >= 0} {
+			set axis [expr {$which % 2}];   # 0 or 1...
+			set parameterDef [lindex [treeparameter -list $p] 0]
+			set low          [lindex $parameterDef 2]
+			set high         [lindex $parameterDef 3]
+			set axes         [changeAxisLimits $axes $axis $low $high]
+		    }
+		}
+	    }
+	    gd {
+		# Gamma deluxe:  This has two lists of parameters.
+		# matches in the first list change x.
+		# matches in the second list change y.
+
+		set xParameters [lindex $parameters 0]
+		set yParameters [lindex $parameters 1]
+		foreach p $parameterList {
+		    set which [lsearch -exact $xParameters $p]
+		    if {$which >= 0} {
+			set parameterDef [lindex [treeparameter -list $p] 0]
+			set low          [lindex $parameterDef 2]
+			set high         [lindex $parameterDef 3]
+			set axes         [changeAxisLimits $axes 0 $low $high]
+		    }
+
+		    set which [lsearch -exact $yParameters $p]
+		    if {$which >= 0} {
+			set parameterDef [lindex [treeparameter -list $p] 0]
+			set low          [lindex $parameterDef 2]
+			set high         [lindex $parameterDef 3]
+			set axes         [changeAxisLimits $axes 1 $low $high]
+		    }
+
+		}
+	    }
+	    b {
+		# Bitmask spectrum.  The low/high are determined by the
+		# log2 of the low/high values.. e.g. 
+		# a range of 4 - 32 gives a spectrum range of
+		# 2-5   can't take the log of <= 0, those are mapped to 0.
+		#
+		# we use log2(x) = loge(x)/loge(2)
+		# non integer weirdness is truncated on the low end and incremented on the high end
+		#
+		foreach p $parameterList {
+		    set which [lsearch -exact $parameters $p]
+		    if {$which == 0} {
+			set parameterDef [lindex [treeparameter -list $p] 0]
+			set low          [lindex $parameterDef 2]
+			set high         [lindex $parameterDef 3]
+			if {$low <= 0} {
+			    set low 0
 			} else {
-				lappend sNew [lindex $sReso $i]
+			    set low [expr {int(log($low)/log(2))}]
 			}
+			if {$high <= 0} {
+			    set high 0
+			} else {
+			    set high [expr {int(ceil(log($high)/log(2)))}]
+			}
+			set axes [changeAxisLimits $axes 0 $low $high]
+			break
+		    }
 		}
-		set gate [lindex [lindex [lindex [apply -list $s] 0] 1] 0]
-		spectrum -delete $s
-		spectrum $s $sType $sParam $sNew $sData
-		if {![string equal $gate -TRUE-]} {
-			apply $gate $s
-		}
-		puts "Spectrum $s replaced"
-		incr index
+	    }
 	}
-	UpdateSpectrumList
-	sbind -all
-	Modified
+	# Set the new spectrum definition:
+
+	spectrum -delete $name
+	spectrum $name $type $parameters $axes $dataType
+
+    }
+    
+    
+    UpdateSpectrumList
+    sbind -all
+    Modified
 }
 
 proc LoadParameter {id} {
@@ -219,15 +355,3 @@
 	set parameter(Unit$id) [lindex $p 5]
 }
 
-#proc MenuLoadParameter {id par} {
-#	global parameter
-#	set p [lindex [treeparameter -list $par] 0]
-#	set parameter(Name$id) [lindex $p 0]
-#	set parameter(Start$id) [lindex $p 2]
-#	set parameter(Stop$id) [lindex $p 3]
-#	set parameter(Unit$id) [lindex $p 5]
-#}
-
-#proc GeneratePseudoParameter {parameter} {
-#	puts $parameter
-#}

Modified: trunk/SpecTcl/radware/CRWWrite.cpp
===================================================================
--- trunk/SpecTcl/radware/CRWWrite.cpp	2007-11-26 18:45:49 UTC (rev 1440)
+++ trunk/SpecTcl/radware/CRWWrite.cpp	2007-11-26 19:09:12 UTC (rev 1441)
@@ -32,7 +32,7 @@
    Instantiate us... our command will just be rwwrite.
 */
 CRWWrite::CRWWrite(CTCLInterpreter& interp) :
-  CTCLObjectProcessor(interp, string("rwwrite"))
+  CTCLObjectProcessor(interp, string("RDWwrite"))
 {}
 
 /*!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl: [1441] trunk/SpecTcl

nsclspectcl-cvscommits