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

Compare commits

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

5 Commits
cb259689de ... master

Author SHA1 Message Date
François
88dd4ef1ca update README 2022-08-22 10:53:25 +02:00
François
cb7e8d110c fix insee lock 2022-01-27 09:22:53 +01:00
François
bca1181b8b copy update 2022-01-26 14:24:32 +01:00
François
847ffcd207 fix first window outside screen 2022-01-25 18:44:54 +01:00
François
bb39b6d3ea fix model 2022-01-25 09:18:56 +01:00
10 changed files with 133 additions and 89 deletions
Show Stats Expand all files Collapse all files

13
README.md
View File

@ -21,3 +21,16 @@ git config user.name "Your Name"
[ADEC 56](http://adec56.org/spip/index.php)
## Remote commands
* getRoles
* zipList path
* zipGets path
* zipPuts zip
* zipRemove path
## Test
https://adecwatt.parlenet.org/lib/plugins/adecwatt/adecWattBD.php?version=v3&action=getRoles
https://adecwatt.parlenet.org/lib/plugins/adecwatt/adecWattBD.php?version=v3&action=zipList&name=data

14
ant/build.xml
View File

@ -104,6 +104,14 @@
</fileset>
</replaceregexp>
<replaceregexp byline="true">
<regexp pattern="(.*entry key=&#34;.*Location&#34;&#62;)[^&#93;]*(.*)"/>
<substitution expression="\1&#91;x=50,y=50\2"/>
<fileset dir="data/config">
<include name="*.xml"/>
</fileset>
</replaceregexp>
<replaceregexp byline="true">
<regexp pattern="(.*entry key=&#34;Download.*Checked&#34;&#62;)false(.*)"/>
<substitution expression="\1true\2"/>
@ -287,6 +295,12 @@
<include name="misc/**/*.class"/>
</fileset>
</jar>
<copy todir="${webRef}/soft" preservelastmodified="true">
<fileset dir="${build.jar}">
<include name="UpdatedAdecWatt.jar"/>
<include name="Misc.jar"/>
</fileset>
</copy>
</target>
<!-- ======================================== -->

115
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 3:16 PM on Jan 26, 2022.</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=50,y=50]</entry>
<entry key="LastCheck">20220126</entry>
<entry key="SliderChecked">true</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="SearchChecked">true</entry>
<entry key="AboutLocation">[x=50,y=50]</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=50,y=50]</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/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz</entry>
<entry key="FileOrder">0</entry>
<entry key="BoundGlue">true</entry>
<entry key="CheckPeriod">Day</entry>
<entry key=""/>
</properties>

BIN
soft/Misc.jar
View File

Binary file not shown.

57
src/java/adecWatt/control/LaunchAdecWatt.java
View File

@ -18,8 +18,10 @@ public class LaunchAdecWatt {
// ========================================
static public void main (String[] args) {
try {
System.err.println ("Config...");
Config.setPWD (LaunchAdecWatt.class);
Config.load ("AdecWatt");
System.err.println ("Bundle...");
Bundle.load ("Help");
Bundle.load ("ToolBar");
Bundle.load ("Proxy");
@ -29,8 +31,6 @@ public class LaunchAdecWatt {
Bundle.load ("AdecWatt");
Bundle.load (JProp.AdecWattUser);
updateShell ();
final AdecWatt adecWatt = new AdecWatt ();
SwingUtilities.invokeLater (new Runnable () {
public void run () {
@ -42,36 +42,37 @@ public class LaunchAdecWatt {
} catch (Exception e) {
File softDir = new File (Config.getPWD ().getParentFile (), "soft");
File jar = new File (softDir, "UpdatedAdecWatt.jar");
System.err.println ("RemoteUpdate...");
RemoteUpdate.launch (jar);
}
}
public static void updateShell () {
try {
File dir = Config.getPWD ().getParentFile ();
File oldLaunch = new File (dir, "launch-lightPlot.sh");
File softDir = new File (dir, "soft");
File newJar = new File (softDir, "AdecWatt.jar");
File oldJar = new File (softDir, "LightPlot.jar");
if (newJar.length () < 1024)
return;
if (oldLaunch.length () > 70) {
PrintWriter pw = new PrintWriter (oldLaunch);
pw.println ("#!/bin/bash");
pw.println ("cd `dirname \"$0\"`");
pw.println ("java -jar soft/AdecWatt.jar");
pw.flush ();
pw.close ();
JOptionPane.showMessageDialog (null,
"Votre logiciel a \u00E9t\u00E9 mis \u00E0 jour.\n"+
"Vous devez relancer l'application\n", "Information", JOptionPane.ERROR_MESSAGE);
System.exit (0);
}
if (oldJar.exists ())
oldJar.delete ();
} catch (FileNotFoundException e) {
}
}
// public static void updateShell () {
// try {
// File dir = Config.getPWD ().getParentFile ();
// File oldLaunch = new File (dir, "launch-lightPlot.sh");
// File softDir = new File (dir, "soft");
// File newJar = new File (softDir, "AdecWatt.jar");
// File oldJar = new File (softDir, "LightPlot.jar");
// if (newJar.length () < 1024)
// return;
// if (oldLaunch.length () > 70) {
// PrintWriter pw = new PrintWriter (oldLaunch);
// pw.println ("#!/bin/bash");
// pw.println ("cd `dirname \"$0\"`");
// pw.println ("java -jar soft/AdecWatt.jar");
// pw.flush ();
// pw.close ();
// JOptionPane.showMessageDialog (null,
// "Votre logiciel a \u00E9t\u00E9 mis \u00E0 jour.\n"+
// "Vous devez relancer l'application\n", "Information", JOptionPane.ERROR_MESSAGE);
// System.exit (0);
// }
// if (oldJar.exists ())
// oldJar.delete ();
// } catch (FileNotFoundException e) {
// }
// }
// ========================================
}

1
src/java/adecWatt/control/LaunchUpdatedAdecWatt.java
View File

@ -9,6 +9,7 @@ public class LaunchUpdatedAdecWatt {
// ========================================
static public void main (String[] args) {
System.err.println ("LaunchUpdatedAdecWatt...");
Config.setPWD (LaunchUpdatedAdecWatt.class);
File dir = Config.getPWD ().getParentFile ();
RemoteUpdate.renameNewFile (dir);

6
src/java/adecWatt/model/AdecWatt.java
View File

@ -77,7 +77,11 @@ public class AdecWatt extends StateNotifier {
iconDB.reload ();
imageDB.reload ();
permanentDB.reload ();
inseeDB = InseeDB.readDocument (Config.getDataUrl ("data", "server", "Insee.xml"));
(new Thread () {
public void run () {
inseeDB = InseeDB.readDocument (Config.getDataUrl ("data", "server", "Insee.xml"));
}
}).start ();
broadcastUpdate (BroadcastUnitRoots);
}

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) {

1
src/java/adecWatt/model/PermanentDB.java
View File

@ -114,6 +114,7 @@ public class PermanentDB {
try {
if (file.length () == 0)
continue;
Log.writeLog ("PermanentDB", "load "+srcDir+"/"+file.getName ());
FileInputStream fileInputStream = new FileInputStream (file);
Unit<?> unit = Unit.getInstanceFromStream (adecWatt, fileInputStream, file,
serverToken.equals (srcDir) ? UnitLocation.Server : UnitLocation.Local);

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);
}
}