Index: trunk/doc/design/02_data.html =================================================================== --- trunk/doc/design/02_data.html (revision 183) +++ trunk/doc/design/02_data.html (revision 184) @@ -49,8 +49,11 @@

{des2:69} Note 1: concrete object attributes can affect the abstract model by making connections and creating new networks. +

{des2:73} Note 2: a connection drawing primitive contributes to the +"list of terminals" of wire-nets and bus-nets. +

2.2. Abstract: schematics objects

{des2:6} Index: trunk/doc/design/02_graphical.svg =================================================================== --- trunk/doc/design/02_graphical.svg (revision 183) +++ trunk/doc/design/02_graphical.svg (revision 184) @@ -4,218 +4,369 @@ - - + + g - + cluster_0 - -graphical schematics sheet + +graphical schematics sheet -cluster_1 - -abstract model +cluster_01 + +drawing primitives +(chapter 3) -cluster_2 - -real world -example: PCB +cluster_02 + +concrete model +(chapter2) +cluster_1 + +abstract model +(chapter 2) + +cluster_2 + +real world +example: PCB + + +at1 + +"bus-segment": +atoms, e.g. lines + + +gr1 + +group +role=bus-net + + +at1->gr1 + + + + +at2 + +"wire-segment": +atoms, e.g. lines + + +gr2 + +group +role=wire-net + + +at2->gr2 + + + + +at3 + +atoms +and groups + + +gr3 + +group +role=symbol + + +at3->gr3 + + + + +at4 + +atoms +e.g. lines + + +gr4 + +group +role=bus_terminal + + +at4->gr4 + + + + +at5 + +atoms +e.g. lines + + +gr5 + +group +role=terminal + + +at5->gr5 + + + + +at6 + +atoms +e.g. arc, polygon + + +gr6 + +group +role=hub_point + + +at6->gr6 + + + + +at7 + +connection gfx +e.g. arc, polygon + + +connection + +connection + + +at7->connection + + + + +bus_net + +bus-net + + +gr1->bus_net + + + + +wire_net + +wire-net + + +gr2->wire_net + + + -symbol - -symbol +symbol + +symbol + +gr3->symbol + + + + +bus_terminal + +bus-terminal + + +gr4->bus_terminal + + + + +terminal + +terminal + + +gr5->terminal + + + + +hub_point + +hub-point + + +gr6->hub_point + + + + +connection->wire_net + + +Note 2 + + +connection->bus_net + + +Note 2 + -component - -component +component + +component -symbol->component - - +symbol->component + + - -terminal - -terminal - -port - -port +port + +port -terminal->port - - +terminal->port + + - -bus_terminal - -bus-terminal - -bus_port - -bus-port +bus_port + +bus-port -bus_terminal->bus_port - - +bus_terminal->bus_port + + - -wire_segment - -wire-segment - - -wire_net - -wire-net - - -wire_segment->wire_net - - - -network - -network +network + +network -wire_net->network - - +wire_net->network + + - -hub_point - -hub-point - -hub - -hub +hub + +hub -hub_point->hub - - +hub_point->hub + + - -bus_segment - -bus-segment - - -bus_net - -bus-net - - -bus_segment->bus_net - - - -bus - -bus +bus + +bus -bus_net->bus - - +bus_net->bus + + -attribute - -attribute -of wire-nets, bus-nets, symbols, - hubs and terminals +attribute + +attribute +of wire-nets, bus-nets, symbols, + hubs and terminals -attribute->network - - -Note 1 +attribute->network + + +Note 1 -pcb_net - -copper tracks -copper polygons +pcb_net + +copper tracks +copper polygons -network->pcb_net - - +network->pcb_net + + -bus->pcb_net - - +bus->pcb_net + + -pcb_pair - -copper tracks/polygons with -constraints (e.g. diff pair) +pcb_pair + +copper tracks/polygons with +constraints (e.g. diff pair) -bus->pcb_pair - - +bus->pcb_pair + + -pcb_component - -component +pcb_component + +component -component->pcb_component - - +component->pcb_component + + -pcb_pin - -pin or pad -of a -component +pcb_pin + +pin or pad +of a +component -port->pcb_pin - - +port->pcb_pin + + -bus_port->pcb_pin - - +bus_port->pcb_pin + + -hub->pcb_net - - +hub->pcb_net + + -pcb_hub - -specific point on copper -with geometry constraints -(e.g. star point gnd) +pcb_hub + +specific point on copper +with geometry constraints +(e.g. star point gnd) -hub->pcb_hub - - +hub->pcb_hub + + Index: trunk/doc/design/src/02_graphical.dot =================================================================== --- trunk/doc/design/src/02_graphical.dot (revision 183) +++ trunk/doc/design/src/02_graphical.dot (revision 184) @@ -2,19 +2,42 @@ rankdir=LR subgraph cluster_0 { label="graphical schematics sheet" - symbol - terminal - bus_terminal [label="bus-terminal"] - wire_segment [label="wire-segment"] - wire_net [label="wire-net"] - hub_point [label="hub-point"] - bus_segment [label="bus-segment"] - bus_net [label="bus-net"] - attribute [label="attribute\nof wire-nets, bus-nets, symbols,\n hubs and terminals" shape=octagon] + + subgraph cluster_01 { + label="drawing primitives\n(chapter 3)" + + at1 [label="\"bus-segment\":\natoms, e.g. lines"] + at2 [label="\"wire-segment\":\natoms, e.g. lines"] + at3 [label="atoms\nand groups"] + at4 [label="atoms\ne.g. lines"] + at5 [label="atoms\ne.g. lines"] + at6 [label="atoms\ne.g. arc, polygon"] + at7 [label="connection gfx\ne.g. arc, polygon"] + + gr1 [label="group\nrole=bus-net"] + gr2 [label="group\nrole=wire-net"] + gr3 [label="group\nrole=symbol"] + gr4 [label="group\nrole=bus_terminal"] + gr5 [label="group\nrole=terminal"] + gr6 [label="group\nrole=hub_point"] + + connection + } + + subgraph cluster_02 { + label="concrete model\n(chapter2)" + symbol + terminal + bus_terminal [label="bus-terminal"] + wire_net [label="wire-net"] + hub_point [label="hub-point"] + bus_net [label="bus-net"] + attribute [label="attribute\nof wire-nets, bus-nets, symbols,\n hubs and terminals" shape=octagon] + } } subgraph cluster_1 { - label="abstract model" + label="abstract model\n(chapter 2)" network [shape=box height=1.875] bus [shape=box] @@ -34,9 +57,24 @@ pcb_hub [label="specific point on copper\nwith geometry constraints\n(e.g. star point gnd)"] } - wire_segment -> wire_net - bus_segment -> bus_net + at1 -> gr1 + at2 -> gr2 + at3 -> gr3 + at4 -> gr4 + at5 -> gr5 + at6 -> gr6 + at7 -> connection [dir=back] + connection -> wire_net [label="Note 2" weight=20] + connection -> bus_net [label="Note 2" weight=20] + + gr1 -> bus_net + gr2 -> wire_net + gr3 -> symbol + gr4 -> bus_terminal + gr5 -> terminal + gr6 -> hub_point + symbol -> component terminal -> port bus_terminal -> bus_port @@ -56,4 +94,5 @@ hub -> pcb_hub bus_port-> pcb_component [style=invis] + }