fix drawn and freemind test

This commit is contained in:
Claudio Barril 2014-08-30 22:42:28 -03:00
parent 4641c3cc5a
commit 3c9573c93e
12 changed files with 215 additions and 192 deletions

View File

@ -33,9 +33,7 @@ import com.wisemapping.jaxb.wisemap.Link;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jsoup.Jsoup;
import org.jsoup.nodes.*;
import org.jsoup.nodes.Document;
import org.w3c.dom.*;
import org.w3c.dom.Element;
import javax.xml.bind.JAXBException;
@ -61,6 +59,7 @@ public class FreemindImporter
public static final String NODE_TYPE = "NODE";
private com.wisemapping.jaxb.wisemap.ObjectFactory mindmapObjectFactory;
private static final String POSITION_LEFT = "left";
private static final String POSITION_RIGHT = "right";
private static final String BOLD = "bold";
private static final String ITALIC = "italic";
private static final String EMPTY_NOTE = "";
@ -249,7 +248,7 @@ public class FreemindImporter
if (depth != 1) {
norder = order++;
} else {
if (freeChild.getPOSITION().equals(POSITION_LEFT)) {
if (freeChild.getPOSITION() != null && freeChild.getPOSITION().equals(POSITION_LEFT)) {
norder = firstLevelLeftOrder;
firstLevelLeftOrder = firstLevelLeftOrder + 2;
} else {
@ -260,8 +259,8 @@ public class FreemindImporter
wiseChild.setOrder(norder);
// Convert node position
int childrenCount = freeChilden.size();
final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
int childrenCountSameSide = getChildrenCountSameSide(freeChilden, freeChild);
final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCountSameSide);
wiseChild.setPosition(position);
// Convert the rest of the node properties ...
@ -351,6 +350,30 @@ public class FreemindImporter
}
}
private int getChildrenCountSameSide(@NotNull List<Object> freeChildren, Node freeChild) {
int result = 0;
String childSide = freeChild.getPOSITION();
if (childSide == null) {
childSide = POSITION_RIGHT;
}
// Count all the nodes of the same side ...
for (Object child : freeChildren) {
if (child instanceof Node) {
Node node = (Node) child;
String side = node.getPOSITION();
if (side == null) {
side = POSITION_RIGHT;
}
if (childSide.equals(side)) {
result++;
}
}
}
return result;
}
/**
* Position is (x,y).
* x values greater than 0 are right axis
@ -384,10 +407,10 @@ public class FreemindImporter
// pair order numbers represent nodes at the right
// odd order numbers represent nodes at the left
if (order % 2 == 0) {
int multiplier = (int) ((order - Math.floor((childrenCount - 1) / 2)) * 2);
int multiplier = ((order + 1) - childrenCount) * 2;
y = multiplier * ROOT_LEVEL_TOPIC_HEIGHT;
} else {
int multiplier = (int) ((order - Math.floor(childrenCount / 2)) * 2);
int multiplier = (order - childrenCount) * 2;
y = multiplier * ROOT_LEVEL_TOPIC_HEIGHT;
}
} else {

View File

@ -2,27 +2,27 @@
<map name="basic" version="tango">
<topic central="true" id="0" position="0,0" shape="rounded rectagle">
<text><![CDATA[This is the root node]]></text>
<topic id="1" order="0" position="200,0" shape="line">
<topic id="1" order="0" position="200,-50" shape="line">
<text><![CDATA[Child Level 1 Right 1]]></text>
</topic>
<topic id="2" order="0" position="-200,0" shape="line">
<topic id="2" order="1" position="-200,-50" shape="line">
<text><![CDATA[Child Level 1 Left 1]]></text>
<topic id="3" order="0" position="-290,-25" shape="line">
<topic id="3" order="0" position="-290,-75" shape="line">
<text><![CDATA[Child Level 2 Left 11]]></text>
</topic>
<topic id="4" order="1" position="-290,0" shape="line">
<topic id="4" order="1" position="-290,-50" shape="line">
<text><![CDATA[Child Level 2 Left 12]]></text>
</topic>
</topic>
<topic id="5" order="4" position="200,100" shape="line">
<topic id="5" order="2" position="200,50" shape="line">
<text><![CDATA[Child Level 1 Right 2]]></text>
</topic>
<topic id="6" order="4" position="-200,100" shape="line">
<topic id="6" order="3" position="-200,50" shape="line">
<text><![CDATA[Child Level 1 Left 2]]></text>
<topic id="7" order="0" position="-290,75" shape="line">
<topic id="7" order="0" position="-290,25" shape="line">
<text><![CDATA[Child Level 2 Left 21 ]]></text>
</topic>
<topic id="8" order="1" position="-290,100" shape="line">
<topic id="8" order="1" position="-290,50" shape="line">
<text><![CDATA[Child Level 2 Left 22]]></text>
</topic>
</topic>

View File

@ -2,141 +2,141 @@
<map name="basic" version="tango">
<topic central="true" id="0" position="0,0" shape="rounded rectagle">
<text><![CDATA[Baugruppe :: Systemanforderungen]]></text>
<topic id="1" order="3" position="200,-100" shape="line">
<topic id="1" order="0" position="200,-150" shape="line">
<text><![CDATA[[1] Motor …]]></text>
<topic id="2" order="0" position="290,-200" shape="line">
<topic id="2" order="0" position="290,-250" shape="line">
<text><![CDATA[[27] Isolationssystem …]]></text>
</topic>
<topic id="3" order="1" position="290,-175" shape="line">
<topic id="3" order="1" position="290,-225" shape="line">
<text><![CDATA[8[2] …]]></text>
</topic>
<topic id="4" order="2" position="290,-150" shape="line">
<topic id="4" order="2" position="290,-200" shape="line">
<text><![CDATA[[170] Multiumrichterbetrieb …]]></text>
</topic>
<topic id="5" order="3" position="290,-125" shape="line">
<topic id="5" order="3" position="290,-175" shape="line">
<text><![CDATA[[22] Thermistor …]]></text>
</topic>
<topic id="6" order="4" position="290,-100" shape="line">
<topic id="6" order="4" position="290,-150" shape="line">
<text><![CDATA[[2] Stecker …]]></text>
<topic id="7" order="0" position="380,-125" shape="line">
<topic id="7" order="0" position="380,-175" shape="line">
<text><![CDATA[[169] …]]></text>
</topic>
<topic id="8" order="1" position="380,-100" shape="line">
<topic id="8" order="1" position="380,-150" shape="line">
<text><![CDATA[[5] Kabel …]]></text>
</topic>
<topic id="9" order="2" position="380,-75" shape="line">
<topic id="9" order="2" position="380,-125" shape="line">
<text><![CDATA[8[31] Strombuchse …]]></text>
<topic id="10" order="0" position="470,-100" shape="line">
<topic id="10" order="0" position="470,-150" shape="line">
<text><![CDATA[8[2] Stecker …]]></text>
</topic>
<topic id="11" order="1" position="470,-75" shape="line">
<topic id="11" order="1" position="470,-125" shape="line">
<text><![CDATA[8[173] Stecker …]]></text>
</topic>
</topic>
</topic>
<topic id="12" order="5" position="290,-75" shape="line">
<topic id="12" order="5" position="290,-125" shape="line">
<text><![CDATA[8[173] Stecker …]]></text>
<topic id="13" order="0" position="380,-75" shape="line">
<topic id="13" order="0" position="380,-125" shape="line">
<text><![CDATA[8[2] Stecker …]]></text>
</topic>
</topic>
<topic id="14" order="6" position="290,-50" shape="line">
<topic id="14" order="6" position="290,-100" shape="line">
<text><![CDATA[8[1] …]]></text>
</topic>
<topic id="15" order="7" position="290,-25" shape="line">
<topic id="15" order="7" position="290,-75" shape="line">
<text><![CDATA[8[5] …]]></text>
</topic>
</topic>
<topic id="16" order="0" position="200,0" shape="line">
<topic id="16" order="2" position="200,-50" shape="line">
<text><![CDATA[[185] Motor …]]></text>
</topic>
<topic id="17" order="4" position="200,100" shape="line">
<topic id="17" order="4" position="200,50" shape="line">
<text><![CDATA[3 Umrichter]]></text>
<topic id="18" order="0" position="290,25" shape="line">
<topic id="18" order="0" position="290,-25" shape="line">
<text><![CDATA[[31] Strombuchse …]]></text>
</topic>
<topic id="19" order="1" position="290,50" shape="line">
<topic id="19" order="1" position="290,0" shape="line">
<text><![CDATA[8[2] Stecker …]]></text>
<topic id="20" order="0" position="380,25" shape="line">
<topic id="20" order="0" position="380,-25" shape="line">
<text><![CDATA[8[31] Strombuchse …]]></text>
</topic>
<topic id="21" order="1" position="380,50" shape="line">
<topic id="21" order="1" position="380,0" shape="line">
<text><![CDATA[8[173] Stecker …]]></text>
</topic>
</topic>
<topic id="22" order="2" position="290,75" shape="line">
<topic id="22" order="2" position="290,25" shape="line">
<text><![CDATA[8[173] Stecker …]]></text>
<topic id="23" order="0" position="380,75" shape="line">
<topic id="23" order="0" position="380,25" shape="line">
<text><![CDATA[8[2] Stecker …]]></text>
</topic>
</topic>
<topic id="24" order="3" position="290,100" shape="line">
<topic id="24" order="3" position="290,50" shape="line">
<text><![CDATA[[4] max. Außenleiterspannung …]]></text>
</topic>
<topic id="25" order="4" position="290,125" shape="line">
<topic id="25" order="4" position="290,75" shape="line">
<text><![CDATA[[13]]]></text>
<topic id="26" order="0" position="380,100" shape="line">
<topic id="26" order="0" position="380,50" shape="line">
<text><![CDATA[[14]]]></text>
<topic id="27" order="0" position="470,75" shape="line">
<topic id="27" order="0" position="470,25" shape="line">
<text><![CDATA[[15] …]]></text>
</topic>
<topic id="28" order="1" position="470,100" shape="line">
<topic id="28" order="1" position="470,50" shape="line">
<text><![CDATA[[16] …]]></text>
</topic>
<topic id="29" order="2" position="470,125" shape="line">
<topic id="29" order="2" position="470,75" shape="line">
<text><![CDATA[[17] …]]></text>
</topic>
</topic>
<topic id="30" order="1" position="380,125" shape="line">
<topic id="30" order="1" position="380,75" shape="line">
<text><![CDATA[[18]]]></text>
<topic id="31" order="0" position="470,100" shape="line">
<topic id="31" order="0" position="470,50" shape="line">
<text><![CDATA[[19] …]]></text>
</topic>
<topic id="32" order="1" position="470,125" shape="line">
<topic id="32" order="1" position="470,75" shape="line">
<text><![CDATA[[20] …]]></text>
</topic>
<topic id="33" order="2" position="470,150" shape="line">
<topic id="33" order="2" position="470,100" shape="line">
<text><![CDATA[[21] …]]></text>
</topic>
</topic>
</topic>
<topic id="34" order="5" position="290,150" shape="line">
<topic id="34" order="5" position="290,100" shape="line">
<text><![CDATA[3.3 Steuerung]]></text>
</topic>
</topic>
<topic id="35" order="8" position="200,200" shape="line">
<topic id="35" order="6" position="200,150" shape="line">
<text><![CDATA[4 Bremse]]></text>
<topic id="36" order="0" position="290,125" shape="line">
<topic id="36" order="0" position="290,75" shape="line">
<text><![CDATA[[172] Bremsansteuerung …]]></text>
</topic>
<topic id="37" order="1" position="290,150" shape="line">
<topic id="37" order="1" position="290,100" shape="line">
<text><![CDATA[[173] Stecker …]]></text>
<topic id="38" order="0" position="380,125" shape="line">
<topic id="38" order="0" position="380,75" shape="line">
<text><![CDATA[[175] Kabel …]]></text>
</topic>
<topic id="39" order="1" position="380,150" shape="line">
<topic id="39" order="1" position="380,100" shape="line">
<text><![CDATA[8[2] Stecker …]]></text>
<topic id="40" order="0" position="470,125" shape="line">
<topic id="40" order="0" position="470,75" shape="line">
<text><![CDATA[8[31] Strombuchse …]]></text>
</topic>
<topic id="41" order="1" position="470,150" shape="line">
<topic id="41" order="1" position="470,100" shape="line">
<text><![CDATA[8[173] Stecker …]]></text>
</topic>
</topic>
</topic>
<topic id="42" order="2" position="290,175" shape="line">
<topic id="42" order="2" position="290,125" shape="line">
<text><![CDATA[[178] Bremslufthebel …]]></text>
</topic>
<topic id="43" order="3" position="290,200" shape="line">
<topic id="43" order="3" position="290,150" shape="line">
<text><![CDATA[[179] Reaktionszeit …]]></text>
</topic>
<topic id="44" order="4" position="290,225" shape="line">
<topic id="44" order="4" position="290,175" shape="line">
<text><![CDATA[[180] Bremsmoment …]]></text>
</topic>
<topic id="45" order="5" position="290,250" shape="line">
<topic id="45" order="5" position="290,200" shape="line">
<text><![CDATA[[181] Notbetriebsart …]]></text>
</topic>
<topic id="46" order="6" position="290,275" shape="line">
<topic id="46" order="6" position="290,225" shape="line">
<text><![CDATA[[182] Bremsüberwachung …]]></text>
</topic>
</topic>

View File

@ -13,7 +13,7 @@
<text><![CDATA[Italic]]></text>
</topic>
</topic>
<topic id="4" order="0" position="-200,0" shape="line">
<topic id="4" order="1" position="-200,0" shape="line">
<text><![CDATA[Sizes]]></text>
<topic fontStyle="Arial;6;;;;" id="5" order="0"
position="-290,-100" shape="line">

View File

@ -2,13 +2,13 @@
<map name="basic" version="tango">
<topic central="true" id="0" position="0,0" shape="rounded rectagle">
<text><![CDATA[i18n]]></text>
<topic id="1" order="0" position="200,0" shape="line">
<topic id="1" order="0" position="200,-50" shape="line">
<text><![CDATA[Este es un é con acento]]></text>
</topic>
<topic id="2" order="0" position="-200,0" shape="line">
<topic id="2" order="1" position="-200,0" shape="line">
<text><![CDATA[Este es una ñ]]></text>
</topic>
<topic id="3" order="4" position="200,100" shape="line">
<topic id="3" order="2" position="200,50" shape="line">
<text><![CDATA[這是一個樣本 Japanise。]]></text>
</topic>
</topic>

View File

@ -6,7 +6,7 @@
<text><![CDATA[أَبْجَدِيَّة عَرَبِ]]></text>
<note><![CDATA[This is a not in languange أَبْجَدِيَّة عَرَبِ]]></note>
</topic>
<topic id="2" order="0" position="-200,0" shape="line">
<topic id="2" order="1" position="-200,0" shape="line">
<text><![CDATA[Long text node:
أَبْجَدِيَّة عَرَب]]></text>
</topic>

View File

@ -2,7 +2,7 @@
<map name="basic" version="tango">
<topic central="true" id="0" position="0,0" shape="rounded rectagle">
<text><![CDATA[This is the root node]]></text>
<topic id="1" order="7" position="200,-200" shape="line">
<topic id="1" order="0" position="200,-200" shape="line">
<text><![CDATA[Simbols]]></text>
<topic id="2" order="0" position="290,-300" shape="line">
<text><![CDATA[Warning]]></text>
@ -40,7 +40,7 @@
<icon id="sign_help"/>
</topic>
</topic>
<topic id="11" order="7" position="-200,-200" shape="line" shrink="true">
<topic id="11" order="1" position="-200,-200" shape="line" shrink="true">
<text><![CDATA[Numbers]]></text>
<topic id="12" order="0" position="-290,-325" shape="line">
<text><![CDATA[1]]></text>
@ -80,7 +80,7 @@
<icon id="bullet_black"/>
</topic>
</topic>
<topic id="22" order="3" position="200,-100" shape="line">
<topic id="22" order="2" position="200,-100" shape="line">
<text><![CDATA[Trafic]]></text>
<topic id="23" order="0" position="290,-125" shape="line">
<text><![CDATA[Read]]></text>
@ -111,7 +111,7 @@
<icon id="arrow_down"/>
</topic>
</topic>
<topic id="31" order="0" position="200,0" shape="line" shrink="true">
<topic id="31" order="4" position="200,0" shape="line" shrink="true">
<text><![CDATA[Smiles]]></text>
<topic id="32" order="0" position="290,-50" shape="line">
<text><![CDATA[Smile]]></text>
@ -132,7 +132,7 @@
<text><![CDATA[Angry]]></text>
</topic>
</topic>
<topic id="37" order="0" position="-200,0" shape="line" shrink="true">
<topic id="37" order="5" position="-200,0" shape="line" shrink="true">
<text><![CDATA[People]]></text>
<topic id="38" order="0" position="-290,-75" shape="line">
<text><![CDATA[Family]]></text>
@ -161,7 +161,7 @@
<icon id="people_group"/>
</topic>
</topic>
<topic id="45" order="4" position="200,100" shape="line" shrink="true">
<topic id="45" order="6" position="200,100" shape="line" shrink="true">
<text><![CDATA[Flags]]></text>
<topic id="46" order="0" position="290,25" shape="line">
<text><![CDATA[Black]]></text>
@ -190,7 +190,7 @@
<icon id="flag_yellow"/>
</topic>
</topic>
<topic id="53" order="4" position="-200,100" shape="line" shrink="true">
<topic id="53" order="7" position="-200,100" shape="line" shrink="true">
<text><![CDATA[Time]]></text>
<topic id="54" order="0" position="-290,75" shape="line">
<text><![CDATA[Calendar]]></text>
@ -269,7 +269,7 @@
<icon id="object_clip"/>
</topic>
</topic>
<topic id="74" order="8" position="-200,200" shape="line">
<topic id="74" order="9" position="-200,200" shape="line">
<text><![CDATA[Mail]]></text>
<topic id="75" order="0" position="-290,150" shape="line">
<text><![CDATA[Envelop]]></text>

View File

@ -8,7 +8,7 @@
<text><![CDATA[Link Topic]]></text>
<icon id="sign_info"/>
<link url="http://www.bing.com"/>
<topic id="2" order="0" position="290,-25" shape="line">
<topic id="2" order="0" position="290,0" shape="line">
<text><![CDATA[Link Topic Topic]]></text>
<icon id="sign_warning"/>
<link url="http://bing.com"/>

View File

@ -17,45 +17,45 @@
<text><![CDATA[Combined]]></text>
</topic>
</topic>
<topic bgColor="#f20707" id="6" order="0" position="-200,0" shape="rectagle">
<topic bgColor="#f20707" id="6" order="1" position="-200,-50" shape="rectagle">
<text><![CDATA[Node Background Color]]></text>
<topic bgColor="#0000cc" brColor="#808080" id="7" order="0"
position="-290,-50" shape="rectagle">
position="-290,-100" shape="rectagle">
<text><![CDATA[Fork]]></text>
</topic>
<topic bgColor="#ccffcc" brColor="#808080" id="8" order="1"
position="-290,-25" shape="rounded rectagle">
position="-290,-75" shape="rounded rectagle">
<text><![CDATA[Bubble]]></text>
</topic>
<topic bgColor="#00ffff" brColor="#808080" id="9" order="2"
position="-290,0" shape="rectagle">
position="-290,-50" shape="rectagle">
<text><![CDATA[As parent]]></text>
</topic>
<topic bgColor="#990099" brColor="#808080" id="10" order="3"
position="-290,25" shape="rectagle">
position="-290,-25" shape="rectagle">
<text><![CDATA[Combined]]></text>
</topic>
</topic>
<topic bgColor="#f20707" id="11" order="4" position="-200,100" shape="rectagle">
<topic bgColor="#f20707" id="11" order="3" position="-200,50" shape="rectagle">
<text><![CDATA[Node Text Color]]></text>
<topic bgColor="#0000cc" brColor="#808080"
fontStyle=";;#ffff00;;;" id="12" order="0"
position="-290,50" shape="rectagle">
position="-290,0" shape="rectagle">
<text><![CDATA[Fork]]></text>
</topic>
<topic bgColor="#ccffcc" brColor="#808080"
fontStyle=";;#ff6666;;;" id="13" order="1"
position="-290,75" shape="rounded rectagle">
position="-290,25" shape="rounded rectagle">
<text><![CDATA[Bubble]]></text>
</topic>
<topic bgColor="#00ffff" brColor="#808080"
fontStyle=";;#009999;;;" id="14" order="2"
position="-290,100" shape="rectagle">
position="-290,50" shape="rectagle">
<text><![CDATA[As parent]]></text>
</topic>
<topic bgColor="#990099" brColor="#808080"
fontStyle=";;#009999;;;" id="15" order="3"
position="-290,125" shape="rectagle">
position="-290,75" shape="rectagle">
<text><![CDATA[Combined]]></text>
</topic>
</topic>

View File

@ -2,7 +2,7 @@
<map name="basic" version="tango">
<topic central="true" id="0" position="0,0" shape="rounded rectagle">
<text><![CDATA[Numerosity]]></text>
<topic id="1" order="0" position="-200,0" shape="line">
<topic id="1" order="1" position="-200,0" shape="line">
<text><![CDATA[Approximate Representations]]></text>
<topic id="2" order="0" position="-290,-25" shape="line">
<text><![CDATA[Brain Regions]]></text>
@ -131,58 +131,58 @@
</topic>
</topic>
</topic>
<topic id="37" order="0" position="200,0" shape="line">
<topic id="37" order="0" position="200,-50" shape="line">
<text><![CDATA[Exact Representations (Subitizing)]]></text>
<topic id="38" order="0" position="290,0" shape="line">
<topic id="38" order="0" position="290,-50" shape="line">
<text><![CDATA[Parallel Visual Presentation with Pop-out]]></text>
<topic id="39" order="0" position="380,-25" shape="line">
<topic id="39" order="0" position="380,-75" shape="line">
<text><![CDATA[Trick & Pylyshyn, 1993]]></text>
</topic>
<topic id="40" order="1" position="380,0" shape="line">
<topic id="40" order="1" position="380,-50" shape="line">
<text><![CDATA[Posterior Parietal Map of a limited number of salient locations in the visual field]]></text>
<topic id="41" order="0" position="470,-25" shape="line">
<topic id="41" order="0" position="470,-75" shape="line">
<text><![CDATA[Piazza & Izard, 2009]]></text>
</topic>
<topic id="42" order="1" position="470,0" shape="line">
<topic id="42" order="1" position="470,-50" shape="line">
<text><![CDATA[Gottlieb, 2007]]></text>
</topic>
</topic>
</topic>
</topic>
<topic id="43" order="4" position="200,100" shape="line">
<topic id="43" order="2" position="200,50" shape="line">
<text><![CDATA[Exact Representations (Counting)]]></text>
<topic id="44" order="0" position="290,75" shape="line">
<topic id="44" order="0" position="290,25" shape="line">
<text><![CDATA[Serial Scanning]]></text>
<topic id="45" order="0" position="380,75" shape="line">
<topic id="45" order="0" position="380,25" shape="line">
<text><![CDATA[Attentional Deployment]]></text>
<topic id="46" order="0" position="470,75" shape="line">
<topic id="46" order="0" position="470,25" shape="line">
<text><![CDATA[Dorsal Stream (posterior parietal & lateral premotor cortices)]]></text>
<topic id="47" order="0" position="560,50" shape="line">
<topic id="47" order="0" position="560,0" shape="line">
<text><![CDATA[Butterworth, 2000]]></text>
</topic>
<topic id="48" order="1" position="560,75" shape="line">
<topic id="48" order="1" position="560,25" shape="line">
<text><![CDATA[Piazza et al, 2003]]></text>
</topic>
<topic id="49" order="2" position="560,100" shape="line">
<topic id="49" order="2" position="560,50" shape="line">
<text><![CDATA[Piazza et al, 2006]]></text>
</topic>
</topic>
</topic>
</topic>
<topic id="50" order="1" position="290,100" shape="line">
<topic id="50" order="1" position="290,50" shape="line">
<text><![CDATA[Working Memory]]></text>
<topic id="51" order="0" position="380,75" shape="line">
<topic id="51" order="0" position="380,25" shape="line">
<text><![CDATA[Subvocalization component of the verbal system]]></text>
<topic id="52" order="0" position="470,50" shape="line">
<topic id="52" order="0" position="470,0" shape="line">
<text><![CDATA[Logie & Baddeley, 1987]]></text>
</topic>
<topic id="53" order="1" position="470,75" shape="line">
<topic id="53" order="1" position="470,25" shape="line">
<text><![CDATA[Hinton et al, 2004]]></text>
</topic>
</topic>
<topic id="54" order="1" position="380,100" shape="line">
<topic id="54" order="1" position="380,50" shape="line">
<text><![CDATA[Visio-spatial rehearsal loop in deaf children]]></text>
<topic id="55" order="0" position="470,100" shape="line">
<topic id="55" order="0" position="470,50" shape="line">
<text><![CDATA[Leybaert & Van Cutsem, 2002]]></text>
</topic>
</topic>

View File

@ -2,7 +2,7 @@
<map name="basic" version="tango">
<topic central="true" id="0" position="0,0" shape="rounded rectagle">
<text><![CDATA[California]]></text>
<topic id="1" order="7" position="-200,-200" shape="line">
<topic id="1" order="1" position="-200,-200" shape="line">
<text><![CDATA[Northern California]]></text>
<topic id="2" order="0" position="-290,-275" shape="line">
<text><![CDATA[Oakland/Berkeley]]></text>
@ -26,7 +26,7 @@
<topic id="8" order="3" position="-200,-100" shape="line">
<text><![CDATA[Hawaii]]></text>
</topic>
<topic id="9" order="0" position="-200,0" shape="line">
<topic id="9" order="5" position="-200,0" shape="line">
<text><![CDATA[Southern California]]></text>
<topic id="10" order="0" position="-290,-50" shape="line">
<text><![CDATA[Los Angeles]]></text>
@ -41,7 +41,7 @@
<text><![CDATA[Other South]]></text>
</topic>
</topic>
<topic id="14" order="4" position="-200,100" shape="line">
<topic id="14" order="7" position="-200,100" shape="line">
<text><![CDATA[Policy Bodies]]></text>
<topic id="15" order="0" position="-290,25" shape="line">
<text><![CDATA[Advocacy]]></text>
@ -77,68 +77,68 @@
</topic>
</topic>
</topic>
<topic id="26" order="3" position="200,-100" shape="line">
<topic id="26" order="0" position="200,-150" shape="line">
<text><![CDATA[Corneal Tissue OPS]]></text>
<topic id="27" order="0" position="290,-200" shape="line">
<topic id="27" order="0" position="290,-250" shape="line">
<text><![CDATA[Transplant Bank International]]></text>
<topic id="28" order="0" position="380,-250" shape="line">
<topic id="28" order="0" position="380,-275" shape="line">
<text><![CDATA[Orange County Eye and Transplant Bank]]></text>
</topic>
<topic bgColor="#00ffd5" id="29" order="1"
position="380,-225" shape="rounded rectagle">
position="380,-250" shape="rounded rectagle">
<text><![CDATA[Northern California Transplant Bank]]></text>
<topic id="30" order="0" position="470,-225" shape="line">
<topic id="30" order="0" position="470,-250" shape="line">
<text><![CDATA[In 2010, 2,500 referrals forwarded to OneLegacy]]></text>
</topic>
</topic>
<topic bgColor="#00ffd5" id="31" order="2"
position="380,-200" shape="rounded rectagle">
position="380,-225" shape="rounded rectagle">
<text><![CDATA[Doheny Eye and Tissue Transplant Bank]]></text>
<link url="http://www.dohenyeyebank.org/"/>
</topic>
</topic>
<topic bgColor="#00ffd5" id="32" order="1"
position="290,-175" shape="rounded rectagle">
position="290,-225" shape="rounded rectagle">
<text><![CDATA[OneLegacy]]></text>
<topic id="33" order="0" position="380,-200" shape="line">
<topic id="33" order="0" position="380,-225" shape="line">
<text><![CDATA[In 2010, 11,828 referrals]]></text>
</topic>
</topic>
<topic bgColor="#00ffd5" id="34" order="2"
position="290,-150" shape="rounded rectagle">
position="290,-200" shape="rounded rectagle">
<text><![CDATA[San Diego Eye Bank]]></text>
<topic id="35" order="0" position="380,-150" shape="line">
<topic id="35" order="0" position="380,-200" shape="line">
<text><![CDATA[In 2010, 2,555 referrals]]></text>
</topic>
</topic>
<topic id="36" order="3" position="290,-125" shape="line">
<topic id="36" order="3" position="290,-175" shape="line">
<text><![CDATA[California Transplant Donor Network]]></text>
</topic>
<topic id="37" order="4" position="290,-100" shape="line">
<topic id="37" order="4" position="290,-150" shape="line">
<text><![CDATA[California Transplant Services]]></text>
<topic id="38" order="0" position="380,-100" shape="line">
<topic id="38" order="0" position="380,-150" shape="line">
<text><![CDATA[In 2010, 0 referrals]]></text>
</topic>
</topic>
<topic id="39" order="5" position="290,-75" shape="line">
<topic id="39" order="5" position="290,-125" shape="line">
<text><![CDATA[Lifesharing]]></text>
</topic>
<topic id="40" order="6" position="290,-50" shape="line">
<topic id="40" order="6" position="290,-100" shape="line">
<text><![CDATA[DCI Donor Services]]></text>
<topic bgColor="#00ffd5" id="41" order="0"
position="380,-50" shape="rounded rectagle">
position="380,-100" shape="rounded rectagle">
<text><![CDATA[Sierra Eye and Tissue Donor Services]]></text>
<topic id="42" order="0" position="470,-75" shape="line">
<topic id="42" order="0" position="470,-100" shape="line">
<text><![CDATA[In 2010, 2.023 referrals]]></text>
</topic>
</topic>
</topic>
<topic bgColor="#00ffd5" id="43" order="7"
position="290,-25" shape="rounded rectagle">
position="290,-75" shape="rounded rectagle">
<text><![CDATA[SightLife]]></text>
</topic>
</topic>
<topic id="44" order="8" position="-200,200" shape="line">
<topic id="44" order="9" position="-200,200" shape="line">
<text><![CDATA[Tools]]></text>
<topic id="45" order="0" position="-290,175" shape="line">
<text><![CDATA[Darthmouth Atlas of Health]]></text>
@ -147,74 +147,74 @@
<text><![CDATA[HealthLandscape]]></text>
</topic>
</topic>
<topic id="47" order="0" position="200,0" shape="line">
<topic id="47" order="2" position="200,-50" shape="line">
<text><![CDATA[QE Medicare]]></text>
</topic>
<topic id="48" order="4" position="200,100" shape="line">
<topic id="48" order="4" position="200,50" shape="line">
<text><![CDATA[CMS Data]]></text>
</topic>
<topic id="49" order="8" position="200,200" shape="line">
<topic id="49" order="6" position="200,150" shape="line">
<text><![CDATA[Ambulatory Payment Classification]]></text>
<topic id="50" order="0" position="290,150" shape="line">
<topic id="50" order="0" position="290,100" shape="line">
<text><![CDATA[CPT's which don't allow V2785]]></text>
<topic id="51" order="0" position="380,125" shape="line">
<topic id="51" order="0" position="380,75" shape="line">
<text><![CDATA[Ocular Reconstruction Transplant]]></text>
<topic id="52" order="0" position="470,100" shape="line">
<topic id="52" order="0" position="470,50" shape="line">
<text><![CDATA[65780 (amniotic membrane tranplant]]></text>
</topic>
<topic id="53" order="1" position="470,125" shape="line">
<topic id="53" order="1" position="470,75" shape="line">
<text><![CDATA[65781 (limbal stem cell allograft)]]></text>
</topic>
<topic id="54" order="2" position="470,150" shape="line">
<topic id="54" order="2" position="470,100" shape="line">
<text><![CDATA[65782 (limbal conjunctiva autograft)]]></text>
</topic>
</topic>
<topic id="55" order="1" position="380,150" shape="line">
<topic id="55" order="1" position="380,100" shape="line">
<text><![CDATA[Endothelial keratoplasty]]></text>
<topic id="56" order="0" position="470,150" shape="line">
<topic id="56" order="0" position="470,100" shape="line">
<text><![CDATA[65756]]></text>
</topic>
</topic>
<topic id="57" order="2" position="380,175" shape="line">
<topic id="57" order="2" position="380,125" shape="line">
<text><![CDATA[Epikeratoplasty]]></text>
<topic id="58" order="0" position="470,175" shape="line">
<topic id="58" order="0" position="470,125" shape="line">
<text><![CDATA[65767]]></text>
</topic>
</topic>
</topic>
<topic id="59" order="1" position="290,175" shape="line">
<topic id="59" order="1" position="290,125" shape="line">
<text><![CDATA[Anterior lamellar keratoplasty]]></text>
<topic id="60" order="0" position="380,175" shape="line">
<topic id="60" order="0" position="380,125" shape="line">
<text><![CDATA[65710]]></text>
</topic>
</topic>
<topic id="61" order="2" position="290,200" shape="line">
<topic id="61" order="2" position="290,150" shape="line">
<text><![CDATA[Processing, preserving, and transporting corneal tissue]]></text>
<topic id="62" order="0" position="380,175" shape="line">
<topic id="62" order="0" position="380,125" shape="line">
<text><![CDATA[V2785]]></text>
</topic>
<topic id="63" order="1" position="380,200" shape="line">
<topic id="63" order="1" position="380,150" shape="line">
<text><![CDATA[Laser incision in recepient]]></text>
<topic id="64" order="0" position="470,200" shape="line">
<topic id="64" order="0" position="470,150" shape="line">
<text><![CDATA[0290T]]></text>
</topic>
</topic>
</topic>
<topic id="65" order="3" position="290,225" shape="line">
<topic id="65" order="3" position="290,175" shape="line">
<text><![CDATA[Laser incision in donor]]></text>
<topic id="66" order="0" position="380,225" shape="line">
<topic id="66" order="0" position="380,175" shape="line">
<text><![CDATA[0289T]]></text>
</topic>
</topic>
<topic id="67" order="4" position="290,250" shape="line">
<topic id="67" order="4" position="290,200" shape="line">
<text><![CDATA[Penetrating keratoplasty]]></text>
<topic id="68" order="0" position="380,225" shape="line">
<topic id="68" order="0" position="380,175" shape="line">
<text><![CDATA[65730 (in other)]]></text>
</topic>
<topic id="69" order="1" position="380,250" shape="line">
<topic id="69" order="1" position="380,200" shape="line">
<text><![CDATA[65755 (in pseudoaphakia)]]></text>
</topic>
<topic id="70" order="2" position="380,275" shape="line">
<topic id="70" order="2" position="380,225" shape="line">
<text><![CDATA[65750 (in aphakia)]]></text>
</topic>
</topic>

View File

@ -10,185 +10,185 @@
<text><![CDATA[bilan mi-parcours
du plan d'actions]]></text>
<topic fontStyle="Arial;8;#006600;bold;;" id="2" order="0"
position="290,-75" shape="line">
position="290,-50" shape="line">
<text><![CDATA[modalités]]></text>
<topic id="3" order="0" position="380,-125" shape="line">
<topic id="3" order="0" position="380,-100" shape="line">
<text><![CDATA[cf. mi-parcours 201109]]></text>
</topic>
<topic fontStyle="Arial;8;;;;" id="4" order="1"
position="380,-100" shape="line">
position="380,-75" shape="line">
<text><![CDATA[à partir des plans d'actions]]></text>
</topic>
<topic fontStyle="Arial;8;;;;" id="5" order="2"
position="380,-75" shape="line">
position="380,-50" shape="line">
<text><![CDATA[donner la parole aux référents prévus, en demandant des exemples]]></text>
</topic>
<topic fontStyle="Arial;8;;;;" id="6" order="3"
position="380,-50" shape="line">
position="380,-25" shape="line">
<text><![CDATA[faire compléter par les autres participants]]></text>
</topic>
</topic>
<topic bgColor="#99ffff" brColor="#808080"
fontStyle="Arial;8;#0000cc;bold;;" id="7" order="1"
position="290,-50" shape="rounded rectagle">
position="290,-25" shape="rounded rectagle">
<text><![CDATA[1) Adapter et améliorer
notre offre de services
selon l'évolution des besoins]]></text>
<topic bgColor="#99ffff" id="8" order="0"
position="380,-175" shape="rectagle">
position="380,-100" shape="rectagle">
<text><![CDATA[couleurs = état d'avancement en septembre 2011,
à mettre à jour selon avancement 2012]]></text>
<topic bgColor="#0099ff" id="9" order="0"
position="470,-225" shape="rectagle">
position="470,-150" shape="rectagle">
<text><![CDATA[Bleu 0%]]></text>
</topic>
<topic bgColor="#ff9999" id="10" order="1"
position="470,-200" shape="rectagle">
position="470,-125" shape="rectagle">
<text><![CDATA[Rouge 25%]]></text>
</topic>
<topic bgColor="#ffcc00" id="11" order="2"
position="470,-175" shape="rectagle">
position="470,-100" shape="rectagle">
<text><![CDATA[Orange 50%]]></text>
</topic>
<topic bgColor="#ffff00" id="12" order="3"
position="470,-150" shape="rectagle">
position="470,-75" shape="rectagle">
<text><![CDATA[Jaune 75%]]></text>
</topic>
<topic bgColor="#66ff00" id="13" order="4"
position="470,-125" shape="rectagle">
position="470,-50" shape="rectagle">
<text><![CDATA[Vert]]></text>
<topic id="14" order="0" position="560,-125" shape="line">
<topic id="14" order="0" position="560,-50" shape="line">
<text><![CDATA[100 %]]></text>
</topic>
</topic>
</topic>
<topic bgColor="#66ff00"
fontStyle="Arial;8;#006600;bold;;" id="15" order="1"
position="380,-150" shape="rectagle" shrink="true">
position="380,-75" shape="rectagle" shrink="true">
<text><![CDATA[1.1. .Renforcer et structurer
le service "accueil et orientation"]]></text>
<topic id="16" order="0" position="470,-175" shape="line">
<topic id="16" order="0" position="470,-75" shape="line">
<text><![CDATA[Sophie]]></text>
</topic>
</topic>
<topic bgColor="#ffff00"
fontStyle="Arial;8;#006600;bold;;" id="17" order="2"
position="380,-125" shape="rectagle">
position="380,-50" shape="rectagle">
<text><![CDATA[1.2. Adapter l'offre Halte-Garderie
aux besoins des familles]]></text>
<topic id="18" order="0" position="470,-150" shape="line">
<topic id="18" order="0" position="470,-50" shape="line">
<text><![CDATA[Martine D et Christine]]></text>
</topic>
</topic>
<topic bgColor="#66ff00"
fontStyle="Arial;8;#006600;bold;;" id="19" order="3"
position="380,-100" shape="rectagle">
position="380,-25" shape="rectagle">
<text><![CDATA[1.3. Renforcer et structurer les services
de soutien à la parentalité]]></text>
<topic id="20" order="0" position="470,-125" shape="line">
<topic id="20" order="0" position="470,-25" shape="line">
<text><![CDATA[Nathalie]]></text>
</topic>
</topic>
<topic bgColor="#ffff00"
fontStyle="Arial;8;#006600;bold;;" id="21" order="4"
position="380,-75" shape="rectagle">
position="380,0" shape="rectagle">
<text><![CDATA[1.4 Améliorer la qualité des
projets pédagogiques des ALSH]]></text>
<topic id="22" order="0" position="470,-100" shape="line">
<topic id="22" order="0" position="470,0" shape="line">
<text><![CDATA[Josiane]]></text>
</topic>
</topic>
<topic bgColor="#ffcc00"
fontStyle="Arial;8;#006600;bold;;" id="23" order="5"
position="380,-50" shape="rectagle">
position="380,25" shape="rectagle">
<text><![CDATA[1.5 Renforcer et améliorer les
activités de loisirs existantes]]></text>
<topic id="24" order="0" position="470,-75" shape="line">
<topic id="24" order="0" position="470,25" shape="line">
<text><![CDATA[Agnès]]></text>
</topic>
</topic>
<topic bgColor="#66ff00"
fontStyle="Arial;8;#006600;bold;;" id="25" order="6"
position="380,-25" shape="rectagle">
position="380,50" shape="rectagle">
<text><![CDATA[1.6 Renforcer et améliorer les ateliers  
visant à  rompre l'isolement lié à la langue,
la pauvreté, la pression de la consommation]]></text>
<topic id="26" order="0" position="470,-50" shape="line">
<topic id="26" order="0" position="470,50" shape="line">
<text><![CDATA[Nathalie]]></text>
</topic>
</topic>
</topic>
<topic bgColor="#99ffff" brColor="#808080"
fontStyle="Arial;8;#0000cc;bold;;" id="27" order="2"
position="290,-25" shape="rounded rectagle">
position="290,0" shape="rounded rectagle">
<text><![CDATA[2) Consolider nos moyens d'action :
locaux, organisation, communication interne]]></text>
<topic bgColor="#ffff00"
fontStyle="Arial;8;#006600;bold;;" id="28" order="0"
position="380,-100" shape="rectagle">
position="380,-25" shape="rectagle">
<text><![CDATA[2.1 Formaliser notre offre de services
et les modèles économiques correspondants]]></text>
<topic id="29" order="0" position="470,-150" shape="line">
<topic id="29" order="0" position="470,-25" shape="line">
<text><![CDATA[Agnès]]></text>
</topic>
</topic>
<topic bgColor="#ffcc00"
fontStyle="Arial;8;#006600;bold;;" id="30" order="1"
position="380,-75" shape="rectagle">
position="380,0" shape="rectagle">
<text><![CDATA[2.2 Formaliser le "qui fait quoi"
en lien avec notre offre de service]]></text>
<topic id="31" order="0" position="470,-125" shape="line">
<topic id="31" order="0" position="470,0" shape="line">
<text><![CDATA[Martine G]]></text>
</topic>
</topic>
<topic bgColor="#66ff00"
fontStyle="Arial;8;#006600;bold;;" id="32" order="2"
position="380,-50" shape="rectagle">
position="380,25" shape="rectagle">
<text><![CDATA[2.3. Elaborer un projet immobilier de proximité
réalisable au  centre ville]]></text>
<topic id="33" order="0" position="470,-100" shape="line">
<topic id="33" order="0" position="470,25" shape="line">
<text><![CDATA[JMDW]]></text>
</topic>
</topic>
</topic>
<topic bgColor="#99ffff" brColor="#808080"
fontStyle="Arial;8;#0000cc;bold;;" id="34" order="3"
position="290,0" shape="rounded rectagle">
position="290,25" shape="rounded rectagle">
<text><![CDATA[3) Renforcer nos
partenariats et
notre notoriété]]></text>
<topic bgColor="#ffff00" brColor="#808080"
fontStyle="Arial;8;#006600;bold;;" id="35" order="0"
position="380,-75" shape="rectagle">
position="380,-25" shape="rectagle">
<text><![CDATA[3.1 Organiser pour chaque segment de notre offre
l'identification et la rencontre des partenaires concernés]]></text>
<topic id="36" order="0" position="470,-125" shape="line">
<topic id="36" order="0" position="470,-25" shape="line">
<text><![CDATA[Martine P]]></text>
</topic>
</topic>
<topic bgColor="#ffcc00" brColor="#808080"
fontStyle="Arial;8;#006600;bold;;" id="37" order="1"
position="380,-50" shape="rectagle">
position="380,0" shape="rectagle">
<text><![CDATA[3.2 Formaliser et contractualiser les partenariats
émergeants autour d'actions communes]]></text>
<topic id="38" order="0" position="470,-100" shape="line">
<topic id="38" order="0" position="470,0" shape="line">
<text><![CDATA[Pdt + Agnès]]></text>
</topic>
</topic>
<topic bgColor="#ff6666"
fontStyle="Arial;8;#006600;bold;;" id="39" order="2"
position="380,-25" shape="rectagle">
position="380,25" shape="rectagle">
<text><![CDATA[3.3 développer la vie associative]]></text>
<topic id="40" order="0" position="470,-50" shape="line">
<topic id="40" order="0" position="470,25" shape="line">
<text><![CDATA[Pdt + Agnès]]></text>
</topic>
</topic>
<topic bgColor="#ff6666" brColor="#808080"
fontStyle="Arial;8;#006600;bold;;" id="41" order="3"
position="380,0" shape="rectagle">
position="380,50" shape="rectagle">
<text><![CDATA[3.4 définir et faire vivre un plan de communication
à partir de notre segmentation de l'offre]]></text>
<topic id="42" order="0" position="470,-50" shape="line">
<topic id="42" order="0" position="470,50" shape="line">
<text><![CDATA[Pdt + Agnès]]></text>
</topic>
</topic>