Changeset 920

Show
Ignore:
Timestamp:
12/11/2007 05:16:21 AM (13 months ago)
Author:
otter
Message:

Introduced ObsoleteModelica3.Icons.ObsoleteBlock and blocks inherit from
Icons.ObsoleteBlock and models from Icons.ObsoleteModel

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Modelica/trunk/ObsoleteModelica3.mo

    r919 r920  
    1010      model AdaptorReal 
    1111          "Completely obsolete adaptor between 'old' and 'new' Real signal connectors (only for backward compatibility)" 
    12         extends ObsoleteModelica3.Icons.ObsoleteModel; 
     12        extends ObsoleteModelica3.Icons.ObsoleteBlock; 
    1313        Modelica.Blocks.Interfaces.RealSignal newReal 
    1414            "Connector of Modelica version 2.1"                annotation (                            Hide=true, 
    … …  
    6363      model AdaptorBoolean 
    6464          "Completely obsolete adaptor between 'old' and 'new' Boolean signal connectors (only for backward compatibility)" 
    65         extends ObsoleteModelica3.Icons.ObsoleteModel; 
     65        extends ObsoleteModelica3.Icons.ObsoleteBlock; 
    6666        Modelica.Blocks.Interfaces.BooleanSignal newBoolean 
    6767            "Connector of Modelica version 2.1"  
    … …  
    117117      model AdaptorInteger 
    118118          "Completely obsolete adaptor between 'old' and 'new' Integer signal connectors (only for backward compatibility)" 
    119         extends ObsoleteModelica3.Icons.ObsoleteModel; 
     119        extends ObsoleteModelica3.Icons.ObsoleteBlock; 
    120120        Modelica.Blocks.Interfaces.IntegerSignal newInteger 
    121121            "Connector of Modelica version 2.1"  
    … …  
    184184</html>")); 
    185185          extends ConversionBlock; 
    186           extends ObsoleteModelica3.Icons.ObsoleteModel; 
     186          extends ObsoleteModelica3.Icons.ObsoleteBlock; 
    187187 
    188188          annotation ( 
    … …  
    218218        "Change causality of input signals by defining that two input signals are identical (e.g. for inverse models)" 
    219219        extends Modelica.Blocks.Interfaces.BlockIcon; 
    220         extends ObsoleteModelica3.Icons.ObsoleteModel; 
     220        extends ObsoleteModelica3.Icons.ObsoleteBlock; 
    221221            annotation(structurallyIncomplete, 
    222222              Window( 
    … …  
    258258        "Change causality of output signals by defining that two output signals are identical (e.g. for inverse models)" 
    259259            extends Modelica.Blocks.Interfaces.BlockIcon; 
    260             extends ObsoleteModelica3.Icons.ObsoleteModel; 
     260            extends ObsoleteModelica3.Icons.ObsoleteBlock; 
    261261            annotation(structurallyIncomplete, 
    262262              Window( 
    … …  
    423423 
    424424  package Icons 
     425    partial block ObsoleteBlock "Icon for an obsolete model" 
     426 
     427      annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, 
     428                -100},{100,100}}), graphics={Rectangle( 
     429              extent={{-102,102},{102,-102}}, 
     430              lineColor={255,0,0}, 
     431              pattern=LinePattern.Dash, 
     432              lineThickness=2)}),        Documentation(info="<html> 
     433<p> 
     434This partial class is intended to design a <em>default icon 
     435for an obsolete class</em> that will be removed from the 
     436PowerTrain library later on. 
     437<p> 
     438</html>", 
     439        revisions="<html> 
     440<img src=\"../Extras/Images/dlr_logo.png\"  width=60 > 
     441 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
     442 <b>      Copyright &copy; 1999-2007, DLR Institute of Robotics and Mechatronics</b> 
     443</html>")); 
     444    equation 
     445 
     446    end ObsoleteBlock; 
     447 
    425448    partial model ObsoleteModel "Icon for an obsolete model" 
    426449 
    … …  
    27052728                fillColor={192,192,192}), 
    27062729              Polygon( 
    2707                 points={{-60,10},{-60,20},{-40,40},{-40,-40},{-60,-20},{-60,10}},  
    2708  
     2730                points={{-60,10},{-60,20},{-40,40},{-40,-40},{-60,-20},{-60,10}}, 
    27092731                lineColor={0,0,0}, 
    27102732                fillPattern=FillPattern.HorizontalCylinder,