Changeset 1145

Show
Ignore:
Timestamp:
06/26/08 10:45:23 (2 months ago)
Author:
otter
Message:

Fixed #88 (In the diagram layer of Modelica.Blocks.Logical.Hysteresis the
horizontal axis is wrong: time sould be replaced by u)

Location:
branches/maintenance/3.0/Modelica
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/maintenance/3.0/Modelica/Blocks/Logical.mo

    r1046 r1145  
    516516 
    517517    annotation ( 
    518        
    519518      Documentation(info="<html> 
    520519<p>The LogicalSwitch switches, depending on the 
    … …  
    562561          extent={{-100,-100},{100,100}}, 
    563562          grid={2,2}), graphics)); 
     563 
    564564  equation 
    565565    y = if u2 then u1 else u3; 
    … …  
    581581              {{100,-10},{120,10}}, rotation=0))); 
    582582 
    583     annotation (defaultComponentName="switch1" 
    584       , 
     583    annotation (defaultComponentName="switch1", 
    585584      Documentation(info="<html> 
    586585<p>The Logical.Switch switches, depending on the 
    … …  
    663662            extent={{70,-80},{94,-100}}, 
    664663            lineColor={160,160,164}, 
    665             textString="time"), 
     664            textString="u"), 
    666665          Text( 
    667666            extent={{-65,93},{-12,75}}, 
    … …  
    11081107      "Text that will be displayed when simulation is terminated"; 
    11091108    annotation ( 
    1110        
    11111109      Icon(coordinateSystem( 
    11121110          preserveAspectRatio=true, 
    … …  
    11561154  
    11571155</html>")); 
     1156 
    11581157  equation 
    11591158    when condition then 

  • branches/maintenance/3.0/Modelica/package.mo

    r1142 r1145  
    22package Modelica "Modelica Standard Library (Version 3.0)" 
    33extends Icons.Library; 
    4  
     4  
    55 
    66annotation (