Changeset 3827


Ignore:
Timestamp:
Jul 19, 2013 12:39:01 AM (9 years ago)
Author:
ldelgass
Message:

Merge mmc's fixes from r3770 in the trunk

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunk (added)merged: 3770
  • branches/1.3/examples/zoo/periodicelement/tool.xml

    r1631 r3827  
    11<?xml version="1.0"?>
    22<run>
    3  <tool>
    4   <about>Press Simulate to view results.</about>
    5   <command>tclsh @tool/test.tcl @driver</command>
    6  </tool>
    7  <input>
    8   <periodicelement id="first">
    9    <about>
    10     <label>First Element</label>
    11     <description>Select the first element.</description>
    12    </about>
    13    <default>As</default>
    14   </periodicelement>
    15   <periodicelement id="second">
    16    <about>
    17     <label>Second Element</label>
    18     <description>Select the second element.</description>
    19    </about>
    20    <default>O</default>
    21    <inactive>lanthanoid actinoid</inactive>
    22    <returnvalue>symbol</returnvalue>
    23   </periodicelement>
    24   <periodicelement id="third">
    25    <about>
    26     <label>Third Element</label>
    27     <description>Select the third element.</description>
    28    </about>
    29    <default>C</default>
    30    <active>other-non-metal</active>
    31    <returnvalue>weight</returnvalue>
    32   </periodicelement>
    33  </input>
     3    <tool>
     4        <about>Press Simulate to view results.</about>
     5        <command>tclsh @tool/test.tcl @driver</command>
     6    </tool>
     7    <input>
     8        <periodicelement id="first">
     9            <about>
     10                <label>First Element</label>
     11                <description>Select the first element.</description>
     12            </about>
     13            <default>As</default>
     14            <returnvalue>name</returnvalue>
     15        </periodicelement>
     16        <periodicelement id="second">
     17            <about>
     18                <label>Second Element</label>
     19                <description>Select the second element.</description>
     20            </about>
     21            <default>Oxygen</default>
     22            <returnvalue>name symbol number weight</returnvalue>
     23            <inactive>actinoid lanthanoid</inactive>
     24        </periodicelement>
     25        <periodicelement id="third">
     26            <about>
     27                <label>Third Element</label>
     28                <description>Select the third element.</description>
     29            </about>
     30            <default>Carbon</default>
     31            <returnvalue>weight</returnvalue>
     32            <active>other-non-metal</active>
     33        </periodicelement>
     34    </input>
    3435</run>
  • branches/1.3/gui/scripts/resultset.tcl

    r3330 r3827  
    248248            set irun [lindex [$_results find -format xmlobj $which] 0]
    249249            if {$irun ne ""} {
    250                 set val [$_results get -format $col $irun]
     250                set val [lindex [$_results get -format $col $irun] 0]
    251251                array set val2norm $rlist
    252252                if {[info exists val2norm($val)]} {
  • branches/1.3/lang/tcl/scripts/objects/boolean/boolean.rp

    r3177 r3827  
    5656        if {$_val && !$_val2} {
    5757            return 1
    58         } elseif {!$_val && $_val} {
     58        } elseif {!$_val && $_val2} {
    5959            return -1
    6060        }
Note: See TracChangeset for help on using the changeset viewer.