fix new eeschema graphic to use extends instead of inherits, design.h update
This commit is contained in:
parent
8d567953d6
commit
1cdf342d3b
28
new/design.h
28
new/design.h
|
@ -104,7 +104,7 @@ BOM can be made simply from the parts_list.</dd>
|
||||||
<dt>Component, again for good measure.</dt><dd>A component is an instantiation
|
<dt>Component, again for good measure.</dt><dd>A component is an instantiation
|
||||||
of a part. A component exists within a schematic which has a parts list
|
of a part. A component exists within a schematic which has a parts list
|
||||||
containing the part from which the component is instantiated. A component has a
|
containing the part from which the component is instantiated. A component has a
|
||||||
unique reference designator, component ref, its own location, orientation,
|
unique reference designator, part ref, its own location, orientation,
|
||||||
stuff/DNS, and text attributes but <b>not</b> its own text fields/strings (other
|
stuff/DNS, and text attributes but <b>not</b> its own text fields/strings (other
|
||||||
than reference designator). The part which is instantiated must exist in the
|
than reference designator). The part which is instantiated must exist in the
|
||||||
parts list of the same schematic.</dd>
|
parts list of the same schematic.</dd>
|
||||||
|
@ -166,7 +166,7 @@ An applicable library table consists of rows from (at least) two sources:<ol>
|
||||||
These rows from the two sources are conceptually concatonated (although they may
|
These rows from the two sources are conceptually concatonated (although they may
|
||||||
not be physically concatonated in the implementation, TBD). The schematic
|
not be physically concatonated in the implementation, TBD). The schematic
|
||||||
resident rows take presedence over the personal library table if there are
|
resident rows take presedence over the personal library table if there are
|
||||||
logicl library names duplicately defined. (Or we will simply ask that any remote
|
logical library names duplicately defined. (Or we will simply ask that any remote
|
||||||
(i.e. public) libraries use uppercase first letters in logical names, TBD.)
|
(i.e. public) libraries use uppercase first letters in logical names, TBD.)
|
||||||
|
|
||||||
<p> Eventually there will be an external publicly available internet based
|
<p> Eventually there will be an external publicly available internet based
|
||||||
|
@ -800,8 +800,10 @@ protected: ///< derived classes must implement
|
||||||
* portion present. If it is not present, and a overwrite of an existhing
|
* portion present. If it is not present, and a overwrite of an existhing
|
||||||
* part is done, then LIB::ReloadPart() must be called on this same part
|
* part is done, then LIB::ReloadPart() must be called on this same part
|
||||||
* and all parts that inherit it must be reparsed.
|
* and all parts that inherit it must be reparsed.
|
||||||
|
* @return STRING - if the LIB_SINK support revision numbering, then return a
|
||||||
|
* evision name that was next in the sequence, e.g. "rev22", else StrEmpty.
|
||||||
*/
|
*/
|
||||||
virtual void WritePart( const STRING& aPartName,
|
virtual STRING WritePart( const STRING& aPartName,
|
||||||
const STRING& aSExpression ) throw( IO_ERROR ) = 0;
|
const STRING& aSExpression ) throw( IO_ERROR ) = 0;
|
||||||
|
|
||||||
|
|
||||||
|
@ -953,17 +955,10 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function WritePart
|
* Function WritePart
|
||||||
* saves the part to non-volatile storage. @a aPartName may have the revision
|
* saves the part to non-volatile storage and returns the next new revision
|
||||||
* portion present. If it is not present, and a overwrite of an existing
|
* name in the sequence established by the LIB_SINK.
|
||||||
* part is done, then all parts that inherit it must be re-parsed.
|
|
||||||
* This is why most library sources are read only. An exception is the PARTS_LIST,
|
|
||||||
* not to be confused with a LIB based on a parts list in another schematic.
|
|
||||||
* The PARTS_LIST is in the the schematic being edited and is by definition the
|
|
||||||
* last to inherit, so editing in the current schematic's PARTS_LIST should be harmless.
|
|
||||||
* There can be some self referential issues that mean all the parts in the PARTS_LIST
|
|
||||||
* have to re-parsed.
|
|
||||||
*/
|
*/
|
||||||
virtual void WritePart( PART* aPart ) throw( IO_ERROR );
|
virtual STRING WritePart( PART* aPart ) throw( IO_ERROR );
|
||||||
|
|
||||||
virtual void SetPartBody( PART* aPart, const STRING& aSExpression ) throw( IO_ERROR );
|
virtual void SetPartBody( PART* aPart, const STRING& aSExpression ) throw( IO_ERROR );
|
||||||
|
|
||||||
|
@ -1008,11 +1003,7 @@ private:
|
||||||
|
|
||||||
STRINGS categories;
|
STRINGS categories;
|
||||||
|
|
||||||
typedef boost::ptr_vector<PART> PARTS;
|
|
||||||
|
|
||||||
PARTS parts;
|
PARTS parts;
|
||||||
|
|
||||||
std::vector<PART*> orderByName;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -1120,7 +1111,8 @@ public:
|
||||||
LIB_TABLE( const STRING& aLibraryTable, LIB_TABLE* aFallBackTable = NULL )
|
LIB_TABLE( const STRING& aLibraryTable, LIB_TABLE* aFallBackTable = NULL )
|
||||||
{
|
{
|
||||||
// s-expression is chosen so we can read a table fragment from either
|
// s-expression is chosen so we can read a table fragment from either
|
||||||
// a schematic or a disk file.
|
// a schematic or a disk file, for schematic resident or
|
||||||
|
// personal table, respectively.
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
BIN
new/drawing.png
BIN
new/drawing.png
Binary file not shown.
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 62 KiB |
|
@ -14,7 +14,10 @@
|
||||||
id="svg2"
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.47 r22583"
|
inkscape:version="0.47 r22583"
|
||||||
sodipodi:docname="drawing.svg">
|
sodipodi:docname="drawing.svg"
|
||||||
|
inkscape:export-filename="/svn/kicad/new_design/new/drawing.png"
|
||||||
|
inkscape:export-xdpi="90"
|
||||||
|
inkscape:export-ydpi="90">
|
||||||
<defs
|
<defs
|
||||||
id="defs4">
|
id="defs4">
|
||||||
<marker
|
<marker
|
||||||
|
@ -109,7 +112,7 @@
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="1.4"
|
inkscape:zoom="1.4"
|
||||||
inkscape:cx="575.26689"
|
inkscape:cx="575.26689"
|
||||||
inkscape:cy="412.44757"
|
inkscape:cy="1269.5904"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="svg2"
|
inkscape:current-layer="svg2"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
|
@ -142,7 +145,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title />
|
<dc:title></dc:title>
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -505,7 +508,7 @@
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4342"
|
id="tspan4342"
|
||||||
x="520.22858"
|
x="520.22858"
|
||||||
y="330.28006">inherits</tspan></text>
|
y="330.28006">extends</tspan></text>
|
||||||
<g
|
<g
|
||||||
id="g3828-4"
|
id="g3828-4"
|
||||||
transform="translate(133.32018,329.60589)">
|
transform="translate(133.32018,329.60589)">
|
||||||
|
@ -602,7 +605,7 @@
|
||||||
y="354.28006"
|
y="354.28006"
|
||||||
x="184.22858"
|
x="184.22858"
|
||||||
id="tspan4776"
|
id="tspan4776"
|
||||||
sodipodi:role="line">inherits</tspan></text>
|
sodipodi:role="line">extends</tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
|
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
|
||||||
|
@ -613,7 +616,7 @@
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4780"
|
id="tspan4780"
|
||||||
x="316.22858"
|
x="316.22858"
|
||||||
y="354.28006">inherits</tspan></text>
|
y="354.28006">extends</tspan></text>
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9)"
|
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9)"
|
||||||
d="m 313.9049,598.53648 0,48.73986 137.63329,0.25254 0.25254,-48.73986"
|
d="m 313.9049,598.53648 0,48.73986 137.63329,0.25254 0.25254,-48.73986"
|
||||||
|
@ -628,7 +631,7 @@
|
||||||
y="664.28003"
|
y="664.28003"
|
||||||
x="348.22858"
|
x="348.22858"
|
||||||
id="tspan4972"
|
id="tspan4972"
|
||||||
sodipodi:role="line">inherits</tspan></text>
|
sodipodi:role="line">extends</tspan></text>
|
||||||
<rect
|
<rect
|
||||||
style="fill:#00bad5;fill-opacity:0.9605735;stroke:#000000;stroke-width:1.10099995;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
style="fill:#00bad5;fill-opacity:0.9605735;stroke:#000000;stroke-width:1.10099995;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||||
id="rect4974"
|
id="rect4974"
|
||||||
|
@ -876,7 +879,7 @@
|
||||||
height="148.57143"
|
height="148.57143"
|
||||||
x="740"
|
x="740"
|
||||||
y="508.38568" /></flowRegion><flowPara
|
y="508.38568" /></flowRegion><flowPara
|
||||||
id="flowPara3954"></flowPara></flowRoot> <text
|
id="flowPara3954" /></flowRoot> <text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
|
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
|
||||||
x="953.57141"
|
x="953.57141"
|
||||||
|
@ -946,14 +949,14 @@
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
|
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
|
||||||
x="756.89563"
|
x="840.89563"
|
||||||
y="219.6189"
|
y="219.6189"
|
||||||
id="text4168"
|
id="text4168"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4170"
|
id="tspan4170"
|
||||||
x="756.89563"
|
x="840.89563"
|
||||||
y="219.6189">PARTS_LIST_LIB_SOURCE</tspan></text>
|
y="219.6189">LIB</tspan></text>
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#000000;stroke-width:1.26530874px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9)"
|
style="fill:none;stroke:#000000;stroke-width:1.26530874px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9)"
|
||||||
d="M 851.17116,365.3959 850.285,225.65964"
|
d="M 851.17116,365.3959 850.285,225.65964"
|
||||||
|
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
Loading…
Reference in New Issue