francois/adecWatt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: francois:master
Branches Tags
francois:master
...
compare: francois:cb259689deecd9163bdfeb88bf79b9fe30a3bf61
Branches Tags
francois:master

1 Commits
master ... cb259689de

Author SHA1 Message Date
AdecWatt
cb259689de test 2022-01-25 08:40:23 +01:00
3 changed files with 69 additions and 59 deletions
Show Stats Expand all files Collapse all files

113
data/config/AdecWatt.xml
View File

@ -1,77 +1,76 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<comment>This file is automaticaly generated by AdecWatt application at 5:25 PM on May 26, 2019.</comment>
<entry key="DownloaddataChecked">true</entry>
<entry key="HelpOrder">4</entry>
<entry key="dumpDir">data/log/</entry>
<entry key="EditChecked">true</entry>
<entry key="BoundGlue">true</entry>
<entry key="InSegmentGlue">false</entry>
<entry key="LastExport">/home/felix/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz</entry>
<entry key="HelpPlace">North</entry>
<comment>This file is automaticaly generated by AdecWatt application at 2:43 PM on Oct 21, 2020.</comment>
<entry key="GridGlue">true</entry>
<entry key="FileOrder">0</entry>
<entry key="HelpOrder">4</entry>
<entry key="AdecWattIcon">data/images/adecWatt.png</entry>
<entry key="EditChecked">true</entry>
<entry key="SliderPlace">North</entry>
<entry key="EditPlace">North</entry>
<entry key="SearchPlace">North</entry>
<entry key="AboutChecked">false</entry>
<entry key="FilePlace">North</entry>
<entry key="LicenceLocation">[x=0,y=28]</entry>
<entry key="LastCheck">20201021</entry>
<entry key="SliderChecked">true</entry>
<entry key="FrameLocation">[x=0,y=28]</entry>
<entry key="SearchChecked">true</entry>
<entry key="AboutLocation">[x=0,y=28]</entry>
<entry key="SliderUndocked">false</entry>
<entry key="Login"/>
<entry key="FileUndocked">false</entry>
<entry key="dumpDir">data/log/</entry>
<entry key="HelpUndocked">false</entry>
<entry key="PlacementChecked">true</entry>
<entry key="PlacementOrder">3</entry>
<entry key="EditUndocked">false</entry>
<entry key="HelpPlace">North</entry>
<entry key="DownloadsoftChecked">true</entry>
<entry key="DownloaddataChecked">true</entry>
<entry key="ManualLocation">[x=0,y=28]</entry>
<entry key="HandleGlue">true</entry>
<entry key="HelpChecked">true</entry>
<entry key="SearchUndocked">false</entry>
<entry key="ProxyPort">3128</entry>
<entry key="PlacementUndocked">false</entry>
<entry key="InSegmentGlue">false</entry>
<entry key="FileChecked">true</entry>
<entry key="SliderOrder">2</entry>
<entry key="ManualChecked">false</entry>
<entry key="EditOrder">1</entry>
<entry key="HelpChecked">true</entry>
<entry key="ProxyPort">3128</entry>
<entry key="SearchOrder">5</entry>
<entry key="FilePlace">North</entry>
<entry key="AboutLocation">[x=0,y=31]</entry>
<entry key="SearchUndocked">false</entry>
<entry key="FileChecked">true</entry>
<entry key="FrameLocation">[x=1 490,y=312]</entry>
<entry key="EditPlace">North</entry>
<entry key="CheckPeriod">Day</entry>
<entry key="AboutChecked">false</entry>
<entry key="LicenceLocation">[x=0,y=31]</entry>
<entry key="PlacementChecked">true</entry>
<entry key="SliderUndocked">false</entry>
<entry key="SliderOrder">2</entry>
<entry key="SearchPlace">North</entry>
<entry key="SearchChecked">true</entry>
<entry key="Variant"/>
<entry key="DownloadsoftChecked">true</entry>
<entry key="SliderChecked">true</entry>
<entry key="AdecWattIcon">data/images/adecWatt.png</entry>
<entry key="FileUndocked">false</entry>
<entry key="SliderPlace">North</entry>
<entry key="Login"/>
<entry key="HelpUndocked">false</entry>
<entry key="ManualChecked">false</entry>
<entry key="LastCheck">20190526</entry>
<entry key="SearchOrder">5</entry>
<entry key="LicenceChecked">false</entry>
<entry key="HandleGlue">true</entry>
<entry key="PlacementOrder">3</entry>
<entry key="EditUndocked">false</entry>
<entry key="ManualLocation">[x=0,y=31]</entry>
<entry key="PlacementUndocked">false</entry>
<entry key="PlacementPlace">North</entry>
<entry key="LastExport">/home/felix/CendresLampionsChapelleBleue.lpz</entry>
<entry key="FileOrder">0</entry>
<entry key="BoundGlue">true</entry>
<entry key="CheckPeriod">Day</entry>
<entry key=""/>
</properties>

3
src/java/adecWatt/model/Embedded.java
View File

@ -119,7 +119,8 @@ public abstract class Embedded<P extends XmlPermanent<T, A>, T extends Enum<?>,
if (visited.contains (this))
return;
super.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks);
model.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks);
if (model != null)
model.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks);
}
public boolean renameUnits (TreeMap<String, String> translateMap) {

12
src/java/adecWatt/model/unit/Workspace.java
View File

@ -706,7 +706,17 @@ public abstract class Workspace extends Unit<Item<?, ?, ?>> {
Circuits.CircuitState circuitState = circuits.getState (plugedComp, acc);
if (circuitState == null)
continue;
Acc.printCircuit (printGraphics, lineWidth, plugedComp.getAccCenter (acc.getId ()), circuitState);
Point2D c = plugedComp.getAccCenter (acc.getId ());
// try {
// Comp endComp = (Comp) namedItems.get (acc.getConnectedTo ());
// Point2D a = plugedComp.getAccCenter (acc.getId ());
// Point2D b = endComp.getAccCenter (acc.getConnectedOn ());
// c = new Point2D.Double ((1*a.getX ()+b.getX ())/2, (1*a.getY ()+b.getY ())/2);
// } catch (Exception e) {
// }
// XXX
//Acc.printCircuit (printGraphics, lineWidth, c, circuitState);
Acc.printCircuit (printGraphics, c, circuitState, .4);
}
}