+ diff --git a/data/texts/AboutAdecWatt.html b/data/texts/AboutAdecWatt.html new file mode 100644 index 0000000..eaf6678 --- /dev/null +++ b/data/texts/AboutAdecWatt.html @@ -0,0 +1,31 @@ + + + + + A propos de AdecWatt + + + +

AdecWatt V1.3 (version du 4/2/2018)

+ Ce logiciel est en cours de d�veloppement par l'ADEC56. + Il est t�l�chargeable sur adecwatt.parlenet.org +

+ + diff --git a/data/texts/AdecWattLicence.html b/data/texts/AdecWattLicence.html new file mode 100644 index 0000000..e563d27 --- /dev/null +++ b/data/texts/AdecWattLicence.html @@ -0,0 +1,44 @@ + + + + + CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL + + + +

Avertissement

Comme toute oeuvre, la reproduction, m�me partielle de ce logiciel est prot�g� par le droit d'auteur. En particulier, en dehors d'une autorisation explicite �crite, son utilisation dans le cadre d'une r�alisation lucrative est une fraude. Ce logiciel n'est pas destin� � �tre vendu (y compris de mani�re hypocrite en infligeant des bandeaux publicitaires). +

+ Ce logiciel est sous contrat de licence de logiciel libre CeCILL¹. + Cette mention est indissociable du logiciel. + +

Ce logiciel est libre. Vous n'avez pas � payer pour l'utiliser. Des b�n�voles de l'ADEC56 l'on d�velopp�.
Ce logiciel n'est pas gratuit. Vous ne serez donc pas vendu � une propagande commerciale pour financer son utilisation. Votre utilisation ne sera pas non plus trac�e en vue d'une manipulation politique.

+ +

1 CeCILL est pour Ce(a) C(nrs) I(nria) L(ogiciel) L(ibre) www.cecill.info

+ + diff --git a/data/texts/ManualAdecWatt.html b/data/texts/ManualAdecWatt.html new file mode 100644 index 0000000..67d814e --- /dev/null +++ b/data/texts/ManualAdecWatt.html @@ -0,0 +1,106 @@ + + + + + Manuel d'utilisation + + + + +

Manuel d'utilisation

+ Ce logiciel sert � r�aliser des plans de feu. + + Ce manuel est en cours de r�daction. +

+ +

1. Premi�re mise en route

+ Vous devez mettre � jour le logiciel avec la commande : . +

+ +

2. Modification de salle de spectacle

+ Ce mode n'est pas termin� (changement de taille, de plan de fond, ...). + + Sur la partie gauche, s�lectionnez l'onglet "Immobilier", puis double-cliquez sur la salle que vous voulez modifier. + Elle appara�t sur la partie droite. + + Choisissez dans l'onglet mobilier des �l�ments � ajouter. +

+ +

3. Ajout de mobilier

+ Sur la partie gauche, s�lectionnez l'onglet "Mobilier", puis faire glisser le mobilier choisi dans la salle ou le plan de feu (partie droite). + + Par la suite on peu : +

ajuster la position en cliquant (clique gauche) sur l'objet et en le glissant.
ajuster l'orientation en appuyant sur "Ctrl" et en cliquant l� o� l'objet doit pointer.

+ +

4. Modification d'�chelle

+ Placer la sourie sur la salle ou le plan de feu (partie droite) et appuyer sur la touche "Ctrl". + La molette de la sourie permet : +

agrandir (molette vers l'avant).
r�duire (molette vers l'arri�re).

+ +

5. D�placement dans la vue

+ Placer la sourie sur la salle ou le plan de feu (partie droite). + La molette de la sourie permet : +

de monter (vers l'avant) ou d�cendre (ver l'arri�re).
et en appuyant sur la touche "Maj", d'aller � gauche (vers l'avant) ou � droite (ver l'arri�re).

+ +

6. Modification de plan de feu

+ Sur la partie gauche, s�lectionnez l'onglet "Immobilier", puis double-cliquez sur la salle que vous voulez modifier. + Elle appara�t sur la partie droite. + + On peut comme pour une salle : +

ajouter du mobilier
changer le rapport d'�chelle
d�placer la vue

+ + On peut �galement changer de salle en choisissant une salle (onglet "Immobilier" en partie gauche) sur le plan de feu. +

+ +

7. Fermeture des vues

+ Pour fermer une vue, il faut cliquer avec le bouto de droite sur l'onglet pour faire appara�tre un menu. + La fermeture d'une vue est ind�pendante de la sauvegarde. + Un objet non sauv� pourra �tre r��diter plus tard avant d'�tre sauver. +

+ +

8. Historique des commandes

+ Un historique des commandes permet de g�rrer l'annulation et la r�ex�cution des actions ind�pendament des objets �dit�s. +

+ +

+ + +

Bons plans de feu !!!

+ + diff --git a/soft/JMapViewer.jar b/soft/JMapViewer.jar new file mode 100644 index 0000000..7fe9a63 Binary files /dev/null and b/soft/JMapViewer.jar differ diff --git a/soft/Misc.jar b/soft/Misc.jar new file mode 100644 index 0000000..04db1d1 Binary files /dev/null and b/soft/Misc.jar differ diff --git a/src/java/adecWatt/control/AdecWattController.java b/src/java/adecWatt/control/AdecWattController.java new file mode 100644 index 0000000..6ee2b4f --- /dev/null +++ b/src/java/adecWatt/control/AdecWattController.java @@ -0,0 +1,187 @@ +package adecWatt.control; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Frame; +import java.awt.Image; +import java.text.MessageFormat; +import javax.swing.JMenuBar; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; + +import misc.Bundle; +import misc.Config; +import misc.Controller; +import misc.HelpManager; +import misc.HtmlDialog; +import misc.MultiToolBarBorderLayout; +import misc.ProxyManager; +import misc.RemoteUpdate; +import misc.RemoteUpdateManager; +import misc.StoryManager; +import misc.ToolBarManager; +import misc.Util; + +import adecWatt.model.AdecWatt; +import adecWatt.model.Unit; +import adecWatt.model.User; +import adecWatt.view.JAdecWatt; +import adecWatt.view.JAdecWattDialog; +import adecWatt.view.JAdecWattMenuBar; +import adecWatt.view.JAdecWattSearchToolBar; +import adecWatt.view.JAdecWattToolBar; +import adecWatt.view.JWorkspaceSlidersToolBar; + +public class AdecWattController extends Controller { + + // ======================================== + AdecWatt adecWatt; + RemoteUpdate remoteUpdate; + + JAdecWatt jAdecWatt; + + JAdecWattMenuBar jAdecWattMenuBar; + JAdecWattToolBar jAdecWattToolBar; + JAdecWattDialog jAdecWattDialog; + JAdecWattSearchToolBar jAdecWattSearchToolBar; + JWorkspaceSlidersToolBar jWorkspaceSlidersToolBar; + + HtmlDialog manualDialog; + + AdecWattManager adecWattManager; + HelpManager helpManager; + ToolBarManager toolBarManager; + StoryManager storyManager; + ProxyManager proxyManager; + RemoteUpdateManager remoteUpdateManager; + + // ======================================== + public AdecWattController (AdecWatt adecWatt) { + super (adecWatt); + } + + public void restart () { + adecWattManager.actionRestart (); + } + + // ======================================== + protected void createModel (AdecWatt adecWatt) { + this.adecWatt = adecWatt; + adecWatt.addUpdateObserver (this, AdecWatt.BroadcastTitle); + adecWatt.getUser ().addUpdateObserver (this, User.BroadcastUserChangeProfil); + Bundle.addBundleObserver (this); + remoteUpdate = + new RemoteUpdate (AdecWattManager.protocol, AdecWattManager.remoteServerName, AdecWattManager.stableVersion, AdecWattManager.urlModel, + new String [] {"soft"}, + new String [] {"data", "data", "server"}, + new String [] {"help-fr_FR", "data", "texts", "help-fr_FR"}, + new String [] {"help-images", "data", "texts", "help-images"}, + new String [] {"help-en_US", "data", "texts", "help-en_US"}, + new String [] {"help-br_FR_breton", "data", "texts", "help-br_FR_breton"}, + new String [] {"help-br_FR_gallo", "data", "texts", "help-br_FR_gallo"}, + new String [] {"help-es_ES", "data", "texts", "help-es_ES"} + //new String [] {"test", "data", "test", "server"} + ); + } + + // ======================================== + protected Component createGUI () { + jAdecWatt = new JAdecWatt (adecWatt); + jAdecWattDialog = new JAdecWattDialog (this); + jWorkspaceSlidersToolBar = new JWorkspaceSlidersToolBar (jAdecWatt); + jAdecWattSearchToolBar = new JAdecWattSearchToolBar (jAdecWatt); + manualDialog = new HtmlDialog (jFrame, "Manual", "data/texts/help-"+Bundle.getLocale ()+"/index.html"); + + Frame frame = new Frame (); + frame.setIconImage (getIcon ()); + JPanel contentPane = new JPanel (new MultiToolBarBorderLayout ()); + toolBarManager = new ToolBarManager (getIcon (), contentPane); + + storyManager = new StoryManager (); + remoteUpdateManager = new RemoteUpdateManager (this, remoteUpdate, + new Runnable () { + public void run () { + restart (); + } + }); + remoteUpdateManager.check (); + adecWattManager = + new AdecWattManager (adecWatt, storyManager, remoteUpdateManager, + jAdecWatt, jWorkspaceSlidersToolBar, jAdecWattDialog, manualDialog); + helpManager = new HelpManager (this, "AdecWatt"); + proxyManager = new ProxyManager (this); + jAdecWattToolBar = new JAdecWattToolBar (this, + adecWattManager, storyManager, proxyManager, remoteUpdateManager, helpManager, toolBarManager, + jAdecWattSearchToolBar, jWorkspaceSlidersToolBar); + contentPane.add (jAdecWatt, BorderLayout.CENTER); + + return contentPane; + } + + protected void newJFrame () { + manualDialog.setJFrame (jFrame); + // XXX pas RemoteUpdate ! et les outres ? + } + + public void updateBundle () { + super.updateBundle (); + SwingUtilities.invokeLater (new Runnable () { + public void run () { + manualDialog.changeFileName ("data/texts/help-"+Bundle.getLocale ()+"/index.html"); + } + }); + } + + // ======================================== + public String getTitle () { + Unit currentWorkspace = jAdecWatt.getCurrentWorkspace (); + Unit sharedUnitStory = adecWattManager.getSharedUnitStory (); + return MessageFormat.format (Bundle.getTitle ("AdecWatt"), + currentWorkspace == null ? Bundle.getAction ("Empty") : currentWorkspace.toString (), + sharedUnitStory == null ? "?" : sharedUnitStory.toString ()); + } + + public Image getIcon () { + try { + return Util.loadImage (Config.getString ("AdecWattIcon", "data/images/adecWatt.png")); + } catch (Exception e) { + return null; + } + } + + public void updateTitle () { + updateBundle (); + } + public void updateUserChangeProfil () { + User user = adecWatt.getUser (); + if (jAdecWattMenuBar != null) + jAdecWattMenuBar.changeProfil (user); + if (jAdecWattToolBar != null) + jAdecWattToolBar.changeProfil (user); + } + + // ======================================== + protected JMenuBar createMenuBar () { + return jAdecWattMenuBar = new JAdecWattMenuBar (this, adecWattManager, storyManager, proxyManager, remoteUpdateManager, helpManager, toolBarManager); + } + + // ======================================== + protected boolean tryClosingWindows () { + Config.save ("AdecWatt"); + if (adecWatt.getModified ()) + switch (JOptionPane.showConfirmDialog (jFrame, Bundle.getMessage ("QuitJAdecWatt"), + Bundle.getTitle ("AdecWattStillRunning"), + JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE)) { + case JOptionPane.YES_OPTION: + return true; + case JOptionPane.NO_OPTION: + case JOptionPane.CANCEL_OPTION: + case JOptionPane.CLOSED_OPTION: + return false; + } + return true; + } + + // ======================================== +} diff --git a/src/java/adecWatt/control/AdecWattManager.java b/src/java/adecWatt/control/AdecWattManager.java new file mode 100644 index 0000000..77a6948 --- /dev/null +++ b/src/java/adecWatt/control/AdecWattManager.java @@ -0,0 +1,686 @@ +package adecWatt.control; + +import java.awt.Container; +import java.awt.Desktop; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.print.PageFormat; +import java.awt.print.PrinterJob; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.TreeSet; +import java.util.Vector; +import javax.swing.AbstractButton; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JMenu; +import misc.ApplicationManager; +import misc.Config; +import misc.HtmlDialog; +import misc.RemoteUpdateManager; +import misc.Story; +import misc.StoryManager; +import misc.Util; + +import adecWatt.model.Acc; +import adecWatt.model.AdecWatt; +import adecWatt.model.Editable; +import adecWatt.model.ImageDB; +import adecWatt.model.Item; +import adecWatt.model.PermanentDB; +import adecWatt.model.Unit; +import adecWatt.model.unit.Workspace; +import adecWatt.view.JAdecWatt; +import adecWatt.view.JAdecWattDialog; +import adecWatt.view.JWorkspaceSlidersToolBar; +import adecWatt.view.JWorkspaceView; +import adecWatt.view.PrintWorkspace; + +public class AdecWattManager implements ApplicationManager, ActionListener { + + // ======================================== + public static String protocol = "https"; + public static String remoteServerName = "adecwatt.parlenet.org"; + public String testedServerName = "adecwatt.parlenet.local"; + public String currentServerName = remoteServerName; + public static String stableVersion = "v3"; + public String testedVersion = "test"; + public String currentVersion = stableVersion; + public static String + urlModel = "/lib/plugins/adecwatt/adecWattBD.php?version={0}&action={1}&name={2}"; + + // ======================================== + static public final String + actionChangeRole = "ChangeRole", + actionRestart = "Restart", + actionSave = "Save", + actionSaveAll = "SaveAll", + actionImport = "Import", + actionExport = "Export", + actionPageSetup = "PageSetup", + actionPrint = "Print", + actionExportPDF = "ExportPDF", + actionClose = "Close", + actionCloseAll = "CloseAll", + + actionSelectAll = "SelectAll", + actionCut = "Cut", + actionCopy = "Copy", + actionPaste = "Paste", + actionMagnetPolicies = "MagnetPolicies", + actionPatch = "Patch", + + actionHorizontalLeft = "HorizontalLeft", + actionHorizontalCenter = "HorizontalCenter", + actionHorizontalRight = "HorizontalRight", + actionVerticalTop = "VerticalTop", + actionVerticalCenter = "VerticalCenter", + actionVerticalBottom = "VerticalBottom", + + actionHorizontalSpace = "HorizontalSpace", + actionHorizontalDistrib = "HorizontalDistrib", + actionVerticalSpace = "VerticalSpace", + actionVerticalDistrib = "VerticalDistrib", + actionWizard = "Wizard", + actionHttpServer = "HttpServer", + actionLocalServer = "LocalServer", + actionTestedServer = "TestedServer", + actionServerName = "ServerName", + actionManual = "Manual"; + + static public Util.ActionControl[] actionsControl = { + new Util.ActionControl (actionSave, KeyEvent.VK_S), + new Util.ActionControl (actionSelectAll, KeyEvent.VK_A), + new Util.ActionControl (actionCut, KeyEvent.VK_X), + // new Util.ActionControl (actionCut, KeyEvent.VK_DELETE, false), + // new Util.ActionControl (actionCut, KeyEvent.VK_BACK_SPACE, false), + new Util.ActionControl (actionCopy, KeyEvent.VK_C), + new Util.ActionControl (actionPaste, KeyEvent.VK_V), + new Util.ActionControl (StoryManager.actionUndo, KeyEvent.VK_Z), + new Util.ActionControl (StoryManager.actionRedo, KeyEvent.VK_Y), + }; + + // ======================================== + /** popup Menu. */ + static public final String + actionDisplayUnit = "DisplayUnit", + actionModifyUnit = "ModifyUnit", + actionRenameUnit = "RenameUnit", + actionTransformUnit = "TransformUnit", + actionCopyUnit = "CopyUnit", + actionNewUnit = "NewUnit", + actionPromoteUnit = "PromoteUnit", + actionRemoveUnit = "RemoveUnit", + actionRemoveImage = "RemoveImage", + actionChangeImage = "ChangeImage", + actionUnchange = "Unchange"; + + static public final String + actionDisplayItem = "DisplayItem", + actionModifyItem = "ModifyItem", + actionHideItem = "HideItem", + actionShowItem = "ShowItem", + actionTransformItem = "TransformItem", + actionCopyItem = "CopyItem", + actionRemoveItem = "RemoveItem", + + actionHideShowItem = "HideShowItem"; + + static public final String + actionDisplayAcc = "DisplayAcc", + actionModifyAcc = "ModifyAcc", + actionTransformAcc = "TransformAcc", + actionRemoveAcc = "RemoveAcc"; + + // ======================================== + static public final List + fileActionsNames = Arrays.asList (actionChangeRole, actionRestart, + actionSave, actionSaveAll, actionImport, actionExport, + actionPageSetup, actionPrint, //actionExportPDF, + actionClose, actionCloseAll), + editActionsNames = Arrays.asList (actionSelectAll, actionCut, actionCopy, actionPaste, actionMagnetPolicies, actionPatch), + placementActionsNames = Arrays.asList (actionHorizontalLeft, actionHorizontalCenter, actionHorizontalRight, + actionVerticalTop, actionVerticalCenter, actionVerticalBottom, + actionHorizontalSpace, actionHorizontalDistrib, + actionVerticalSpace, actionVerticalDistrib), + yodaActionsNames = Arrays.asList (actionHttpServer, actionLocalServer, actionTestedServer, actionServerName, actionWizard), + yodaNoCheckActionsNames = Arrays.asList (actionServerName, actionWizard), + helpActionsNames = Arrays.asList (actionManual); + + // ======================================== + @SuppressWarnings ("unchecked") + static public final Hashtable actionsMethod = + Util.collectMethod (AdecWattManager.class, + fileActionsNames, editActionsNames, placementActionsNames, yodaActionsNames, helpActionsNames); + + public void actionPerformed (ActionEvent e) { + Util.actionPerformed (actionsMethod, e, this); + } + + // ======================================== + AdecWatt adecWatt; + PermanentDB permanentDB; + StoryManager storyManager; + RemoteUpdateManager remoteUpdateManager; + + JAdecWatt jAdecWatt; + JWorkspaceSlidersToolBar jWorkspaceSlidersToolBar; + JAdecWattDialog jAdecWattDialog; + HtmlDialog manualDialog; + JCheckBoxMenuItem httpServerCB; + JCheckBoxMenuItem localServerCB; + JCheckBoxMenuItem testedServerCB; + + // ======================================== + public AdecWattManager (AdecWatt adecWatt, StoryManager storyManager, RemoteUpdateManager remoteUpdateManager, + JAdecWatt jAdecWatt, JWorkspaceSlidersToolBar jWorkspaceSlidersToolBar, JAdecWattDialog jAdecWattDialog, + HtmlDialog manualDialog) { + this.adecWatt= adecWatt; + permanentDB = adecWatt.getPermanentDB (); + this.storyManager = storyManager; + this.jAdecWatt = jAdecWatt; + this.jWorkspaceSlidersToolBar = jWorkspaceSlidersToolBar; + this.jAdecWattDialog = jAdecWattDialog; + this.manualDialog = manualDialog; + this.remoteUpdateManager = remoteUpdateManager; + + jAdecWatt.stateNotifier.addUpdateObserver (this, JAdecWatt.BroadcastWorkspace, JAdecWatt.BroadcastSelection); + jAdecWatt.stateNotifier.addMsgObserver (this, JAdecWatt.BroadcastUnitStory); //, JAdecWatt.BroadcastEditableSelection); + + adecWatt.addUpdateObserver (this, + AdecWatt.BroadcastStory); + adecWatt.addMsgObserver (this, + AdecWatt.BroadcastUnitStory, + actionClose, + actionDisplayUnit, actionModifyUnit, actionRenameUnit, actionTransformUnit, + actionCopyUnit, actionNewUnit, actionPromoteUnit, actionRemoveUnit, + actionDisplayItem, actionModifyItem, actionHideShowItem, actionTransformItem, actionCopyItem, actionRemoveItem, + Unit.BroadcastSetSelectionItems, Unit.BroadcastConnection, + actionDisplayAcc, actionModifyAcc, actionTransformAcc, actionRemoveAcc); + } + + // ======================================== + public void addMenuItem (JMenu... jMenu) { + int idx = 0; + Util.addMenuItem (fileActionsNames, this, jMenu[idx++]); + Util.addMenuItem (editActionsNames, this, jMenu[idx++]); + Util.addMenuItem (placementActionsNames, this, jMenu[idx++]); + httpServerCB = Util.addCheckMenuItem (actionHttpServer, this, false, jMenu[idx]); + localServerCB = Util.addCheckMenuItem (actionLocalServer, this, false, jMenu[idx]); + testedServerCB = Util.addCheckMenuItem (actionTestedServer, this, false, jMenu[idx]); + actionHttpServer (); + actionLocalServer (); + actionTestedServer (); + Util.addMenuItem (yodaNoCheckActionsNames, this, jMenu[idx++]); + Util.addMenuItem (helpActionsNames, this, jMenu[idx++]); + } + + // ======================================== + public void addIconButtons (Container... containers) { + int idx = 0; + Util.addIconButton (fileActionsNames, this, containers[idx++]); + Util.addIconButton (editActionsNames, this, containers[idx++]); + Util.addIconButton (placementActionsNames, this, containers[idx++]); + idx++; + idx++; + Util.addIconButton (helpActionsNames, this, containers[idx++]); + } + + // ======================================== + private ArrayList enabledSaveButtons = new ArrayList (); + private ArrayList enabledSaveAllButtons = new ArrayList (); + private ArrayList enabledCloseButtons = new ArrayList (); + private ArrayList enabledPasteButtons = new ArrayList (); + private ArrayList enabledSelectionButtons = new ArrayList (); + private ArrayList enabledMultiSelectionButtons = new ArrayList (); + public void addActiveButtons (Hashtable buttons) { + enabledSaveButtons.add (buttons.get (actionSave)); + enabledSaveAllButtons.add (buttons.get (actionSaveAll)); + enabledCloseButtons.add (buttons.get (actionPrint)); + //enabledCloseButtons.add (buttons.get (actionExportPDF)); + enabledCloseButtons.add (buttons.get (actionPatch)); + enabledCloseButtons.add (buttons.get (actionExport)); + enabledCloseButtons.add (buttons.get (actionClose)); + enabledCloseButtons.add (buttons.get (actionCloseAll)); + enabledCloseButtons.add (buttons.get (actionSelectAll)); + enabledPasteButtons.add (buttons.get (actionPaste)); + enabledSelectionButtons.add (buttons.get (actionCopy)); + enabledSelectionButtons.add (buttons.get (actionCut)); + for (String action : placementActionsNames) + enabledMultiSelectionButtons.add (buttons.get (action)); + updateActiveButtons (); + } + + public void updateActiveButtons () { + remoteUpdateManager.updateActiveButtons (); + updateStory (); + updateWorkspace (); + updatePaste (); + } + + // ======================================== + Unit sharedUnitStory; + public Unit getSharedUnitStory () { return sharedUnitStory; } + public void displayUnitStory (Object... objects) { + // if (objects[0] == null) + // return; + sharedUnitStory = (Unit) objects[0]; + adecWatt.broadcastUpdate (AdecWatt.BroadcastTitle); + storyManager.setStory (sharedUnitStory == null ? null : sharedUnitStory.story); + updateStory (); + } + public void updateStory () { + boolean saveAll = permanentDB.isModifiedUnit (); + boolean save = false; + if (sharedUnitStory != null) { + Story story = sharedUnitStory.story; + save = story.isModified (); + } + for (AbstractButton button : enabledSaveButtons) + button.setEnabled (save); + for (AbstractButton button : enabledSaveAllButtons) + button.setEnabled (saveAll); + jAdecWatt.updateUnit (sharedUnitStory, false); + } + + public void updateWorkspace () { + boolean close = jAdecWatt.hasWorkspace (); + for (AbstractButton button : enabledCloseButtons) + button.setEnabled (close); + Workspace currentWorkspace = jAdecWatt.getCurrentWorkspace (); + displayUnitStory (currentWorkspace); + updateSelection (); + JWorkspaceView jWorkspaceView = jAdecWatt.getCurrentJWorkspace (); + jWorkspaceSlidersToolBar.setJWorkspaceView (jWorkspaceView); + } + + public void updateSelection () { + JWorkspaceView jWorkspaceView = jAdecWatt.getCurrentJWorkspace (); + int nbSelection = jWorkspaceView == null ? 0 : jWorkspaceView.getNbSelectedItems (); + boolean selection = nbSelection > 0; + boolean multiSelection = nbSelection > 1; + for (AbstractButton button : enabledSelectionButtons) + button.setEnabled (selection); + for (AbstractButton button : enabledMultiSelectionButtons) + button.setEnabled (multiSelection); + } + + // ======================================== + public void actionRestart () { + if (adecWatt.getModified () && !jAdecWattDialog.abortModification ()) + return; + actionCloseAll (); + adecWatt.reset (); + jAdecWatt.stateNotifier.broadcastDisplay (JAdecWatt.BroadcastUnitStory, (Unit) null); + } + + public void actionSave () { + if (sharedUnitStory == null) + return; + sharedUnitStory.save (); + } + + public void actionSaveAll () { + adecWatt.saveAll (); + } + + public void actionSelectAll () { + JWorkspaceView jWorkspaceView = jAdecWatt.getCurrentJWorkspace (); + if (jWorkspaceView == null) + return; + jWorkspaceView.selectAllItems (); + } + + public void actionImport () { + permanentDB.importFile (jAdecWattDialog.getChooseOpenFile (permanentDB.getLastExport ())); + } + + public void actionExport () { + Workspace currentWorkspace = jAdecWatt.getCurrentWorkspace (); + if (currentWorkspace == null) + return; + permanentDB.exportFile (currentWorkspace, jAdecWattDialog.getChooseSaveFile (permanentDB.getLastExport ())); + } + + Vector clip = new Vector (); + + public void updatePaste () { + boolean paste = clip.size () > 0; + for (AbstractButton button : enabledPasteButtons) + button.setEnabled (paste); + } + + public void actionCut () { + actionCopy (); + JWorkspaceView jWorkspaceView = jAdecWatt.getCurrentJWorkspace (); + if (jWorkspaceView == null) + return; + jWorkspaceView.getWorkspace ().storyRemoveItems (clip); + } + + public void actionCopy () { + clip.clear (); + try { + clip.addAll (jAdecWatt.getCurrentJWorkspace ().getSelectedItems ()); + } catch (Exception e) { + } + updatePaste (); + } + + public void actionPaste () { + Workspace currentWorkspace = jAdecWatt.getCurrentWorkspace (); + if (currentWorkspace == null) + return; + currentWorkspace.storyPasteItem (clip); + } + + + // ======================================== + public void displayClose (Object... objects) { + if (objects[0] == null || ! (objects[0] instanceof Workspace)) + return; + Workspace workspace = (Workspace) objects[0]; + jAdecWattDialog.removeDisplay (workspace); + jAdecWatt.closeWorkspace (workspace); + } + + public void actionClose () { + Workspace currentWorkspace = jAdecWatt.getCurrentWorkspace (); + jAdecWattDialog.removeDisplay (currentWorkspace); + jAdecWatt.closeWorkspace (currentWorkspace); + } + + public void actionCloseAll () { + jAdecWattDialog.removeAllDisplay (); + jAdecWatt.closeWorkspaces (); + } + + public void actionChangeRole () { + jAdecWattDialog.checkAdmin (adecWatt.getUser (), remoteUpdateManager); + } + + public void actionHorizontalLeft () { align (Workspace.Alignment.LEFT); } + public void actionHorizontalCenter () { align (Workspace.Alignment.CENTER); } + public void actionHorizontalRight () { align (Workspace.Alignment.RIGHT); } + public void actionVerticalTop () { align (Workspace.Alignment.TOP); } + public void actionVerticalCenter () { align (Workspace.Alignment.MIDDLE); } + public void actionVerticalBottom () { align (Workspace.Alignment.BOTTOM); } + public void actionHorizontalSpace () { distrib (true, true); } + public void actionHorizontalDistrib () { distrib (true, false); } + public void actionVerticalSpace () { distrib (false, true); } + public void actionVerticalDistrib () { distrib (false, false); } + + + public void distrib (boolean isHorizontal, boolean isSpace) { + JWorkspaceView jWorkspaceView = jAdecWatt.getCurrentJWorkspace (); + if (jWorkspaceView == null) + return; + Double value = jAdecWattDialog.getSpace (); + if (value != null && value < 0) + return; + Vector items = jWorkspaceView.getSelectedItems (); + if (items == null || items.size () < 2) + return; + Workspace workspace = jWorkspaceView.getWorkspace (); + if (isSpace) + workspace.storySpaceItem (items, isHorizontal, value); + else + workspace.storyDistributeItem (items, isHorizontal, value); + } + + public void align (Workspace.Alignment alignment) { + JWorkspaceView jWorkspaceView = jAdecWatt.getCurrentJWorkspace (); + if (jWorkspaceView == null) + return; + Vector items = jWorkspaceView.getSelectedItems (); + if (items == null || items.size () < 2) + return; + jWorkspaceView.getWorkspace ().storyAlignItem (items, alignment); + } + + // ======================================== + public void actionManual () { + try { + Desktop.getDesktop ().browse (Config.getDataUrl ("data", "texts", "help-"+misc.Bundle.getLocale (), "index.html").toURI ()); + } catch (Exception e) { + e.printStackTrace (); + manualDialog.restart (); + manualDialog.setVisible (true); + } + } + + private PrinterJob printer = null; + private PageFormat page = null; + + public void actionPageSetup() { + if (printer == null) + printer = PrinterJob.getPrinterJob (); + if (page == null) + page = printer.defaultPage (); + page = printer.pageDialog (page); + printer.defaultPage (page); + } + + public void actionPrint () { + Workspace currentWorkspace = jAdecWatt.getCurrentWorkspace (); + if (printer == null) + printer = PrinterJob.getPrinterJob (); + if (!printer.printDialog ()) + return; + PrintWorkspace.print (jAdecWattDialog.getOwnFrame (), printer, currentWorkspace); + } + + public void actionExportPDF () { + Workspace currentWorkspace = jAdecWatt.getCurrentWorkspace (); + if (printer == null) + printer = PrinterJob.getPrinterJob (); + if (!printer.printDialog ()) + return; + PrintWorkspace.print (jAdecWattDialog.getOwnFrame (), printer, currentWorkspace); + } + + public void actionMagnetPolicies () { + jAdecWattDialog.magnetPolicies (adecWatt); + } + + public void actionPatch () { + jAdecWattDialog.patch (jAdecWatt.getCurrentWorkspace ()); + } + + public void actionHttpServer () { + remoteUpdateManager.getRemoteUpdate ().protocol = + httpServerCB.isSelected () ? "http" : protocol; + Config.setBoolean ("HttpServer"+Config.checkedPostfix, httpServerCB.isSelected ()); + // XXX ??? + javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier (new javax.net.ssl.HostnameVerifier () { + public boolean verify (String hostname, javax.net.ssl.SSLSession session) { + return true; + } + }); + } + public void actionLocalServer () { + remoteUpdateManager.getRemoteUpdate ().serverName = + localServerCB.isSelected () ? testedServerName : remoteServerName; + + javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier (new javax.net.ssl.HostnameVerifier () { + public boolean verify (String hostname, javax.net.ssl.SSLSession session) { + return true; + } + }); + } + public void actionTestedServer () { + remoteUpdateManager.getRemoteUpdate ().versionName = + testedServerCB.isSelected () ? testedVersion : stableVersion; + + javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier (new javax.net.ssl.HostnameVerifier () { + public boolean verify (String hostname, javax.net.ssl.SSLSession session) { + return true; + } + }); + } + public void actionServerName () { + String newServer = jAdecWattDialog.getSimpleMessage ("ServerName", testedServerName); + if (newServer != null) + testedServerName = newServer; + } + public void actionWizard () { + try { + System.err.println ("coucou: wizard"); + java.net.URL newURL = Config.getDataUrl ("data", "texts", "help-"+misc.Bundle.getLocale (), "index.html"); + System.err.println ("coucou file:"+newURL+" --- "+newURL.toURI ()); + + java.awt.Desktop.getDesktop ().browse (newURL.toURI ()); + // XXX + } catch (Exception e) { + e.printStackTrace (); + } + } + + // ======================================== + public void displayDisplayUnit (Object... objects) { + @SuppressWarnings("unchecked") + List> selectedUnits = (List>) objects[0]; + jAdecWattDialog.display (false, selectedUnits); + } + public void displayModifyUnit (Object... objects) { + @SuppressWarnings("unchecked") + List> selectedUnits = (List>) objects[0]; + jAdecWattDialog.display (true, selectedUnits); + } + public void displayRenameUnit (Object... objects) { + @SuppressWarnings("unchecked") + List> selectedUnits = (List>) objects[0]; + if (selectedUnits.size () != 1) { + System.err.println ("coucou pb selectedUnits:"+selectedUnits); + return; + } + Unit unit = (Unit) selectedUnits.get (0); + if (unit.getParent () == null) + return; + String name = jAdecWattDialog.getName (unit.getName ()); + unit.storyTransform (null, null, name, null); + } + public void displayTransformUnit (Object... objects) { + jAdecWattDialog.transform ((Unit) objects[0]); + } + public void displayCopyUnit (Object... objects) { + Unit unit = (Unit) objects[0]; + String name = jAdecWattDialog.getName (unit.getName ()); + if (name == null) + return; + unit.getCopy (name); + } + public void displayNewUnit (Object... objects) { + Unit unit = (Unit) objects[0]; + String name = jAdecWattDialog.getName (unit.getName ()); + if (name == null) + return; + unit.getNewChild (name); + } + public void displayPromoteUnit (Object... objects) { + Unit unit = (Unit) objects[0]; + ImageDB iconDB = adecWatt.getIconDB (); + ImageDB imageDB = adecWatt.getImageDB (); + HashSet> units = new HashSet> (); + TreeSet icons = new TreeSet (); + TreeSet images = new TreeSet (); + unit.findPromote (units, icons, images); + iconDB.renameVisitor (icons); + imageDB.renameVisitor (images); + permanentDB.renameVisitor (units); + if (!jAdecWattDialog.validation ("PromoteConfirmation", unit.getLocalName (), unit.getLocation (), + units, icons, images)) + return; + iconDB.promote (icons); + imageDB.promote (images); + permanentDB.promote (units); + } + public void displayRemoveUnit (Object... objects) { + Unit unit = (Unit) objects[0]; + if (!jAdecWattDialog.validation ("RemoveConfirmation", unit.getLocalName (), unit.getLocation ())) + return; + unit.remove (); + } + public void displayConnection (Object... objects) { + // XXX jAdecWatt.getJWorkspace ((Workspace) objects[0]).updateConnectionLayer (); + } + + // ======================================== + + public void displayDisplayItem (Object... objects) { + @SuppressWarnings ("unchecked") + List> selectedItems = (List>) objects[0]; + jAdecWattDialog.display (false, selectedItems); + } + public void displayModifyItem (Object... objects) { + @SuppressWarnings("unchecked") + List> selectedItems = (List>) objects[0]; + jAdecWattDialog.display (true, selectedItems); + } + public void displayHideShowItem (Object... objects) { + JWorkspaceView jWorkspaceView = (JWorkspaceView) objects[0]; + @SuppressWarnings ("unchecked") + List selectedItems = (List) objects[1]; + Boolean hidden = (Boolean) objects[2]; + jWorkspaceView.hideShowItem (selectedItems, hidden); + } + public void displayTransformItem (Object... objects) { + jAdecWattDialog.transform ((Item) objects[0]); + } + public void displayCopyItem (Object... objects) { + JWorkspaceView jWorkspaceView = (JWorkspaceView) objects[0]; + @SuppressWarnings ("unchecked") + List selectedItems = (List) objects[1]; + Point pos = (Point) objects[2]; + jWorkspaceView.cloneItem (selectedItems.get (0), pos); + } + public void displayRemoveItem (Object... objects) { + JWorkspaceView jWorkspaceView = (JWorkspaceView) objects[0]; + @SuppressWarnings ("unchecked") + List selectedItems = (List) objects[1]; + jWorkspaceView.eraseItem (selectedItems); + } + @SuppressWarnings ("unchecked") + public void displaySetSelectionItems (Object... objects) { + try { + jAdecWatt.getJWorkspace ((Workspace) objects[0]).setSelectedItems ((List) objects[1]); + } catch (Exception e) { + } + } + + // ======================================== + public void displayDisplayAcc (Object... objects) { + @SuppressWarnings("unchecked") + List> selectedAccs = (List>) objects[0]; + jAdecWattDialog.display (false, selectedAccs); + } + public void displayModifyAcc (Object... objects) { + @SuppressWarnings("unchecked") + List> selectedAccs = (List>) objects[0]; + jAdecWattDialog.display (true, selectedAccs); + } + public void displayTransformAcc (Object... objects) { + jAdecWattDialog.transform ((Acc) objects[0]); + } + public void displayRemoveAcc (Object... objects) { + JWorkspaceView jWorkspaceView = (JWorkspaceView) objects[0]; + Acc acc = (Acc) objects[1]; + jWorkspaceView.eraseAcc (acc); + } + + // ======================================== + // private Editable lastSelection; + // private Editable lastCopy; + // public void displayEditableSelection (Object... objects) { + // lastSelection = (Editable) objects[0]; + // } + // YYY faire remove/copie/paste avec + + // ======================================== +} + diff --git a/src/java/adecWatt/control/LaunchAdecWatt.java b/src/java/adecWatt/control/LaunchAdecWatt.java new file mode 100644 index 0000000..fb50daa --- /dev/null +++ b/src/java/adecWatt/control/LaunchAdecWatt.java @@ -0,0 +1,77 @@ +package adecWatt.control; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; + +import misc.Bundle; +import misc.Config; +import misc.RemoteUpdate; + +import adecWatt.model.AdecWatt; +import adecWatt.view.JProp; + +public class LaunchAdecWatt { + + // ======================================== + static public void main (String[] args) { + try { + Config.setPWD (LaunchAdecWatt.class); + Config.load ("AdecWatt"); + Bundle.load ("Help"); + Bundle.load ("ToolBar"); + Bundle.load ("Proxy"); + Bundle.load ("RemoteUpdate"); + Bundle.load ("Story"); + Bundle.load ("Controller"); + Bundle.load ("AdecWatt"); + Bundle.load (JProp.AdecWattUser); + + updateShell (); + + final AdecWatt adecWatt = new AdecWatt (); + SwingUtilities.invokeLater (new Runnable () { + public void run () { + AdecWattController adecWattController = new AdecWattController (adecWatt); + adecWatt.broadcastDisplay ("Console", Bundle.getMessage ("Welcome")); + adecWattController.updateUserChangeProfil (); + } + }); + } catch (Exception e) { + File softDir = new File (Config.getPWD ().getParentFile (), "soft"); + File jar = new File (softDir, "UpdatedAdecWatt.jar"); + 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) { + } + } + + // ======================================== +} diff --git a/src/java/adecWatt/control/LaunchUpdatedAdecWatt.java b/src/java/adecWatt/control/LaunchUpdatedAdecWatt.java new file mode 100644 index 0000000..10c7a9c --- /dev/null +++ b/src/java/adecWatt/control/LaunchUpdatedAdecWatt.java @@ -0,0 +1,22 @@ +package adecWatt.control; + +import java.io.File; + +import misc.Config; +import misc.RemoteUpdate; + +public class LaunchUpdatedAdecWatt { + + // ======================================== + static public void main (String[] args) { + Config.setPWD (LaunchUpdatedAdecWatt.class); + File dir = Config.getPWD ().getParentFile (); + RemoteUpdate.renameNewFile (dir); + + File softDir = new File (dir, "soft"); + File jar = new File (softDir, "AdecWatt.jar"); + RemoteUpdate.launch (jar); + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/Acc.java b/src/java/adecWatt/model/Acc.java new file mode 100644 index 0000000..04ce42b --- /dev/null +++ b/src/java/adecWatt/model/Acc.java @@ -0,0 +1,198 @@ +// XXX test eclipse + +package adecWatt.model; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.geom.AffineTransform; +import java.awt.geom.Ellipse2D; +import java.awt.geom.GeneralPath; +import java.awt.geom.Path2D; +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.Collection; +import misc.DimensionDouble; +import misc.ScaledImage; +import misc.Story; + +import adecWatt.model.unit.Accessory; +import adecWatt.model.unit.Workspace; +import adecWatt.model.xml.XmlAcc; + +public class Acc extends Embedded, Acc> { + // ======================================== + public Collection getModifiersSet () { return AccModifiersSet; } + public AccTypeEnum getTypeToken () { return AccTypeEnum.Accessory; } + public AccAttrEnum getNameToken () { return AccAttrEnum.Name; } + public AccAttrEnum getModifierToken () { return AccAttrEnum.Modifier; } + public AccAttrEnum getPlaceIdToken () { return AccAttrEnum.Placeid; } + public AccAttrEnum getModelToken () { return AccAttrEnum.Model; } + + public Workspace getStoryUnit () { return ((Comp)container).container; } + public Acc getLink (Editable support) { return new Acc (name, placeId, support, (Accessory) model); } + + // ======================================== + public Acc (Editable support, XmlAcc xmlAcc) { + super (support, xmlAcc); + } + public Acc (String name, String placeName, Editable support, Accessory model) { + super (name, placeName, support, model); + } + public Acc (Editable support, Accessory model) { + super (null, "", support, model); + } + public Acc clone (Editable support) { + Acc result = new Acc (support, (Accessory) model); + result.importFrom (this); + return result; + } + + // ======================================== + public boolean search (String text) { + if (getName ().toLowerCase ().indexOf (text) >= 0 || + getLocalName ().toLowerCase ().indexOf (text) >= 0 || + getId ().indexOf (text) >= 0) + return true; + return false; + } + + public String getCircuit (Comp realContainer) { + String result = super.getCircuit (); + if (result != null) + return result; + return realContainer.getCircuit (); + } + public double getWatt (Comp realContainer) { + double result = super.getWatt (); + if (result > 0) + return result; + return realContainer.getWatt (); + } + + // ======================================== + public void validateContainer (Story.Commands commands, String commandName) { + container.validateContainer (commands, commandName); + if (container.getLocalEmbedded (getId ()) == this) + return; + Story story = commands.getStory (); + commands.add (story.new Command (commandName) { + @SuppressWarnings ("unchecked") + public void exec () { ((Editable>) container).addEmbedded (Acc.this); } + @SuppressWarnings ("unchecked") + public void undo () { ((Editable>) container).removeEmbedded (Acc.this); } + public void display () { container.updateView (); } + }); + } + + public void storyChange (Story.Commands commands, ArrayList changeProps) { + storyChange (commands, true, ownProps, changeProps); + } + public void storyTransform (Story.Commands commands, Collection modifiers, Unit permanent, String newName, ArrayList transProps) { + storyTransform (commands, null, modifiers, permanent, ownProps, transProps); + } + public void updateView () { + ((Comp) container).updateView (); + } + + // ======================================== + public void changeConnectedTo (String connectedTo) { + getLocalProp (Prop.PropConnectedTo, Prop.PropTypeEnum.Text).setValue (connectedTo); + } + public void changeConnectedOn (String connectedOn) { + getLocalProp (Prop.PropConnectedOn, Prop.PropTypeEnum.Text).setValue (connectedOn); + } + + // ======================================== + public String toString () { + return getName (); + } + + // ======================================== + public void print (Graphics2D printGraphics, Comp comp) { + Point2D.Double accPos = getPos (); + DimensionDouble accSize = getSize (); + ScaledImage accIcon = getIcon (); + if (comp.isLow ()) { + ScaledImage scaledLowImage = getLowIcon (); + if (scaledLowImage != null) + accIcon = scaledLowImage; + } + Color accColor = getColor (); + if (accColor != null) + accIcon = comp.getAdecWatt ().getIconDB ().getColoredScaledImages (accIcon, accColor); + DimensionDouble compSize = comp.getSize (); + if (accSize.width < 0) + accSize.width *= -compSize.width; + if (accSize.height < 0) + accSize.height *= -compSize.height; + accPos.x = accPos.x < 0 ? (-accPos.x-.5)*(compSize.width-accSize.width) : accPos.x - (compSize.width-accSize.width)/2.; + accPos.y = accPos.y < 0 ? (-accPos.y-.5)*(compSize.height-accSize.height) : accPos.y - (compSize.height-accSize.height)/2.; + // XXX double accThetaDegree = acc.getThetaDegree (); + double thetaDegree = comp.getThetaDegree (); + AffineTransform at = AffineTransform.getRotateInstance (Math.toRadians ((int) thetaDegree)); + double [] center = new double [] {accPos.x, accPos.y}; + at.transform (center, 0, center, 0, 1); + Point2D.Double compPos = comp.getPos (); + Point2D.Double absPos = new Point2D.Double (compPos.getX ()+center[0], compPos.getY ()+center[1]); + String id = getId (); + comp.accCenter.put (id, absPos); + comp.accSize.put (id, accSize); + Workspace.printImage (printGraphics, accIcon, absPos, accSize, thetaDegree, null); + Workspace.printText (printGraphics, getLabel (), getLabelColor (), absPos, accSize, thetaDegree); + } + + // ======================================== + static public final BasicStroke solidConnection = new BasicStroke (2, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND); + static public final Color connectionColor = Color.GRAY; + static public final Color boxColor = new Color (0, 1, 0, .5F); + static public final Color warningColor = new Color (1, .5F, 0, .7F); + static public final Color errorColor = new Color (1, 0, 0, .7F); + static public final Color circuitColor = Color.BLACK; + + static public void printCircuit (Graphics2D connectionGraphics, double printScale, Point2D center, Circuits.CircuitState circuitState) { + printCircuit (connectionGraphics, center, circuitState, 20/printScale); + } + static public void printCircuit (Graphics2D connectionGraphics, Point2D center, Circuits.CircuitState circuitState, double boxSide) { + Ellipse2D.Double box = new Ellipse2D.Double (center.getX ()-boxSide/2, center.getY ()-boxSide/2, boxSide, boxSide); + Color color = boxColor; + switch (circuitState.state) { + case PLUG: + break; + case LOOP: + case UNPLUG: + color = warningColor; + break; + case SHORTCUT: + color = errorColor; + } + connectionGraphics.setPaint (color); + connectionGraphics.fill (box); + if (circuitState.name == null) + return; + Workspace.printText (connectionGraphics, String.format ("%2s", circuitState.name), + circuitColor, center, new DimensionDouble (boxSide, boxSide)); + } + + static public void printConnection (Graphics2D connectionGraphics, double printScale, Point2D begin, Point2D end) { + printConnection (connectionGraphics, begin, end, + 20/printScale, new BasicStroke ((float)(2/printScale), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); + } + static public void printConnection (Graphics2D connectionGraphics, Point2D begin, Point2D end, double boxSide) { + printConnection (connectionGraphics, begin, end, boxSide, solidConnection); + } + static public void printConnection (Graphics2D connectionGraphics, Point2D begin, Point2D end, + double boxSide, BasicStroke solidConnection) { + GeneralPath gp = new GeneralPath (Path2D.WIND_NON_ZERO); + gp.moveTo (begin.getX (), begin.getY ()); + if (Math.abs (begin.getX ()-end.getX ()-1) < Math.abs (begin.getY ()-end.getY ())) + gp.curveTo (begin.getX (), end.getY (), end.getX (), begin.getY (), end.getX (), end.getY ()); + else + gp.curveTo (end.getX (), begin.getY (), begin.getX (), end.getY (), end.getX (), end.getY ()); + connectionGraphics.setPaint (connectionColor); + connectionGraphics.setStroke (solidConnection); + connectionGraphics.draw (gp); + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/AdecWatt.java b/src/java/adecWatt/model/AdecWatt.java new file mode 100644 index 0000000..22ee5d0 --- /dev/null +++ b/src/java/adecWatt/model/AdecWatt.java @@ -0,0 +1,119 @@ +package adecWatt.model; + +import java.io.File; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.TreeMap; +import javax.swing.JOptionPane; + +import misc.Bundle; +import misc.Config; +import misc.RemoteUpdate; +import misc.StateNotifier; +import misc.Story; + +/** + */ +public class AdecWatt extends StateNotifier { + + static public final double lowLevel = 0.3; + + static public final String + BroadcastUnitRoots = "UnitRoots", + BroadcastConsole = "Console", + BroadcastUnitStory = "UnitStory", + BroadcastStory = Story.BroadcastStory, + BroadcastTitle = "Title", + BroadcastUpdateUnitTree = "UpdateUnitTree", //UpdateWorkspaceTree + BroadcastUpdateWorkspace = "UpdateWorkspace"; + + // ======================================== + private ImageDB iconDB = new ImageDB (this, ImageDB.iconDirName); + private ImageDB imageDB = new ImageDB (this, ImageDB.imageDirName); + private PermanentDB permanentDB = new PermanentDB (this); + private InseeDB inseeDB; + private User user = new User (); + private boolean + handleGlue = Config.getBoolean ("HandleGlue", true), + boundGlue = Config.getBoolean ("BoundGlue", true), + gridGlue = Config.getBoolean ("GridGlue", true), + inSegmentGlue = Config.getBoolean ("InSegmentGlue", true); + + public User getUser () { return user; } + public PermanentDB getPermanentDB () { return permanentDB; } + public ImageDB getIconDB () { return iconDB; } + public ImageDB getImageDB () { return imageDB; } + public InseeDB getInseeDB () { return inseeDB; } + public Hashtable> getNamedRoots () { return permanentDB.namedRoots; } + public boolean getHandleGlue () { return handleGlue; } + public boolean getBoundGlue () { return boundGlue; } + public boolean getGridGlue () { return gridGlue; } + public boolean getInSegmentGlue () { return inSegmentGlue; } + public void setHandleGlue (boolean handleGlue) { Config.setBoolean ("HandleGlue", this.handleGlue = handleGlue); } + public void setBoundGlue (boolean boundGlue) { Config.setBoolean ("BoundGlue", this.boundGlue = boundGlue); } + public void setGridGlue (boolean gridGlue) { Config.setBoolean ("GridGlue", this.gridGlue = gridGlue); } + public void setInSegmentGlue (boolean inSegmentGlue) { Config.setBoolean ("InSegmentGlue", this.inSegmentGlue = inSegmentGlue); } + + // ======================================== + public AdecWatt () { + reset (); + } + + public void reloadSoft () { + if (JOptionPane.showConfirmDialog (null, Bundle.getMessage ("UpdateSoft"), + Bundle.getTitle ("UpdateSoft"), + JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) + return; + File softDir = new File (Config.getPWD ().getParentFile (), "soft"); + File jar = new File (softDir, "UpdatedAdecWatt.jar"); + RemoteUpdate.launch (jar); + } + + public void reset () { + File dir = Config.getPWD ().getParentFile (); + RemoteUpdate.renameNewFile (dir); + if (RemoteUpdate.newFileExists (dir)) + reloadSoft (); + iconDB.reload (); + imageDB.reload (); + permanentDB.reload (); + inseeDB = InseeDB.readDocument (Config.getDataUrl ("data", "server", "Insee.xml")); + broadcastUpdate (BroadcastUnitRoots); + } + + public void updateStory () { + broadcastUpdate (BroadcastStory); + } + + + // ======================================== + public void newNamePlan () { + TreeMap iconMap = iconDB.newNamePlan (); + TreeMap imageMap = imageDB.newNamePlan (); + permanentDB.newNamePlan (iconMap, imageMap); + saveAll (); + } + + // ======================================== + public boolean getModified () { + for (Unit unit : permanentDB.idUnit.values ()) + if (unit.story.isModified ()) + return true; + return false; + } + + // ======================================== + public void saveAll () { + for (Unit root : permanentDB.namedRoots.values ()) { + // if (root.story.isModified ()) + // root.save (); + for (Enumeration e = root.unitNode.depthFirstEnumeration (); e.hasMoreElements (); ) { + Unit unit = ((UnitNode) e.nextElement ()).getUnit (); + if (unit.story.isModified ()) + unit.save (); + } + } + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/Circuits.java b/src/java/adecWatt/model/Circuits.java new file mode 100644 index 0000000..7c9e3e4 --- /dev/null +++ b/src/java/adecWatt/model/Circuits.java @@ -0,0 +1,171 @@ +package adecWatt.model; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.Set; +import java.util.TreeSet; + +import adecWatt.model.unit.Building; +import adecWatt.model.unit.Workspace; + +public class Circuits { + + static public enum State { + PLUG, LOOP, SHORTCUT, UNPLUG; + } + static public String SHORTCUT = "Shortcut"; + static public String UNPLUG = "Unplug"; + static public String CIRCUITLESS = "Circuitless"; + + static public Comparator lineComparator = + new Comparator () { + public int compare (String s1, String s2) { + if (s1 == s2) + return 0; + try { + int i1 = Integer.parseInt (s1); + int i2 = Integer.parseInt (s2); + return i1-i2; + } catch (Exception e) { + } + return s1.compareTo (s2); + } + }; + + static public class Circuit { + HashSet nodes = new HashSet (); + TreeSet names = new TreeSet (lineComparator); + int consumption; + Circuit (HashSet nodes, String name, int consumption) { + add (nodes, name, consumption); + } + void add (HashSet nodes, String name, int consumption) { + this.nodes.addAll (nodes); + this.consumption += consumption; + if (name == null || name.isEmpty ()) + return; + names.add (name); + } + } + + private HashSet loop = new HashSet (); + private HashMap allCircuits = new HashMap (); + private HashSet plugedComps; + + public Set keySet () { return allCircuits.keySet (); } + public Circuit get (Comp lastComp) { return allCircuits.get (lastComp); } + public HashSet getPlugedComps () { return plugedComps; } + public boolean inLoop (Acc acc) { return loop.contains (acc); } + + public Circuits (HashMap linked, HashSet plugedComps) { + this (linked); + this.plugedComps = plugedComps; + } + public Circuits (HashMap linked) { + loopStart: + for (Acc beginAcc : linked.keySet ()) { + Comp beginComp = (Comp) beginAcc.getContainer (); + int consumption = (int) beginAcc.getWatt (beginComp); + HashSet nodes = new HashSet (); + nodes.add (beginAcc); + String name = beginAcc.getCircuit (beginComp); + Comp lastComp = null; + parseThread: + for (;;) { + Comp nextComp = linked.get (beginAcc); + if (nextComp == null) + break; + lastComp = nextComp; + for (String nextAccId : nextComp.getEmbeddedIds ()) + try { + Acc nextAcc = nextComp.findEmbedded (nextAccId); + if (nextAcc.getConnectedTo () == null) + continue; + if (nodes.contains (nextAcc)) { + loop.addAll (nodes); + continue loopStart; + } + nodes.add (nextAcc); + beginAcc = nextAcc; + continue parseThread; + } catch (Exception e) { + } + break; + } + Circuit circuit = allCircuits.get (lastComp); + if (circuit == null) { + allCircuits.put (lastComp, new Circuit (nodes, name, consumption)); + continue; + } + circuit.add (nodes, name, consumption); + } + } + + static public Circuits getCircuits (Workspace workspace, String plugId) { + Hashtable namedComps = new Hashtable (); + for (Item item : workspace.getInheritedEmbeddedValues ()) + try { + namedComps.put (item.getId (), (Comp) item); + } catch (Exception e) { + } + Building building = workspace.getBuilding (); + if (building != null) + for (Item item : building.getInheritedEmbeddedValues ()) + try { + namedComps.putIfAbsent (item.getId (), (Comp) item); + } catch (Exception e) { + } + HashSet plugedComps = new HashSet (); + HashMap linked = new HashMap (); + for (Comp beginComp : namedComps.values ()) { + if (beginComp.isReserved ()) + continue; + for (String accId : beginComp.getEmbeddedIds ()) + try { + Acc beginAcc = beginComp.findEmbedded (accId); + if (beginAcc.getDirectUnit ().isDescendingFrom (plugId)) + plugedComps.add (beginComp); + Comp nextComp = namedComps.get (beginAcc.getConnectedTo ()); + linked.put (beginAcc, nextComp); + } catch (Exception e) { + } + } + return new Circuits (linked, plugedComps); + } + + static public class CircuitState { + public String name; + public State state; + public CircuitState (State state, String name) { + this.name = name; + this.state = state; + } + } + + public CircuitState getState (Comp comp, Acc acc) { + if (acc == null) + return null; + String circuitName = acc.getCircuit (comp); + if (loop.contains (acc)) + return new CircuitState (State.LOOP, circuitName); + for (Comp lastComp : allCircuits.keySet ()) { + Circuit circuit = allCircuits.get (lastComp); + if (!circuit.nodes.contains (acc)) + continue; + switch (circuit.names.size ()) { + case 0: + return null; + case 1: + // XXX limitation pour doublette ? + // if (circuitName == null) + // return null; + return new CircuitState (lastComp.getLine () == null ? State.UNPLUG : State.PLUG, circuit.names.first ()); + default: + return new CircuitState (State.SHORTCUT, circuitName); + } + } + return circuitName == null ? null : new CircuitState (State.UNPLUG, circuitName); + } +} diff --git a/src/java/adecWatt/model/Comp.java b/src/java/adecWatt/model/Comp.java new file mode 100644 index 0000000..4930f50 --- /dev/null +++ b/src/java/adecWatt/model/Comp.java @@ -0,0 +1,121 @@ +package adecWatt.model; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.geom.Point2D; +import java.util.Collection; +import java.util.HashSet; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import misc.DimensionDouble; +import misc.ScaledImage; +import adecWatt.model.unit.NonWorkspace; +import adecWatt.model.unit.Workspace; +import adecWatt.model.xml.XmlComp; + +public class Comp extends Item { + // ======================================== + public int available; + + // ======================================== + public Collection getModifiersSet () { return CompModifiersSet; } + public CompTypeEnum getTypeToken () { return CompTypeEnum.Component; } + public CompAttrEnum getNameToken () { return CompAttrEnum.Name; } + public CompAttrEnum getModifierToken () { return CompAttrEnum.Modifier; } + public CompAttrEnum getPlaceIdToken () { return CompAttrEnum.Placeid; } + public CompAttrEnum getModelToken () { return CompAttrEnum.Model; } + + public Comp getLink (Editable workspace) { return new Comp (name, placeId, (Workspace) workspace, model); } + + // ======================================== + public Comp (Workspace workspace, XmlComp xmlComp) { + super (workspace, xmlComp); + try { + available = Integer.parseInt (xmlComp.getFacet (CompAttrEnum.Available)); + } catch (Exception e) { + } + } + public Comp (String name, String placeName, Workspace workspace, NonWorkspace model) { + super (name, placeName, workspace, model); + } + public Comp (Workspace workspace, NonWorkspace model) { + super (null, null, workspace, model); + } + public Comp clone (Workspace workspace) { + Comp result = new Comp (workspace, model); + result.importFrom (this); + return result; + } + + // ======================================== + public Element getXml (Node parent, Document document) { + Element child = super.getXml (parent, document); + if (isReserved ()) + XmlComp.putFacet (child, CompAttrEnum.Available, ""+available); + return child; + } + + // ======================================== + public void changeThetaDegree (double thetaDegree) { + if (isSticky ()) + return; + getLocalProp (Prop.PropRot, Prop.PropTypeEnum.Cube).setThetaDegree (thetaDegree); + } + public void changeSize (DimensionDouble size) { + if (isSticky ()) + return; + getLocalProp (Prop.PropSize, Prop.PropTypeEnum.Cube).setSize (size); + } + + // ======================================== + public String getLine () { + try { + String name = getPropVal (Prop.PropLine).sValue; + if (!name.isEmpty ()) + return name; + } catch (Exception e) { + } + return null; + } + + // ======================================== + public HashSet allPlugs = new HashSet (); + public static String plugId; + + public void print (Graphics2D printGraphics, Workspace workspace, String plugId) { + this.plugId = plugId; + print (printGraphics, workspace, getPos (), getSize (), getThetaDegree ()); + } + + public void print (Graphics2D printGraphics, Workspace workspace, Point2D pos, DimensionDouble size, double thetaDegree) { + accCenter.clear (); + accSize.clear (); + allPlugs.clear (); + ScaledImage scaledImage = getIcon (); + if (isLow ()) { + ScaledImage scaledLowImage = getLowIcon (); + if (scaledLowImage != null) + scaledImage = scaledLowImage; + } + Color compColor = getColor (); + if (compColor != null) + scaledImage = getAdecWatt ().getIconDB ().getColoredScaledImages (scaledImage, compColor); + Workspace.printImage (printGraphics, scaledImage, pos, size, thetaDegree, getTileSize ()); + double minSide = Math.min (size.width, size.height); + Workspace.printText (printGraphics, getLabel (), getLabelColor (), pos, new DimensionDouble (minSide, minSide)); + for (String accId : getEmbeddedIds ()) + try { + Acc acc = findEmbedded (accId); + acc.print (printGraphics, this); + if (acc.getDirectUnit ().isDescendingFrom (plugId)) { + workspace.addPlugedComps (this); + allPlugs.add (acc); + } + } catch (Exception e) { + } + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/Editable.java b/src/java/adecWatt/model/Editable.java new file mode 100644 index 0000000..7f3c40c --- /dev/null +++ b/src/java/adecWatt/model/Editable.java @@ -0,0 +1,1095 @@ +package adecWatt.model; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.Vector; +import javax.swing.ImageIcon; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import misc.DimensionDouble; +import misc.ScaledImage; +import misc.Story; +import misc.Util; + +import adecWatt.model.unit.Building; +import adecWatt.model.xml.*; + +public abstract class Editable

, + T extends Enum, + A extends Enum, + E extends Embedded> + extends Permanent { + // ======================================== + static public final String + StoryAddAcc = "AddAcc", + StoryAddItem = "AddItem", + StoryAddProp = "AddProp", + StoryAddSpinProp = "AddSpinProp", + StoryChangeBuilding = "ChangeBuilding", + StoryChangeEnum = "ChangeEnum", + StoryChangeLabels = "ChangeLabels", + StoryChangeModifiers = "ChangeModifiers", + StoryChangeName = "ChangeName", + StoryChangeParent = "ChangeParent", + StoryChangeSpin = "ChangeSpin", + StoryChangeType = "ChangeType", + StoryChangeValue = "ChangeValue", + StoryClearProp = "ClearProp", + StoryCloneItem = "CloneItem", + StoryConnectAcc = "ConnectAcc", + StoryEdit = "Edit", + StoryHideItem = "HideItem", + StoryLinkAcc = "LinkAcc", + StoryLinkEmb = "LinkEmb", + StoryLinkItem = "LinkItem", + StoryMoveItem = "MoveItem", + StoryOrderedProp = "OrderedProp", + StoryPasteItem = "PasteItem", + StoryRemoveAcc = "RemoveAcc", + StoryRemoveEnum = "RemoveEnum", + StoryRemoveItem = "RemoveItem", + StoryRemoveLabels = "RemoveLabels", + StoryRemoveProp = "RemoveProp", + StoryRotItem = "RotItem", + StoryRotResizeItem = "RotResizeItem", + StorySelectItem = "SelectItem", + StoryTransform = "Transform"; + + // ======================================== + protected Hashtable ownProps = new Hashtable (); + protected String embeddedPrefix = "c"; // XXX dans Unit et pas dans comp + private int embIdCount; + protected Hashtable embedded; + + // ======================================== + public abstract AdecWatt getAdecWatt (); + public abstract String getId (); + public abstract Editable getParent (); + public abstract Unit getDirectUnit (); + public abstract Unit getParentUnit (); + public abstract Unit getStoryUnit (); + public abstract Editable getModel (); + public Editable getContainer () { return null; } + + // public boolean hasChild (String childName) { return false; } + public E getLocalEmbedded (String id) { return embedded == null ? null : embedded.get (id); } + public Hashtable getLocalEmbedded () { return embedded; } + + public abstract void setParentUnit (Unit parent); + + public boolean match (String text) { + return + Util.removeAccent (getName ()).toLowerCase ().indexOf (text) >= 0 || + Util.removeAccent (getLocalName ()).toLowerCase ().indexOf (text) >= 0 || + getId ().indexOf (text) >= 0; + } + + public boolean parentMatch (String text) { + for (Editable editable = this; editable != null; editable = editable.getParentUnit ()) + if (editable.match (text)) + return true; + return false; + } + + // ======================================== + private ArrayList reservedEmbName; + private boolean isReservedEmbName (String name) { + return reservedEmbName != null && reservedEmbName.contains (name); + } + private void reservedEmbName (String name) { + if (reservedEmbName == null) + reservedEmbName = new ArrayList (); + reservedEmbName.add (name); + } + private void freeEmbName (String name) { + if (reservedEmbName == null) + return; + reservedEmbName.remove (name); + if (reservedEmbName.size () == 0) + reservedEmbName = null; + } + public String getUniqName () { + String thisId = getId (); + for (; ; embIdCount++) { + String embeddedName = embeddedPrefix+embIdCount; + if (embedded != null && embedded.containsKey (thisId+":"+embeddedName)) + continue; + if (isReservedEmbName (embeddedName)) + continue; + reservedEmbName (embeddedName); + return embeddedName; + } + } + @SuppressWarnings ("unchecked") + public E getCloseEmbedded (E emb) { + if (embedded == null) + embedded = new Hashtable (); + E result = embedded.get (emb.getId ()); + if (result == null) + // attention emb doit exister ! + result = (E) emb.getLink (this); + return result; + } + @SuppressWarnings ("unchecked") + public E findEmbedded (String id) { + for (Editable editable = this; + editable != null; + editable = editable.getParent ()) { + E emb = editable.getLocalEmbedded (id); + if (emb != null) + return emb; + } + Editable model = getModel (); + if (model != null) + for (Editable editable = (Editable) model; + editable != null; + editable = editable.getParent ()) { + E emb = editable.getLocalEmbedded (id); + if (emb != null) + return emb; + } + return null; + } + public E findEmbeddedRootOf (Unit model) { + for (String embId : getEmbeddedIds ()) { + E emb = findEmbedded (embId); + if (emb == null || !model.isDescendingFrom (emb.getModel ().getId ())) + continue; + return emb; + } + return null; + } + + public E findEmbeddedBaseOn (String parentId) { + for (String embId : getEmbeddedIds ()) { + E emb = findEmbedded (embId); + if (emb == null || !emb.getDirectUnit ().isDescendingFrom (parentId)) + continue; + return emb; + } + return null; + } + + public TreeSet getEmbeddedIds () { + TreeSet result = new TreeSet (); + for (Editable editable = this; editable != null; editable = editable.getParent ()) { + if (editable.embedded == null) + continue; + result.addAll (editable.embedded.keySet ()); + } + Editable model = getModel (); + if (model != null) + for (Editable editable = model; editable != null; editable = editable.getParent ()) { + if (editable.embedded == null) + continue; + result.addAll (editable.embedded.keySet ()); + } + return result; + } + + // ======================================== + public void addEmbedded (E emb) { + if (embedded == null) + embedded = new Hashtable (); + String embId = emb.getId (); + if (embedded.get (embId) != null) + System.err.println ("Already embedded name recorded ("+embId+" = "+emb.getName ()+" in "+name+")."); + embedded.put (embId, emb); + freeEmbName (embId); + } + public void removeEmbedded (E emb) { + if (embedded == null) + return; + embedded.remove (emb.getId ()); + } + public Collection getInheritedEmbeddedValues () { + Hashtable inherited = getInheritedEmbedded (); + if (inherited == null) + return new Vector (); + return inherited.values (); + } + + @SuppressWarnings ("unchecked") + public Hashtable getInheritedEmbedded () { + Editable parent = getParent (); + if (parent == null) + return embedded; + Hashtable result = parent.getInheritedEmbedded (); + if (result == null) + return embedded; + if (embedded == null) + return result; + result = (Hashtable) result.clone (); + // for (String key : embedded.keySet ()) + // result.put (key, embedded.get (key)); + result.putAll (embedded); + return result; + } + @SuppressWarnings ("unchecked") + public Hashtable getAllEmbedded () { + // + + // si workspace le dernier building dans les getparentunit + // si comp le dernier modèle dans le + Editable pattern = getModel (); + Hashtable result = getInheritedEmbedded (); + if (pattern == null) + return result; + Hashtable resultP = (Hashtable) pattern.getInheritedEmbedded (); + if (result == null) + return resultP; + if (resultP == null) + return result; + resultP = (Hashtable) resultP.clone (); + resultP.putAll (result); + return resultP; + } + + public abstract void storyChange (Story.Commands commands, ArrayList changeProps); + public abstract void storyTransform (Story.Commands commands, Collection modifiers, Unit permanent, String newName, ArrayList transProps); + public void storyTransform (Collection modifiers, Unit permanent, String newName, ArrayList transProps) { + Story story = getStoryUnit ().story; + Story.Commands commands = story.new Commands (StoryTransform) { + public void display () { updateView (); } + }; + storyTransform (commands, modifiers, permanent, newName, transProps); + story.add (commands); + } + + // ======================================== + protected Editable () { + } + protected Editable (P xmlPermanent) { + super (xmlPermanent); + collectOwnProps (); + } + protected void initXml (P xmlPermanent) { + super.initXmlAvantOwnProp (xmlPermanent); + collectOwnProps (); + } + public void collectEmbedded () { + if (xmlPermanent == null) + return; + for (XmlAcc xmlAcc : xmlPermanent.getAccs ()) { + Acc acc = new Acc (this, xmlAcc); + acc.fixName (false); + } + } + + // ======================================== + public void importFrom (Editable from) { + super.importFrom (from); + for (String propName : from.ownProps.keySet ()) + ownProps.putIfAbsent (propName, from.ownProps.get (propName).clone ()); + if (from.embedded == null) + return; + if (embedded == null) + embedded = new Hashtable (); + // XXX ??? n'y a-t-il pas partage des emb ? + for (String embId : from.embedded.keySet ()) + embedded.putIfAbsent (embId, from.embedded.get (embId)); + } + + public void newNamePlan (HashSet> visited, TreeMap iconMap, TreeMap imageMap) { + if (visited.contains (this)) + return; + visited.add (this); + if (embedded != null) + for (E emb : embedded.values ()) + emb.newNamePlan (visited, iconMap, imageMap); + Story story = getStoryUnit ().story; + Story.Commands commands = story.new Commands (StoryEdit) { + public void display () { } + }; + for (String propName : ownProps.keySet ()) { + final Prop prop = getPropVal (propName); + if (prop == null) + continue; + TreeMap map = null; + switch (prop.getTypeToken ()) { + case Icon: + map = iconMap; + break; + case Image: + map = imageMap; + break; + default: + continue; + } + final String newValue = map.get (prop.sValue); + if (newValue == null) + continue; + commands.add (story.new Command (StoryChangeValue+" "+prop.name) { + String oldValue = prop.sValue; + public void exec () { prop.setValue (newValue); } + public void undo () { prop.setValue (oldValue); } + }); + } + story.add (commands); + } + public boolean renameUnits (TreeMap translateMap) { + Editable parent = getParent (); + boolean result = parent != null && translateMap.containsValue (parent.getId ()); + if (embedded != null) + for (E emb : embedded.values ()) + result |= emb.renameUnits (translateMap); + for (String propName : ownProps.keySet ()) { + Prop prop = getPropVal (propName); + if (prop == null) + continue; + switch (prop.getTypeToken ()) { + case Text: + case Building: + String newVal = translateMap.get (prop.sValue); + if (newVal != null) { + prop.sValue = newVal; + result = true; + continue; + } + int idx = prop.sValue.indexOf (":"); + if (idx < 0) + continue; + newVal = translateMap.get (prop.sValue.substring (0, idx)); + if (newVal == null) + continue; + prop.sValue = newVal+prop.sValue.substring (idx); + result = true; + } + } + return result; + } + public boolean renameImages (TreeMap translateMap) { + boolean result = false; + if (embedded != null) + for (E emb : embedded.values ()) + result |= emb.renameImages (translateMap); + for (String propName : ownProps.keySet ()) { + Prop prop = getPropVal (propName); + if (prop == null) + continue; + switch (prop.getTypeToken ()) { + case Icon: + case Image: + String newVal = translateMap.get (Util.getBase (prop.sValue)); + if (newVal == null) + continue; + prop.sValue = newVal; + result = true; + break; + } + } + return result; + } + public void getLocalLink (HashSet> visited, + HashSet> unitLinks, TreeSet iconsLinks, TreeSet imagesLinks) { + if (visited.contains (this)) + return; + visited.add (this); + if (embedded != null) + for (E emb : embedded.values ()) + emb.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks); + for (String propName : ownProps.keySet ()) { + Prop prop = getPropVal (propName); + if (prop == null) + continue; + switch (prop.getTypeToken ()) { + case Icon: + if (!getAdecWatt ().getIconDB ().isRemote (prop.sValue)) + iconsLinks.add (prop.sValue); + break; + case Image: + if (!getAdecWatt ().getImageDB ().isRemote (prop.sValue)) + imagesLinks.add (prop.sValue); + break; + case Building: + Building building = getBuilding (); + if (building == null) + continue; + building.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks); + break; + } + } + } + + // ======================================== + public void removeOwnProp (String propName) { + ownProps.remove (propName); + } + + public void collectOwnProps () { + for (XmlProp xmlProp : xmlPermanent.getProps ()) { + Prop prop = new Prop (xmlProp); + ownProps.put (prop.name, prop); + } + } + public Prop getOwnProp (String propName) { + return ownProps.get (propName); + } + public ArrayList getOrderedOwnProps () { + return Prop.getOrderedProps (ownProps.values ()); + } + public ArrayList getOrderedPropsName () { + Unit parent = getParentUnit (); + ArrayList result = parent == null ? new ArrayList () : parent.getOrderedPropsName (); + for (Prop prop : getOrderedOwnProps ()) { + if (result.contains (prop.name)) + continue; + result.add (prop.name); + } + return result; + } + + public Element getXml (Node parent, Document document) { + Element child = super.getXml (parent, document); + ArrayList tmp = new ArrayList (ownProps.values ()); + tmp.sort (Prop.propComparator); + for (Prop prop : tmp) + prop.getXml (child, document); + if (embedded != null) + for (String embId : embedded.keySet ()) + embedded.get (embId).getXml (child, document); + return child; + } + + // ======================================== + public ScaledImage getIconFromFileName (String fileName, boolean horizontalSpin) { + return getAdecWatt ().getIconDB ().getImage (fileName, horizontalSpin); + } + public ScaledImage getImageFromFileName (String fileName, boolean horizontalSpin) { + return getAdecWatt ().getImageDB ().getImage (fileName, horizontalSpin); + } + public ImageIcon getIcon (int max) { + ScaledImage scaledIcon = getIcon (); + return scaledIcon == null ? null : scaledIcon.getSide (max); + } + + // ======================================== + public interface ComputeProp { + public R applyOnProp (Prop prop); + } + public R parentWalk (String propName, ComputeProp computeProp, boolean skipFirst) { + for (Editable editable = skipFirst ? getParent () : this; + editable != null; + editable = editable.getParent ()) + try { + R result = computeProp.applyOnProp (editable.ownProps.get (propName)); + if (result != null) + return result; + } catch (Exception e) { + } + return null; + } + public R parentAndModelWalk (String propName, ComputeProp computeProp, boolean skipFirst) { + R result = parentWalk (propName, computeProp, skipFirst); + if (result != null) + return result; + try { + result = getContainer ().getModel ().findEmbedded (getId ()).parentWalk (propName, computeProp, false); + if (result != null) + return result; + } catch (Exception e) { + } + try { + result = getModel ().parentWalk (propName, computeProp, false); + if (result != null) + return result; + } catch (Exception e) { + } + return null; + } + + // ======================================== + public Collection getPropModifiers (String propName) { + return getPropModifiers (propName, false); + } + public Collection getParentPropModifiers (String propName) { + return getPropModifiers (propName, true); + } + public Collection getPropModifiers (String propName, boolean skipFirst) { + return parentAndModelWalk (propName, new ComputeProp> () { + public Collection applyOnProp (Prop prop) { + return prop.modifiers; + } + }, skipFirst); + } + public String getPropModifiers (final String modifier, String propName) { + return parentAndModelWalk (propName, new ComputeProp () { + public String applyOnProp (Prop prop) { + if (prop.modifiers.contains (modifier)) + return modifier; + return null; + } + }, false); + } + public Collection getPropEnumChoice (String propName) { + return parentAndModelWalk (propName, new ComputeProp> () { + public Collection applyOnProp (Prop prop) { + if (prop != null && prop.enumChoice != null) + return prop.enumChoice; + return null; + } + }, false); + } + public List getPropLabel (String propName) { + return parentAndModelWalk (propName, new ComputeProp> () { + public List applyOnProp (Prop prop) { + return prop.multiLabel; + } + }, false); + } + public Prop getPropVal (String propName) { + return getPropVal (propName, false); + } + public Prop getParentPropVal (String propName) { + return getPropVal (propName, true); + } + public Prop getPropVal (String propName, boolean skipFirst) { + return parentAndModelWalk (propName, new ComputeProp () { + public Prop applyOnProp (Prop prop) { + if (prop != null && prop.sValue != null) // XXX et "".equals... + return prop; + return null; + } + }, skipFirst); + } + public Prop getProp (String propName) { + return getProp (propName, false); + } + public Prop getParentProp (String propName) { + return getProp (propName, true); + } + public Prop getProp (String propName, boolean skipFirst) { + return parentAndModelWalk (propName, new ComputeProp () { + public Prop applyOnProp (Prop prop) { + return prop; + } + }, skipFirst); + } + public Double[] getPartialProp (String propName, Double[] result) { + return getPartialProp (propName, result, false); + } + public Double[] getParentPartialProp (String propName, Double[] result) { + return getPartialProp (propName, result, true); + } + public Double[] getPartialProp (String propName, final Double[] result, boolean skipFirst) { + return parentAndModelWalk (propName, new ComputeProp () { + public Double[] applyOnProp (Prop prop) { + // XXX test nbVal >= result.length + if (prop != null && prop.values != null) { + boolean complete = true; + for (int i = 0; i < result.length; i++) + if (result [i] == null) { + if (prop.values [i] != null) { + result [i] = prop.values [i]; + continue; + } + complete = false; + } + if (complete) + return result; + } + return null; + } + }, skipFirst); + } + // ======================================== + public interface ComputeSpin { + public boolean getSpin (Prop prop); + } + public boolean parentSpinWalk (String propName, ComputeSpin computeSpin, boolean skipFirst) { + boolean spin = false; + for (Editable editable = skipFirst ? getParent () : this; + editable != null; + editable = editable.getParent ()) + try { + spin ^= computeSpin.getSpin (editable.ownProps.get (propName)); + } catch (Exception e) { + } + return spin; + } + public boolean parentAndModelSpinWalk (String propName, ComputeSpin computeSpin, boolean skipFirst) { + boolean spin = parentSpinWalk (propName, computeSpin, skipFirst); + try { + spin ^= getContainer ().getModel ().findEmbedded (getId ()).parentSpinWalk (propName, computeSpin, false); + } catch (Exception e) { + } + try { + spin ^= getModel ().parentSpinWalk (propName, computeSpin, false); + } catch (Exception e) { + } + return spin; + } + public boolean getPropHorizontalSpin (String propName) { + return getPropHorizontalSpin (propName, false); + } + public boolean getParentPropHorizontalSpin (String propName) { + return getPropHorizontalSpin (propName, true); + } + public boolean getPropHorizontalSpin (String propName, boolean skipFirst) { + return parentSpinWalk (propName, new ComputeSpin () { + public boolean getSpin (Prop prop) { + return prop.horizontalSpin; + } + }, skipFirst); + } + + // ======================================== + public boolean getPropHidden (String propName) { + return getPropModifiers (Permanent.Hidden, propName) != null; + } + public boolean getPropLock (String propName) { + return getPropModifiers (Permanent.Lock, propName) != null; + } + public boolean getPropLocalized (String propName) { + return getPropModifiers (Permanent.Localized, propName) != null; + } + public boolean getPropNoMouse (String propName) { + return getPropModifiers (Permanent.NoMouse, propName) != null; + } + public ScaledImage getIcon () { + return getIconImage (Prop.PropIcon); + } + public ScaledImage getLowIcon () { + return getIconImage (Prop.PropLowIcon); + } + public ScaledImage getBlueprint () { + return getIconImage (Prop.PropBlueprint); + } + public Double getBlueprintVisibility () { + try { + return getPropVal (Prop.PropBlueprintVisibility).values [0]; + } catch (Exception e) { + return null; + } + } + public DimensionDouble getBlueprintSize () { + return getSize (Prop.PropBlueprintSize); + } + public Point2D.Double getBlueprintPos () { + return getPos (Prop.PropBlueprintPos); + } + public ScaledImage getIconImage (String propName) { + return getIconImage (getPropVal (propName), getPropHorizontalSpin (propName)); + } + public ScaledImage getIconImage (Prop iconImageProp, boolean horizontalSpin) { + if (iconImageProp == null) + return null; + switch (iconImageProp.getTypeToken ()) { + case Icon: + return getAdecWatt ().getIconDB ().getImage (iconImageProp.sValue, horizontalSpin); + case Image: + return getAdecWatt ().getImageDB ().getImage (iconImageProp.sValue, horizontalSpin); + default: + throw new IllegalArgumentException ("Bad type ("+iconImageProp.getTypeToken ()+") for icon or image!"); + } + } + private Double dummy; + protected Double [] + seek12 = new Double[] {null, null}, + seek3 = new Double[] {dummy, dummy, null}; + public DimensionDouble getRealSize () { + return getSize (); + } + + // ======================================== + public DimensionDouble getSize () { + return getSize (Prop.PropSize); + } + public Double[] getTileSize () { + Double [] seek = seek12.clone (); + getPartialProp (Prop.PropTileSize, seek); + if (seek[0] == null && seek[1] == null) + return null; + return seek; + } + static public Dimension getTile (Double [] tileSize, DimensionDouble realSize) { + return tileSize == null ? ScaledImage.ONE_TILE : + new Dimension (tileSize[0] == null ? 1 : (int) Math.max (1, Math.round (realSize.width/tileSize[0])), + tileSize[1] == null ? 1 : (int) Math.max (1, Math.round (realSize.height/tileSize[1]))); + } + public DimensionDouble getSize (String propName) { + Double [] seek = seek12.clone (); + getPartialProp (propName, seek); + if (seek[0] == null || seek[1] == null) + return null; + return new DimensionDouble (seek [0], seek [1]); + } + public Point2D.Double getPos () { + return getPos (Prop.PropPos); + } + public Point2D.Double getPos (String propName) { + Double [] seek = seek12.clone (); + getPartialProp (propName, seek); + if (seek[0] == null || seek[1] == null) + return null; + return new Point2D.Double (seek [0], seek [1]); + } + public double getThetaDegree () { + try { + Double [] seek = seek3.clone (); + getPartialProp (Prop.PropRot, seek); + return seek [2]; + } catch (Exception e) { + return 0; + } + } + public double getLevel () { + try { + Double [] seek = seek3.clone (); + getPartialProp (Prop.PropPos, seek); + return seek [2]; + } catch (Exception e) { + return 0; + } + } + public double getLength () { + try { + return getPropVal (Prop.PropLength).values[0]; + } catch (Exception e) { + return 0; + } + } + public double getWidth () { + try { + return getPropVal (Prop.PropWidth).values[0]; + } catch (Exception e) { + return 0; + } + } + public double getAngle () { + try { + return getPropVal (Prop.PropAngle).values[0]; + } catch (Exception e) { + return 0; + } + } + public String getStyle () { + try { + return getPropVal (Prop.PropStyle).sValue; + } catch (Exception e) { + return null; + } + } + public String getBegin () { + try { + return getPropVal (Prop.PropBegin).sValue; + } catch (Exception e) { + return null; + } + } + public String getEnd () { + try { + return getPropVal (Prop.PropEnd).sValue; + } catch (Exception e) { + return null; + } + } + public boolean isLow () { + return getLevel () <= AdecWatt.lowLevel; + } + public Building getBuilding () { + try { + return (Building) getAdecWatt ().getPermanentDB ().getUnitById (getProp (Prop.PropBuilding).sValue); + } catch (Exception e) { + return null; + } + } + public Color getColor () { + try { + return LPColor.getColor (getPropVal (Prop.PropColor).sValue); + } catch (Exception e) { + return Color.black; + } + } + public String getConnectedTo () { + try { + return getPropVal (Prop.PropConnectedTo).sValue; + } catch (Exception e) { + return null; + } + } + public String getConnectedOn () { + try { + return getPropVal (Prop.PropConnectedOn).sValue; + } catch (Exception e) { + return null; + } + } + + // ======================================== + public abstract void updateView (); + + // ======================================== + public void validateContainer (Story.Commands commands, String commandName) { + // unit has no container + } + + // ======================================== + protected void storyChange (Story.Commands commands, boolean comp, final Hashtable ownProps, ArrayList changeProps) { + Story story = commands.getStory (); + validateContainer (commands, StoryLinkEmb); + for (Prop[] changeProp : changeProps) { + final Prop type = changeProp[0]; + Prop parentVal = changeProp[1]; + final Prop src = changeProp [2]; + final Prop dst = changeProp [3] == null ? null : changeProp [3].getApplyMixProp (src, parentVal); + if (dst != null && dst.sValue == Prop.PropMix) + continue; + boolean isParentValue = Prop.isSValue (parentVal); + boolean isDstValue = Prop.isSValue (dst); + boolean changeParentValue = + isParentValue != isDstValue || (isDstValue && !dst.sValue.equals (parentVal.sValue)); + if (src == dst && changeParentValue) + continue; + boolean dstSpin = dst != null && dst.horizontalSpin; + // add + if (src == null) { + if (isDstValue && changeParentValue) { + commands.add (story.new Command (StoryAddProp+" "+dst.name) { + public void exec () { ownProps.put (dst.name, dst); } + public void undo () { ownProps.remove (dst.name); } + }); + continue; + } + if (!dstSpin) + continue; + final Prop newSpin = new Prop (dst.name, dst.getTypeToken (), dst.horizontalSpin); + commands.add (story.new Command (StoryAddSpinProp+" "+newSpin.name) { + public void exec () { ownProps.put (newSpin.name, newSpin); } + public void undo () { ownProps.remove (newSpin.name); } + }); + continue; + } + boolean srcSpin = src != null && (src.horizontalSpin); + boolean changeSpin = (srcSpin != dstSpin) || + (srcSpin && dstSpin && src.horizontalSpin != dst.horizontalSpin); + // change + if (changeSpin) { + final boolean oldHorizontalSpin = src.horizontalSpin; + commands.add (story.new Command (StoryChangeSpin+" "+src.name) { + public void exec () { + src.horizontalSpin = dst.horizontalSpin; + } + public void undo () { + src.horizontalSpin = oldHorizontalSpin; + } + }); + } + if (isDstValue && changeParentValue) { + if (dst.sValue.equals (src.sValue)) + continue; + // XXX a tester si remove partiel de Prop.PropSize ou Prop.PropPos et rien chez parent + // XXX faire modif partiel de multilabel + // XXX peut impliquer un remove + commands.add (story.new Command (StoryChangeValue+" "+dst.name+"<"+src.sValue+","+dst.sValue+">") { + String newValue = dst.sValue; + String oldValue = src.sValue; + public void exec () { src.setValue (newValue); } + public void undo () { src.setValue (oldValue); } + }); + } + // XXX si unit && "name" + // => faire un backup du fichier... mais quand ? + // => refaire héritage => marquer les héritier direct a sauver (boolean changement parent) + // XXX si comp && si size = 0 ou pos hors du Workspace => remove + // XXX si unit ou dérivé dans des workspace && si size = 0 ou pos hors du Workspace => remove + + if (dstSpin || (isDstValue && changeParentValue)) + continue; + // remove + if (comp && (type.name.equals (Prop.PropSize) || type.name.equals (Prop.PropPos))) { + if (!isParentValue) + continue; + Double [] seek = seek12.clone (); + getParentPartialProp (type.name, seek); + if (seek[0] == null || seek[1] == null) + continue; + } + if (getParentProp (type.name) == null || + src.unknownSpin != null || + (src.enumChoice != null && (parentVal == null || !parentVal.getEnumString ().equals (src.getEnumString ()))) || + (src.multiLabel != null && (parentVal == null || !parentVal.getLabelString ().equals (src.getLabelString ()))) || + src.getModifiersString ().equals (getModifiersString (getPropModifiers (src.name))) ) { + final String oldValue = src.sValue; + if (oldValue == null || oldValue.isEmpty ()) + continue; + commands.add (story.new Command (StoryClearProp+" "+src.name) { + public void exec () { src.setValue (null); } + public void undo () { src.setValue (oldValue); } + }); + continue; + } + commands.add (story.new Command (StoryRemoveProp+" "+type.name) { + public void exec () { ownProps.remove (type.name); } + public void undo () { ownProps.put (type.name, src); } + }); + } + } + + // ======================================== + public void storyTransform (Story.Commands commands, final String newName, final Collection newModifiers, + final Unit permanent, final Hashtable ownProps, ArrayList transProps) { + Story story = commands.getStory (); + validateContainer (commands, StoryLinkEmb); + if (newName != null) { + final String oldName = getName (); + if (!newName.equals (oldName)) { + commands.add (story.new Command (StoryChangeName) { + // XXX incidance sur PermanentDB si root ou powerSocket ou powerPlug + public void exec () { Editable.this.name = newName; } + public void undo () { Editable.this.name = oldName; } + public void display () { getDirectUnit ().updateTree (); } + }); + } + } + if (newModifiers != null && !getModifiersString ().equals (getModifiersString (newModifiers))) { + final Collection oldModifiers = getModifiers (); + commands.add (story.new Command (StoryChangeModifiers) { + public void exec () { setModifiers (newModifiers); } + public void undo () { setModifiers (oldModifiers); } + }); + } + if (permanent != null) { + //System.err.println ("coucou change parent:"+getName ()+" => "+permanent.getName ()); + final Unit oldPermanent = getParentUnit (); + if (!(oldPermanent == permanent || + permanent == this || + getParent () == null)) + commands.add (story.new Command (StoryChangeParent) { + public void exec () { setParentUnit (permanent); } + public void undo () { setParentUnit (oldPermanent); } + public void display () { permanent.updateTree (); oldPermanent.updateTree (); getDirectUnit ().updateTree (); } + }); + } + if (transProps != null) { + ArrayList oldProps = new ArrayList (ownProps.values ()); + // change + for (Prop[] transProp : transProps) { + final Prop src = transProp [0]; + final Prop dst = transProp [1]; + if (src == null) + continue; + oldProps.remove (src); + if (src.rank == dst.rank) + continue; + if (src.rank == null || !src.rank.equals (dst.rank)) { + final Integer oldRank = src.rank; + commands.add (story.new Command (StoryOrderedProp+" "+src.name) { + public void exec () { src.rank = dst.rank; } + public void undo () { src.rank = oldRank; } + }); + } + if (!src.getModifiersString ().equals (dst.getModifiersString ())) { + final Collection oldModifiers = src.getModifiers (); + commands.add (story.new Command (StoryChangeModifiers+" "+src.name) { + public void exec () { src.setModifiers (dst.getModifiers ()); } + public void undo () { src.setModifiers (oldModifiers); } + }); + } + if (!src.name.equals (dst.name)) { + final String oldPropName = src.name; + final String newPropName = dst.name; + commands.add (story.new Command (StoryChangeName+" "+oldPropName+" "+newPropName) { + public void exec () { + if (ownProps.get (oldPropName) == src) + ownProps.remove (oldPropName); + src.name = newPropName; + ownProps.put (newPropName, src); + } + public void undo () { + if (ownProps.get (newPropName) == src) + ownProps.remove (newPropName); + src.name = oldPropName; + ownProps.put (oldPropName, src); + } + }); + } + if (src.getTypeToken () != dst.getTypeToken ()) { + final PropTypeEnum oldType = src.getTypeToken (); + final PropTypeEnum newType = dst.getTypeToken (); + commands.add (story.new Command (StoryChangeType+" "+src.name) { + public void exec () { src.setType (newType); } + public void undo () { src.setType (oldType); } + }); + } + if (!src.getEnumString ().equals (dst.getEnumString ())) { + final Collection oldEnum = src.enumChoice; + final Collection newEnum = dst.enumChoice; + commands.add (story.new Command (StoryChangeEnum+" "+src.name) { + public void exec () { src.enumChoice = newEnum; } + public void undo () { src.enumChoice = oldEnum; } + }); + } + if (!src.getLabelString ().equals (dst.getLabelString ())) { + final List oldLabels = src.multiLabel; + final List newLabels = dst.multiLabel; + commands.add (story.new Command (StoryChangeLabels+" "+src.name) { + public void exec () { src.multiLabel = newLabels; } + public void undo () { src.multiLabel = oldLabels; } + }); + } + } + // add + for (Prop[] transProp : transProps) { + Prop src = transProp [0]; + final Prop dst = transProp [1]; + if (src != null) + continue; + final Prop oldSrc = ownProps.get (dst.name); + if (oldSrc != null) { + oldProps.remove (oldSrc); + commands.add (story.new Command (StoryRemoveProp+" "+dst.name) { + public void exec () { ownProps.remove (dst.name); } + public void undo () { ownProps.put (dst.name, oldSrc); } + }); + } + commands.add (story.new Command (StoryAddProp+" "+dst.name) { + public void exec () { ownProps.put (dst.name, dst); } + public void undo () { ownProps.remove (dst.name); } + }); + } + // clean + Unit parent = getParentUnit (); + for (final Prop prop : oldProps) { + // if (prop.enumChoice == null && (parent != null && parent.getProp (prop.name) != null)) + // // XXX enum # parent aussi ? + // continue; + // XXX Et si plus de prop (masquée) ? + if (prop.sValue != null || prop.horizontalSpin) { + final Collection enumChoice = prop.enumChoice; + if (enumChoice != null) + commands.add (story.new Command (StoryRemoveEnum+" "+prop.name) { + public void exec () { prop.enumChoice = null; } + public void undo () { prop.enumChoice = enumChoice; } + }); + final List multiLabel = prop.multiLabel; + if (multiLabel != null) + commands.add (story.new Command (StoryRemoveLabels+" "+prop.name) { + public void exec () { prop.multiLabel = null; } + public void undo () { prop.multiLabel = multiLabel; } + }); + continue; + } + commands.add (story.new Command (StoryRemoveProp+" "+prop.name) { + String oldPropName = prop.name; + public void exec () { + if (ownProps.get (oldPropName) == prop) + ownProps.remove (prop.name); + } + public void undo () { ownProps.put (oldPropName, prop); } + }); + } + } + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/Embedded.java b/src/java/adecWatt/model/Embedded.java new file mode 100644 index 0000000..06db360 --- /dev/null +++ b/src/java/adecWatt/model/Embedded.java @@ -0,0 +1,210 @@ +package adecWatt.model; + +import java.awt.Color; +import java.util.HashSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import adecWatt.model.xml.XmlPermanent; +import adecWatt.model.unit.NonWorkspace; + +public abstract class Embedded

, T extends Enum, A extends Enum, C extends Editable, E extends Embedded> + extends Editable { + + static public final String globalPlace = "ean"; // ean = Everywhere and Nowhere + + // ======================================== + protected C container, containerRef; + protected String placeId, id; + protected NonWorkspace model; + + // ======================================== + public abstract A getPlaceIdToken (); + public abstract A getModelToken (); + public abstract Embedded getLink (Editable container); + + public AdecWatt getAdecWatt () { return container.getAdecWatt (); } + public String getId () { return id; } + + // public Unit getPermanent () { return model; } + public Unit getDirectUnit () { return model; } + public Unit getParentUnit () { return model; } + public NonWorkspace getModel () { return model; } + public C getContainer () { return container; } + + public void setModel (NonWorkspace model) { this.model = model; } + + @SuppressWarnings ("unchecked") + public Embedded getParent () { + for (Editable containerParent = container.getParent (); + containerParent != null; + containerParent = containerParent.getParent ()) { + Embedded parent = (Embedded) containerParent.getLocalEmbedded (id); + if (parent != null) + return parent; + } + return null; + } + + public void setParentUnit (Unit parent) { model = (NonWorkspace) parent; } + + // ======================================== + protected Embedded (C container, P xmlPermanent) { + super (xmlPermanent); + this.container = container; + placeId = xmlPermanent.getFacet (getPlaceIdToken ()); + if (placeId == null) + placeId = container.getId (); + if (name != null) + updateId (); + String modelId = xmlPermanent.getFacet (getModelToken ()); + if (modelId == null) + throw new IllegalArgumentException ("Unknown XML embedded has no model ("+xmlPermanent+")."); + model = (NonWorkspace) getAdecWatt ().getPermanentDB ().getUnitById (modelId); + } + protected Embedded (String name, String placeId, C container, NonWorkspace model) { + this.name = name == null ? container.getUniqName () : name; + this.placeId = placeId == null ? container.getId () : placeId; + this.container = container; + this.model = model; + updateId (); + } + protected void updateId () { + id = placeId+":"+name; + } + @SuppressWarnings ("unchecked") + public void fixName (boolean isLocal) { + if (name == null) { + name = container.getUniqName (); + placeId = isLocal ? container.getId () : globalPlace; + } + updateId (); + ((Editable>) container).addEmbedded (this); + } + @SuppressWarnings ("unchecked") + protected void importFrom (Embedded from) { + for (Embedded current = from; current != null; current = current.getParent ()) + super.importFrom (current); + Editable model = from.getModel (); + if (model == null) + return; + super.importFrom ((Editable) model); + } + @SuppressWarnings ("rawtypes") + public abstract Embedded clone (C container); + + @SuppressWarnings ("rawtypes") + protected Embedded clone () { + throw new IllegalArgumentException ("Clone an Embedded forbidden"); + } + + // ======================================== + public Element getXml (Node parent, Document document) { + Element child = super.getXml (parent, document); + if (!container.getId ().equals (placeId)) + XmlPermanent.putFacet (child, getPlaceIdToken (), placeId); + // XXX model == null si pas trouvé au chargement exemple : comp de réserve + XmlPermanent.putFacet (child, getModelToken (), model.getId ()); + return child; + } + + public void getLocalLink (HashSet> visited, + HashSet> unitLinks, TreeSet iconsLinks, TreeSet imagesLinks) { + if (visited.contains (this)) + return; + super.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks); + model.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks); + } + + public boolean renameUnits (TreeMap translateMap) { + boolean result = model != null && translateMap.containsValue (model.getId ()); + if (placeId != null && translateMap.containsKey (placeId)) { + placeId = translateMap.get (placeId); + if (name != null) + updateId (); + result = true; + } + return super.renameUnits (translateMap) || result; + } + + // ======================================== + public Prop getLocalProp (String name, Prop.PropTypeEnum type) { + // pas de type en paramètre mais rechercher dans model + for (Prop prop : ownProps.values ()) + if (name.equals (prop.name)) { + // test type + return prop; + } + // Prop result = model.getProp (name); + // result = (result != null) ? result.clone () : new Prop (name, type); + Prop result = new Prop (name, type); + ownProps.put (name, result); + return result; + } + + // ======================================== + // XXX getPropVal => super && !!! container.model.getEmbedded.getPropVal + // XXX getPartialProp => super && !!! container.model.getEmbedded.getPartialProp + // XXX getProp => super && !!! container.model.getEmbedded.getProp + + static public String labelPattern = "\\{\\{([^}]*)\\}\\}"; + public String getLabel () { + try { + Pattern p = Pattern.compile (labelPattern); + String mString = getPropVal (Prop.PropLabelProp).sValue; + Matcher m = p.matcher (mString); + StringBuffer sb = new StringBuffer (); + while (m.find ()) { + String key = mString.substring (m.start ()+2, m.end ()-2); + String val = ""; //"{{"+key+"=?}}"; + try { + val = getPropVal (key).sValue; + } catch (Exception e) { + } + m.appendReplacement (sb, val); + } + m.appendTail (sb); + return sb.toString (); + } catch (Exception e) { + return null; + } + } + public Color getLabelColor () { + try { + return LPColor.getColor (getPropVal (Prop.PropLabelColor).sValue); + } catch (Exception e) { + return Color.black; + } + } + public double getLabelSize () { + try { + return getPropVal (Prop.PropLabelSize).values[0]; + } catch (Exception e) { + return 0; + } + } + public String getCircuit () { + try { + String name = getPropVal (Prop.PropCircuit).sValue; + if (!name.isEmpty ()) + return name; + } catch (Exception e) { + } + return null; + } + public double getWatt () { + try { + return getPropVal (Prop.PropWatt).values[0]; + } catch (Exception e) { + } + return 0; + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/ImageDB.java b/src/java/adecWatt/model/ImageDB.java new file mode 100644 index 0000000..55da55a --- /dev/null +++ b/src/java/adecWatt/model/ImageDB.java @@ -0,0 +1,431 @@ +package adecWatt.model; + +import java.awt.Color; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; +import java.util.Collection; +import java.util.Comparator; +import java.util.Hashtable; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.Vector; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; + +import misc.ScaledImage; +import misc.Util; +import static misc.Config.FS; + +import static adecWatt.model.PermanentDB.backExtention; +import static adecWatt.model.PermanentDB.dataDir; +import static adecWatt.model.PermanentDB.localRemoteDir; +import static adecWatt.model.PermanentDB.localToken; +import static adecWatt.model.PermanentDB.serverToken; +import static adecWatt.model.PermanentDB.cacheToken; + +public class ImageDB { + static { + ImageIO.setUseCache (false); + } + + // ======================================== + static public final String iconDirName = "icon", imageDirName = "image"; + static public class FileFilterImageName implements FileFilter { + private String baseImageName; + public FileFilterImageName (String imageName) { + baseImageName = Util.getBase (imageName); + } + public boolean accept (File file) { + return file.isFile () && !file.isHidden () && Util.getBase (file).equals (baseImageName) && ! Util.getExtention (file).toLowerCase ().equals (backExtention); + } + }; + + // ======================================== + private AdecWatt adecWatt; + private String dir; + private TagDB tagDB; + public PreviewCache previewCache; + + // ======================================== + private File getDir (String placeToken) { + return new File (new File (dataDir, placeToken), dir); + } + public Collection getTags (String imageName) { + return tagDB.getTags (imageName); + } + public void putTags (String imageName, Collection imageTags) { + tagDB.putTags (imageName, imageTags); + } + + // ======================================== + public ImageDB (AdecWatt adecWatt, String dir) { + this.adecWatt = adecWatt; + this.dir = dir; + tagDB = new TagDB (dir); + previewCache = new PreviewCache (new File (new File (dataDir, cacheToken), dir)); + } + + // ======================================== + Hashtable> coloredScaledImages = new Hashtable> (); + final int toReplace = Color.BLUE.getRGB (); + + public ScaledImage getColoredScaledImages (ScaledImage scaledImage, Color color) { + Hashtable colorList = coloredScaledImages.get (scaledImage); + if (colorList == null) { + colorList = new Hashtable (); + coloredScaledImages.put (scaledImage, colorList); + } + ScaledImage coloredScaledImage = colorList.get (color); + if (coloredScaledImage == null) { + int newColor = color.getRGB (); + BufferedImage reference = scaledImage.reference; + int width = reference.getWidth (); + int height = reference.getHeight (); + BufferedImage colored = new BufferedImage (width, height, BufferedImage.TYPE_INT_ARGB); + for (int x = 0; x < width; x++) + for (int y = 0; y < height; y++) { + int c = reference.getRGB (x, y); + if (c == toReplace) + c = newColor; + colored.setRGB (x, y, c); + } + coloredScaledImage = new ScaledImage (colored); + colorList.put (color, coloredScaledImage); + } + return coloredScaledImage; + } + + // ======================================== + private Hashtable bufferedImages = new Hashtable (); + private Hashtable scaledImages = new Hashtable (); + + public ScaledImage getImage (String imageName, boolean horizontalSpin) { + try { + ScaledImage result = getScaled (findBufferedImage (imageName)); + return horizontalSpin ? result.getNewSpin (horizontalSpin, false) : result; + } catch (Exception e) { + return null; + } + } + public ScaledImage getScaled (BufferedImage bufferedImage) { + if (bufferedImage == null) + return null; + ScaledImage scaledImage = scaledImages.get (bufferedImage); + if (scaledImage != null) + return scaledImage; + scaledImage = new ScaledImage (bufferedImage); + scaledImages.put (bufferedImage, scaledImage); + return scaledImage; + } + + static public Comparator nameLocalComparator = + new Comparator () { + public int compare (NameLocal o1, NameLocal o2) { + if (o1 == o2) + return 0; + int diff = o1.fileName.compareToIgnoreCase (o2.fileName); + if (diff != 0) + return diff > 0 ? 1 : -1; + if (o1.isLocal == o2.isLocal) + return 0; + return o1.isLocal ? 1 : -1; + } + }; + + public class NameLocal { + public String fileName; + public boolean isLocal; + public ImageIcon icon; + public NameLocal (String fileName, boolean isLocal) { + this.fileName = fileName; + this.isLocal = isLocal; + } + } + public boolean isRemote (String imageName) { + FileFilterImageName fileFilterImageName = new FileFilterImageName (imageName); + boolean result = true; + for (String srcDir : localRemoteDir) + try { + result = !result; + if (new File (new File (dataDir, srcDir), dir).listFiles (fileFilterImageName).length > 0) + return result; + } catch (Exception e) { + } + return false; + } + + public File getFile (String imageName, boolean isLocal) { + if (!localRemoteDir.get (0).equals (localToken)) + isLocal = ! isLocal; + String srcDir = localRemoteDir.get (isLocal ? 0 : 1); + try { + return getDir (srcDir).listFiles (new FileFilterImageName (imageName))[0]; + } catch (Exception e) { + } + return null; + } + + public void renameLocalImage (String imageName, String newImageName) { + if (imageName == null || newImageName == null || imageName.equals (newImageName)) + return; + BufferedImage image = bufferedImages.get (imageName); + if (image != null) { + bufferedImages.remove (imageName); + bufferedImages.put (newImageName, image); + } + File oldFile = getFile (imageName, true); + if (oldFile == null) + return; + File newFile = new File (oldFile.getParent (), newImageName+"."+Util.getExtention (oldFile).toLowerCase ()); + try { + Files.move (oldFile.toPath (), newFile.toPath (), StandardCopyOption.REPLACE_EXISTING); + } catch (Exception e) { + } + if (oldFile.exists ()) { + // XXX si pas de move ? + System.err.println ("coucou l'image n'a pas été renommée:"+oldFile); + } + } + public void removeImage (String imageName) { + try { + File oldFile = getFile (imageName, true); + Util.backup (oldFile, Util.getExtention (oldFile), backExtention); + clearBufferedImage (imageName); + previewCache.clean (imageName); + } catch (Exception e) { + } + } + + private String getNewImageName (File file) { + return adecWatt.getUser ().getDataId ()+"."+Util.getExtention (file).toLowerCase (); + } + private String getImageName (String imageName, File file) { + return Util.getBase (imageName)+"."+Util.getExtention (file); + } + public String addImage (File file) { + String newImageName = getNewImageName (file); + File dstDir = new File (new File (dataDir, localToken), dir); + try { + dstDir.mkdirs (); + Util.copy (new FileInputStream (file), new FileOutputStream (new File (dstDir, newImageName)), null, null); + } catch (Exception e) { + e.printStackTrace (); + } + return newImageName; + } + public void renameVisitor (TreeSet imageNames) { + if (imageNames.size () == 0) + return; + PermanentDB permanentDB = adecWatt.getPermanentDB (); + TreeMap translateMap = new TreeMap (); + String pattern = String.format ("%03d-", User.visitorId); + User user = adecWatt.getUser (); + for (String imageName : imageNames) { + if (!imageName.startsWith (pattern)) + continue; + String newImageName = user.getDataId (); + String ext = Util.getExtention (imageName); + if (ext != null) { + System.err.println ("coucou renameVisitor has ext:"+imageName); + imageNames.remove (imageName); + imageName = Util.getBase (imageName); + } + renameLocalImage (imageName, newImageName); + translateMap.put (imageName, newImageName); + } + permanentDB.renameImages (translateMap); + tagDB.renameImages (translateMap); + if (translateMap.size () < 1) + return; + imageNames.removeAll (translateMap.keySet ()); + imageNames.addAll (translateMap.values ()); + } + public void promoteTag (TreeSet imageNames) { + tagDB.promote (imageNames); + } + public void promote (TreeSet imageNames) { + if (imageNames.size () == 0) + return; + // liste des id à écrire + // XXX tag par id + for (String imageName : imageNames) { + // XXX mis à jours des "tags" local => sever + File file = getFile (imageName, true); + // XXX autre méthode ? + if (file == null) { + // XXX si pas sauvé => trouver extension et utiliser scaledImage (pas copy) + continue; + } + File newFile = new File (new File (new File (dataDir, serverToken), dir), file.getName ()); + try { + Files.move (file.toPath (), newFile.toPath (), StandardCopyOption.REPLACE_EXISTING); + } catch (Exception e) { + } + if (file.exists ()) { + // XXX si pas de move ? + System.err.println ("coucou l'image "+imageName+" n'a pas été déplacée"); + } + } + } + public String updateImage (NameLocal nameLocal, File file) { + String newImageName = getImageName (nameLocal.fileName, file); + File dstDir = getDir (localToken); + if (nameLocal.isLocal) + removeImage (nameLocal.fileName); + try { + dstDir.mkdirs (); + // XXX utiliser un tmp ? + Util.copy (new FileInputStream (file), new FileOutputStream (new File (dstDir, newImageName)), null, null); + clearBufferedImage (newImageName); + } catch (Exception e) { + e.printStackTrace (); + } + return newImageName; + } + + public boolean importFile (String dirName, String fileName, ByteArrayInputStream dataIn) { + if (!dir.equals (dirName)) + return false; + try { + bufferedImages.put (fileName, ImageIO.read (dataIn)); + } catch (Exception e) { + } + return true; + } + + public void addImageZip (ZipOutputStream out, String iconName) + throws IOException { + if (iconName == null || iconName.isEmpty ()) + return; + ZipEntry ze = new ZipEntry (dir+"/"+iconName); + out.putNextEntry (ze); + File srcDir = new File (new File (dataDir, localToken), dir); + File srcFile = new File (srcDir, iconName); + int length = (int) srcFile.length (); + byte[] tmp = new byte[length]; + FileInputStream fileInputStream = new FileInputStream (srcFile); + try { + fileInputStream.read (tmp); + } finally { + fileInputStream.close (); + } + out.write (tmp); + out.closeEntry(); + out.flush (); + } + public Vector listImage () { + Vector result = new Vector (); + Vector filesNames = new Vector (); + Boolean isLocal = localRemoteDir.get (0).equals (localToken); + isLocal = ! isLocal; + for (String srcDir : localRemoteDir) + try { + isLocal = ! isLocal; + File[] files = new File (dataDir, srcDir+FS+dir).listFiles (PreviewCache.fileImageFilter); + if (files == null) + continue; + int maxSize = result.size ()+filesNames.size (); + result.ensureCapacity (maxSize); + filesNames.ensureCapacity (maxSize); + for (File file : files) { + String fileName = file.getName (); + if (!filesNames.contains (fileName)) { + filesNames.add (fileName); + result.add (new NameLocal (fileName, isLocal)); + } + } + } catch (Exception e) { + e.printStackTrace (); + } + result.sort (nameLocalComparator); + return result; + } + + public TreeMap newNamePlan () { + TreeMap result = new TreeMap (); + for (String srcDir : localRemoteDir) + try { + File[] files = new File (dataDir, srcDir+FS+dir).listFiles (PreviewCache.fileImageFilter); + if (files == null) + continue; + for (File file : files) { + String fileName = file.getName (); + if (User.splitId (fileName) != null) + continue; + String newName = result.get (fileName); + if (newName == null) + result.put (fileName, newName = getNewImageName (file)); + Files.move (file.toPath (), new File (file.getParent (), newName).toPath (), StandardCopyOption.REPLACE_EXISTING); + } + } catch (Exception e) { + e.printStackTrace (); + } + return result; + } + + public void clearBufferedImage (String imageName) { + if (imageName == null) + return; + imageName = Util.getBase (imageName); + BufferedImage bufferedImage = bufferedImages.get (imageName); + if (bufferedImage == null) + return; + ScaledImage scaledImage = scaledImages.get (bufferedImage); + bufferedImages.remove (imageName); + if (scaledImage == null) + return; + scaledImages.remove (bufferedImage); + coloredScaledImages.remove (scaledImage); + } + + public BufferedImage findBufferedImage (String imageName) { + if (imageName == null) + return null; + imageName = Util.getBase (imageName); + BufferedImage bufferedImage = bufferedImages.get (imageName); + if (bufferedImage != null) + return bufferedImage; + FileFilterImageName fileFilterImageName = new FileFilterImageName (imageName); + for (String srcDir : localRemoteDir) + try { + for (File file : new File (new File (dataDir, srcDir), dir).listFiles (fileFilterImageName)) { + bufferedImage = ImageIO.read (file); + bufferedImages.put (imageName, bufferedImage); + return bufferedImage; + } + } catch (Exception e) { + } + System.err.println ("coucou not found:"+dir+FS+imageName); + return null; + } + + // ======================================== + public void updateDataId () { + User user = adecWatt.getUser (); + for (String srcDir : localRemoteDir) + try { + for (File file : new File (dataDir, srcDir+FS+dir).listFiles (PreviewCache.fileImageFilter)) + user.updateDataId (file.getName ()); + } catch (Exception e) { + } + } + + // ======================================== + public void reload () { + tagDB.reload (); + bufferedImages.clear (); + scaledImages.clear (); + updateDataId (); + } + + // ======================================== +} diff --git a/src/java/adecWatt/model/InseeDB.java b/src/java/adecWatt/model/InseeDB.java new file mode 100644 index 0000000..ca6af46 --- /dev/null +++ b/src/java/adecWatt/model/InseeDB.java @@ -0,0 +1,87 @@ +package adecWatt.model; + +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import misc.Log; +import misc.Util; + +public class InseeDB { + + // http://www.geonames.org/export/codes.html + // http://download.geonames.org/export/dump/ (PPL) + + // ======================================== + static public class Insee { + public String code, name; + public double latitude, longitude; + + public Insee (String code, String name, double latitude, double longitude) { + this.code = code; + this.name = name; + this.latitude = latitude; + this.longitude = longitude; + } + } + + // ======================================== + private ArrayList cities = new ArrayList (); + public InseeDB (Node node) { + parse (node); + } + + public ArrayList getCities (String pattern) { + pattern = Util.removeAccent (pattern.toLowerCase ().replaceAll ("-", " ")); + ArrayList result = new ArrayList (); + for (Insee insee : cities) + if (Util.removeAccent (insee.name.toLowerCase ().replaceAll ("-", " ")).indexOf (pattern) >= 0 || + insee.code.indexOf (pattern) >= 0) + result.add (insee); + return result; + } + + // ======================================== + static public InseeDB readDocument (URL url) { + try { + return readDocument (url.openStream ()); + } catch (Exception e) { + } + return null; + } + static public InseeDB readDocument (InputStream stream) { + try { + DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance ().newDocumentBuilder (); + Document document = documentBuilder.parse (stream); + document.normalizeDocument (); + return new InseeDB (document.getFirstChild ()); + } catch (Exception e) { + Log.keepLastException ("InseeDB::readDocument", e); + throw new IllegalArgumentException ("Not XML file input."); + } + } + + private void parse (Node node) { + //XX insee =? node.getNodeName () + NodeList childrens = node.getChildNodes (); + for (int i = 0; i < childrens.getLength (); i++) { + try { + Node child = childrens.item (i); + NamedNodeMap allFacets = child.getAttributes (); + cities.add (new Insee (allFacets.getNamedItem ("code").getNodeValue (), allFacets.getNamedItem ("name").getNodeValue (), + Double.parseDouble (allFacets.getNamedItem ("lat").getNodeValue ()), + Double.parseDouble (allFacets.getNamedItem ("long").getNodeValue ()))); + } catch (Exception e) { + } + } + } + + // ======================================== +} + diff --git a/src/java/adecWatt/model/Item.java b/src/java/adecWatt/model/Item.java new file mode 100644 index 0000000..be52d2f --- /dev/null +++ b/src/java/adecWatt/model/Item.java @@ -0,0 +1,337 @@ +package adecWatt.model; + +import java.awt.Graphics2D; +import java.awt.geom.AffineTransform; +import java.awt.geom.Dimension2D; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Enumeration; +import java.util.Hashtable; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import misc.DimensionDouble; +import misc.Story; + +import adecWatt.model.unit.NonWorkspace; +import adecWatt.model.unit.Workspace; +import adecWatt.model.xml.XmlPermanent; + +public abstract class Item

, T extends Enum, A extends Enum> + extends Embedded { + + // ======================================== + protected Workspace placeUnit; + + // ======================================== + public Workspace getStoryUnit () { return container; } + + // ======================================== + public Item (Workspace workspace, P xml) { + super (workspace, xml); + collectEmbedded (); + } + public Item (String name, String placeName, Workspace workspace, NonWorkspace model) { + super (name, placeName, workspace, model); + } + public Item (Workspace workspace, NonWorkspace model) { + super (null, null, workspace, model); + } + abstract public Item clone (Workspace workspace); + protected void updateId () { + super.updateId (); + try { + boolean localItem = container.getId ().equals (placeId); + if (!localItem) + placeUnit = (Workspace) getAdecWatt ().getPermanentDB ().getUnitById (placeId); + } catch (Exception e) { + } + } + + // ======================================== + public ArrayList findAccs (Point2D.Double realPos, double close) { + ArrayList result = new ArrayList (); + double theta = Math.toRadians (-getThetaDegree ()); + double [] coord = new double [] {realPos.x, realPos.y}; + for (String accId : getEmbeddedIds ()) + try { + coord[0] = realPos.x; + coord[1] = realPos.y; + Point2D.Double accPos = accCenter.get (accId); + DimensionDouble accSize = this.accSize.get (accId); + AffineTransform at = new AffineTransform (); + at.rotate (theta); + at.translate (-accPos.x, -accPos.y); + at.transform (coord, 0, coord, 0, 1); + double halfWidth = accSize.width/2+close, halfHeight = accSize.height/2+close; + if (coord[0] >= -halfWidth && coord[0] <= halfWidth && + coord[1] >= -halfHeight && coord[1] <= halfHeight) + result.add (findEmbedded (accId)); + } catch (Exception e) { + } + return result; + } + + public R parentAndModelWalk (String propName, ComputeProp computeProp, boolean skipFirst) { + R result = parentWalk (propName, computeProp, skipFirst); + if (result != null) + return result; + try { + boolean localItem = placeId.equals (getContainer ().getId ()); + result = placeUnit.findEmbedded (getId ()).parentWalk (propName, computeProp, localItem); + if (result != null) + return result; + } catch (Exception e) { + } + try { + result = getModel ().parentWalk (propName, computeProp, false); + if (result != null) + return result; + } catch (Exception e) { + } + return null; + } + + public Element getXml (Node parent, Document document) { + return super.getXml (parent, document); + } + + // ======================================== + public boolean match (String text) { + return + super.match (text) || + model.parentMatch (text); + // if (container.search (text).size () > 0) + // return true; + // if (embedded != null) + // for (Acc acc: embedded.values ()) + // if (acc.search (text)) + // return true; + // XXX ou accéssoire + } + + // ======================================== + public void validateContainer (Story.Commands commands, String commandName) { + if (container.getLocalEmbedded (getId ()) == this) + return; + commands.add (container.story.new Command (commandName) { + public void exec () { container.addEmbedded (Item.this); } + public void undo () { container.removeEmbedded (Item.this); } + public void displayExec () { updateView (Unit.BroadcastNewItem); } + public void displayUndo () { updateView (Unit.BroadcastRemoveItem); } + }); + } + + public void storyChange (Story.Commands commands, ArrayList changeProps) { + storyChange (commands, true, ownProps, changeProps); + } + public void storyTransform (Story.Commands commands, Collection modifiers, Unit permanent, String newName, ArrayList transProps) { + storyTransform (commands, null, modifiers, permanent, ownProps, transProps); + } + public void updateView () { + updateView (Unit.BroadcastUpdateItem); + } + @SuppressWarnings ("unchecked") + public void updateView (String msg) { + for (Enumeration e = container.unitNode.breadthFirstEnumeration (); e.hasMoreElements (); ) { + Unit> unit = ((UnitNode>) e.nextElement ()).getUnit (); + unit.stateNotifier.broadcastDisplay (msg, this); + } + } + + // ======================================== + public boolean inside (Rectangle2D.Double selection) { + try { + Point2D.Double center = getPos (); + DimensionDouble size = getRotSize (getSize (), getThetaDegree ()); + double halfWidth = size.width/2; + double halfHeight = size.height/2; + return + selection.x <= center.x-halfWidth && selection.x+selection.width >= center.x+halfWidth && + selection.y <= center.y-halfHeight && selection.y+selection.height >= center.y+halfHeight; + } catch (Exception e) { + return false; + } + } + + public boolean isPosOutside (DimensionDouble inside) { + Point2D.Double pos = getPos (); + DimensionDouble size = getRotSize (getSize (), getThetaDegree ()); + double halfWidth = size.width/2; + double halfHeight = size.height/2; + return + pos.x < halfWidth || pos.y < halfHeight || + pos.x > inside.width-halfWidth || pos.y > inside.height-halfHeight; + } + + static public DimensionDouble getRotSize (DimensionDouble size, double thetaDegree) { + if (thetaDegree == 0) + return size; + double [] bounds = getShapeBounds (size, thetaDegree); + return new DimensionDouble (Math.max (Math.abs (bounds[4]-bounds[0]), + Math.abs (bounds[6]-bounds[2])), + Math.max (Math.abs (bounds[5]-bounds[1]), + Math.abs (bounds[7]-bounds[3]))); + } + public double getCloseBound (Point2D.Double pos, double close, Point2D.Double result) { + return getCloseBound (getBounds (), pos, close, result); + } + public double[] getBounds () { + return getBounds (getPos (), getSize (), getThetaDegree ()); + } + + static public Point2D.Double getPosInside (DimensionDouble inside, Point2D.Double pos, double thetaDegree, DimensionDouble refSize) { + DimensionDouble size = getRotSize (refSize, thetaDegree); + double halfWidth = size.width/2; + double halfHeight = size.height/2; + return new + Point2D.Double (Math.min (Math.max (pos.x, halfWidth), inside.width-halfWidth), + Math.min (Math.max (pos.y, halfHeight), inside.height-halfHeight)); + } + static public double getCloseBound (double[] bounds, Point2D.Double pos, double close, Point2D.Double result) { + for (int x = 0, y = 1; x < 18; x+=2, y+=2) { + double d = pos.distance (bounds[x], bounds[y]); + if (d < close) { + close = d; + result.x = bounds[x]; + result.y = bounds[y]; + } + } + return close; + } + static public double[] getBounds (Point2D.Double pos, Dimension2D size, double thetaDegree) { + double halfWidth = size.getWidth ()/2, halfHeight = size.getHeight ()/2; + AffineTransform at = AffineTransform.getTranslateInstance (pos.x, pos.y); + at.rotate (Math.toRadians (thetaDegree)); + double [] bounds = new double [] { + -halfWidth, -halfHeight, + -halfWidth, halfHeight, + halfWidth, halfHeight, + halfWidth, -halfHeight, + -halfWidth, 0, + 0, halfHeight, + halfWidth, 0, + 0, -halfHeight, + 0, 0 + }; + //System.err.println ("coucou A:"+java.util.Arrays.toString (bounds)); + at.transform (bounds, 0, bounds, 0, 9); + //System.err.println ("coucou B:"+java.util.Arrays.toString (bounds)); + return bounds; + } + static public double[] getShapeBounds (Dimension2D size, double thetaDegree) { + double halfWidth = size.getWidth ()/2, halfHeight = size.getHeight ()/2; + AffineTransform at = AffineTransform.getRotateInstance (Math.toRadians (thetaDegree)); + double [] bounds = new double [] {-halfWidth, -halfHeight, -halfWidth, halfHeight, halfWidth, halfHeight, halfWidth, -halfHeight}; + at.transform (bounds, 0, bounds, 0, 4); + return bounds; + } + public boolean containsClose (double [] coord, double close) { + try { + Point2D.Double center = getPos (); + DimensionDouble size = getSize (); + AffineTransform at = new AffineTransform (); + at.rotate (Math.toRadians (-getThetaDegree ())); + at.translate (-center.x, -center.y); + at.transform (coord, 0, coord, 0, 1); + double halfWidth = size.width/2+close, halfHeight = size.height/2+close; + return + coord[0] >= -halfWidth && coord[0] <= halfWidth && + coord[1] >= -halfHeight && coord[1] <= halfHeight; + } catch (Exception e) { + return false; + } + } + // ======================================== + abstract public void changeThetaDegree (double thetaDegree); + abstract public void changeSize (DimensionDouble size); + + public void changeRotSize (Point2D.Double pos, double thetaDegree, DimensionDouble size) { + if (isSticky ()) + return; + // XXX ? si parent valeur identique ? + getLocalProp (Prop.PropPos, Prop.PropTypeEnum.Cube).setPosition (pos); + changeThetaDegree (thetaDegree); + changeSize (size); + } + + public void changePos (Point2D.Double pos) { + if (isSticky ()) + return; + // XXX ? si parent valeur identique ? + getLocalProp (Prop.PropPos, Prop.PropTypeEnum.Cube).setPosition (pos); + } + + // ======================================== + static public Comparator xPosComparator = new AxeItemComparator (0, 1, 2); + static public Comparator yPosComparator = new AxeItemComparator (1, 0, 2); + static public Comparator zPosComparator = new AxeItemComparator (2, 0, 1); + + static class AxeItemComparator implements Comparator { + int a, b, c; + public AxeItemComparator (int a, int b, int c) { + this.a = a; + this.b = b; + this.c = c; + } + public int compare (Item o1, Item o2) { + if (o1 == o2) + return 0; + Double [] seekProp1 = new Double[] {null, null, null}; + Double [] seekProp2 = new Double[] {null, null, null}; + o1.getPartialProp (Prop.PropPos, seekProp1); + o2.getPartialProp (Prop.PropPos, seekProp2); + if (seekProp1[a] != seekProp2[a]) { + if (seekProp1[a] == null) + return 1; + if (seekProp2[a] == null) + return -1; + double diff = seekProp1[a] - seekProp2[a]; + if (diff != 0) + return diff > 0 ? 1 : -1; + } + if (seekProp1[b] != seekProp2[b]) { + if (seekProp1[b] == null) + return 1; + if (seekProp2[b] == null) + return -1; + double diff = seekProp1[b] - seekProp2[b]; + if (diff != 0) + return diff > 0 ? 1 : -1; + } + if (seekProp1[c] != seekProp2[c]) { + if (seekProp1[c] == null) + return 1; + if (seekProp2[c] == null) + return -1; + double diff = seekProp1[c] - seekProp2[c]; + if (diff != 0) + return diff > 0 ? 1 : -1; + } + return 0; + } + }; + + // ======================================== + public String toString () { + return getName (); + } + + // ======================================== + public Hashtable accCenter = new Hashtable (); + public Hashtable accSize = new Hashtable (); + public Point2D.Double getAccCenter (String accId) { + return accCenter.get (accId); + } + public DimensionDouble getAccSize (String accId) { + return accSize.get (accId); + } + abstract public void print (Graphics2D printGraphics, Workspace workspace, String plugId); + abstract public void print (Graphics2D printGraphics, Workspace workspace, Point2D pos, DimensionDouble size, double thetaDegree); + + // ======================================== +} diff --git a/src/java/adecWatt/model/LPColor.java b/src/java/adecWatt/model/LPColor.java new file mode 100644 index 0000000..ab57137 --- /dev/null +++ b/src/java/adecWatt/model/LPColor.java @@ -0,0 +1,406 @@ +package adecWatt.model; + +import java.awt.Color; +import java.lang.reflect.Field; +import java.util.Hashtable; + +public class LPColor { + + static public Hashtable leeFilterList = new Hashtable (); + + static public class LeeFilter { + String ref; + int value; + String comment; + + public LeeFilter (String ref, int value, String comment) { + this.ref = ref; + this.value = value; + this.comment = comment; + leeFilterList.put ("LF"+ref, this); + } + } + + static public Color getColor (String color) { + if (color == null || color.isEmpty ()) + return Color.gray; + LeeFilter leeFilter = leeFilterList.get (color.replaceAll ("\\s", "").toUpperCase ()); + if (leeFilter != null) + return new Color (leeFilter.value); + color = color.toLowerCase (); + try { + Field field = Class.forName ("java.awt.Color").getField (color); + return (Color) field.get (null); + } catch (Exception e) { + } + try { + return new Color (Integer.valueOf (color.substring (0, 2), 16), + Integer.valueOf (color.substring (2, 4), 16), + Integer.valueOf (color.substring (4, 6), 16)); + } catch (Exception e) { + } + return Color.black; + } + + static { + new LeeFilter ("002", 0xFF78DC, "Rose Pink"); + new LeeFilter ("003", 0xFAF0FA, "Lavender Tint"); + new LeeFilter ("004", 0xFFC8B4, "Medium Bastard Amber"); + new LeeFilter ("007", 0xFAFAD2, "Pale Yellow"); + new LeeFilter ("008", 0xFC9B80, "Dark Salmon"); + new LeeFilter ("009", 0xFCD7B3, "Pale Amber Gold"); + new LeeFilter ("010", 0xFFFF00, "Medium Yellow"); + new LeeFilter ("013", 0xFCD89B, "Straw Tint"); + new LeeFilter ("015", 0xFFCD00, "Deep Straw"); + new LeeFilter ("017", 0xE68C64, "Surprise Peach"); + new LeeFilter ("019", 0xFF4600, "Fire"); + new LeeFilter ("020", 0xFFBE55, "Medium Amber"); + new LeeFilter ("021", 0xFF8C32, "Gold Amber"); + new LeeFilter ("022", 0xFF6900, "Dark Amber"); + new LeeFilter ("024", 0xFF5A64, "Scarlet"); + new LeeFilter ("025", 0xFF6E46, "Sunset Red"); + new LeeFilter ("026", 0xE6003C, "Bright Red"); + new LeeFilter ("027", 0xC8003C, "Medium Red"); + new LeeFilter ("029", 0xE1003C, "Plasa Red"); + new LeeFilter ("035", 0xFFC8D2, "Light Pink"); + new LeeFilter ("036", 0xFFA0B9, "Medium Pink"); + new LeeFilter ("046", 0xDC005A, "Dark Magenta"); + new LeeFilter ("048", 0xE66EAF, "Rose Purple"); + new LeeFilter ("049", 0xBE0091, "Medium Purple"); + new LeeFilter ("052", 0xE6AAFA, "Light Lavender"); + new LeeFilter ("053", 0xE6E6FA, "Paler Lavender"); + new LeeFilter ("058", 0xB46EF0, "Lavender"); + new LeeFilter ("061", 0xDCF5FF, "Mist Blue"); + new LeeFilter ("063", 0xD2F5FF, "Pale Blue"); + new LeeFilter ("068", 0x46B4F0, "Sky Blue"); + new LeeFilter ("071", 0x0000B4, "Tokyo Blue"); + new LeeFilter ("075", 0x64A0F0, "Evening Blue"); + new LeeFilter ("079", 0x3C8CD2, "Just Blue"); + new LeeFilter ("085", 0x006EB9, "Deeper Blue"); + new LeeFilter ("088", 0xDCFF64, "Lime Green"); + new LeeFilter ("089", 0x5ADC5A, "Moss Green"); + new LeeFilter ("090", 0x00BE00, "Dark Yellow Green"); + new LeeFilter ("100", 0xF5FF00, "Spring Yellow"); + new LeeFilter ("101", 0xFFF500, "Yellow"); + new LeeFilter ("102", 0xFFDC5F, "Light Amber"); + new LeeFilter ("103", 0xFCEACC, "Straw"); + new LeeFilter ("104", 0xFFDC00, "Deep Amber"); + new LeeFilter ("105", 0xFFA000, "Orange"); + new LeeFilter ("106", 0xF00032, "Primary Red"); + new LeeFilter ("107", 0xFFA5AF, "Light Rose"); + new LeeFilter ("108", 0xFCBEA9, "English Rose"); + new LeeFilter ("109", 0xFFB2AF, "Light Salmon"); + new LeeFilter ("110", 0xFFB4C8, "Middle Rose"); + new LeeFilter ("111", 0xFF8CBE, "Dark Pink"); + new LeeFilter ("113", 0xFF0064, "Magenta"); + new LeeFilter ("115", 0x00EBC8, "Peacock Blue"); + new LeeFilter ("116", 0x00C8B9, "Medium Blue-Green"); + new LeeFilter ("117", 0xB4FAF5, "Steel Blue"); + new LeeFilter ("118", 0x00E1EB, "Light Blue"); + new LeeFilter ("119", 0x0078C8, "Dark Blue"); + new LeeFilter ("120", 0x005FBE, "Deep Blue"); + new LeeFilter ("121", 0xB4FF64, "LEE Green"); + new LeeFilter ("122", 0x78FA6E, "Fern Green"); + new LeeFilter ("124", 0x00DC78, "Dark Green"); + new LeeFilter ("126", 0xBE009B, "Mauve"); + new LeeFilter ("127", 0xE16273, "Smokey Pink"); + new LeeFilter ("128", 0xFF50B4, "Bright Pink"); + new LeeFilter ("129", 0xFFFFFF, "Heavy Frost"); + new LeeFilter ("130", 0xFFFFFF, "Clear"); + new LeeFilter ("131", 0x64FAD2, "Marine Blue"); + new LeeFilter ("132", 0x00A0DC, "Medium Blue"); + new LeeFilter ("134", 0xFAA873, "Golden Amber"); + new LeeFilter ("135", 0xFF5F00, "Deep Golden Amber"); + new LeeFilter ("136", 0xF0BEE6, "Pale Lavender"); + new LeeFilter ("137", 0xC8B4E6, "Special Lavender"); + new LeeFilter ("138", 0xDCFFA0, "Pale Green"); + new LeeFilter ("139", 0x4BC300, "Primary Green"); + new LeeFilter ("140", 0x87F0EB, "Summer Blue"); + new LeeFilter ("141", 0x00D2E6, "Bright Blue"); + new LeeFilter ("142", 0xAAAAF0, "Pale Violet"); + new LeeFilter ("143", 0x64BED2, "Pale Navy Blue"); + new LeeFilter ("144", 0x5AE1E6, "No Colour Blue"); + new LeeFilter ("147", 0xFCB98C, "Apricot"); + new LeeFilter ("148", 0xFF507D, "Bright Rose"); + new LeeFilter ("151", 0xFFCDC3, "Gold Tint"); + new LeeFilter ("152", 0xFFD2C1, "Pale Gold"); + new LeeFilter ("153", 0xFFC8C8, "Pale Salmon"); + new LeeFilter ("154", 0xFFD5CF, "Pale Rose"); + new LeeFilter ("156", 0xE1B48C, "Chocolate"); + new LeeFilter ("157", 0xFF92A3, "Pink"); + new LeeFilter ("158", 0xFF8700, "Deep Orange"); + new LeeFilter ("159", 0xFFFAEB, "No Colour Straw"); + new LeeFilter ("161", 0x7DD2F5, "Slate Blue"); + new LeeFilter ("162", 0xFCDED8, "Bastard Amber"); + new LeeFilter ("164", 0xFF3200, "Flame Red"); + new LeeFilter ("165", 0x5AC8EB, "Daylight Blue"); + new LeeFilter ("169", 0xFADCF0, "Lilac Tint"); + new LeeFilter ("170", 0xE6AADC, "Deep Lavender"); + new LeeFilter ("172", 0x00DCDC, "Lagoon Blue"); + new LeeFilter ("174", 0xAFE1FA, "Dark Steel Blue"); + new LeeFilter ("176", 0xFFAAA0, "Loving Amber"); + new LeeFilter ("179", 0xFFBE00, "Chrome Orange"); + new LeeFilter ("180", 0xA064E6, "Dark Lavender"); + new LeeFilter ("181", 0x5000AA, "Congo Blue"); + new LeeFilter ("182", 0xF50000, "Light Red"); + new LeeFilter ("183", 0x00D7E3, "Moonlight Blue"); + new LeeFilter ("184", 0xF0E1D7, "Cosmetic Peach"); + new LeeFilter ("186", 0xF8DCDD, "Cosmetic Silver Rose"); + new LeeFilter ("187", 0xF5E4D7, "Cosmetic Rouge"); + new LeeFilter ("188", 0xFFEBD7, "Cosmetic Highlight"); + new LeeFilter ("189", 0xEEEDD8, "Cosmetic Silver Moss"); + new LeeFilter ("191", 0xE9EEEE, "Cosmetic Aqua Blue"); + new LeeFilter ("192", 0xFF8CB4, "Flesh Pink"); + new LeeFilter ("194", 0xBE8CF0, "Surprise Pink"); + new LeeFilter ("195", 0x006ED2, "Zenith Blue"); + new LeeFilter ("196", 0x78D2E6, "True Blue"); + new LeeFilter ("197", 0x82AAE6, "Alice Blue"); + new LeeFilter ("198", 0x6478C8, "Palace Blue"); + new LeeFilter ("199", 0x6464E6, "Regal Blue"); + new LeeFilter ("200", 0x91BEF5, "Double C.T. Blue"); + new LeeFilter ("201", 0xC3E1FA, "Full C.T. Blue"); + new LeeFilter ("202", 0xD7F0FF, "Half C.T. Blue"); + new LeeFilter ("203", 0xEBFCFF, "Quarter C.T. Blue"); + new LeeFilter ("204", 0xFAC387, "Full C.T. Orange"); + new LeeFilter ("205", 0xFCD9B1, "Half C.T. Orange"); + new LeeFilter ("206", 0xFCEAD6, "Quarter C.T. Orange"); + new LeeFilter ("207", 0xF0B46B, "Full C.T. Orange + .3 ND"); + new LeeFilter ("208", 0xE6A550, "Full C.T. Orange + .6 ND"); + new LeeFilter ("209", 0xC8C8C8, "0.3 ND"); + new LeeFilter ("210", 0xA5A5A5, "0.6 ND"); + new LeeFilter ("211", 0x828282, "0.9 ND"); + new LeeFilter ("212", 0xFFFAD7, "L.C.T.Yellow (Y1)"); + new LeeFilter ("213", 0xE6FCDC, "White Flame Green"); + new LeeFilter ("214", 0xFFFFFF, "Full Tough Spun"); + new LeeFilter ("215", 0xFFFFFF, "Half Tough Spun"); + new LeeFilter ("216", 0xFFFFFF, "White Diffusion"); + new LeeFilter ("217", 0xF5FFFF, "Blue Diffusion"); + new LeeFilter ("218", 0xF5FFFF, "Eighth C.T. Blue"); + new LeeFilter ("219", 0x9BDCAF, "LEE Fluorescent Green"); + new LeeFilter ("220", 0xFFFFFF, "White Frost"); + new LeeFilter ("221", 0xF5FFFF, "Blue Frost"); + new LeeFilter ("223", 0xFFF3E8, "Eighth C.T. Orange"); + new LeeFilter ("224", 0x96A0BE, "Daylight Blue Frost"); + new LeeFilter ("225", 0x9EA0A2, "Neutral Density Frost"); + new LeeFilter ("226", 0xFFFFFA, "LEE U.V."); + new LeeFilter ("228", 0xFFFFFF, "Brushed Silk"); + new LeeFilter ("229", 0xFFFFFF, "Quarter Tough Spun"); + new LeeFilter ("230", 0xDCBE8C, "Super Correction L.C.T. Yellow"); + new LeeFilter ("232", 0xEDBE83, "Super Correction W.F. Green"); + new LeeFilter ("236", 0xFAC795, "H.M.I. (to Tungsten)"); + new LeeFilter ("237", 0xFCB292, "C.I.D. (to Tungsten)"); + new LeeFilter ("238", 0xF5B9AA, "C.S.I. (to Tungsten)"); + new LeeFilter ("239", 0xCDCDCD, "Polariser"); + new LeeFilter ("241", 0xAADCC3, "LEE Fluorescent 5700 Kelvin"); + new LeeFilter ("242", 0xB9E6B9, "LEE Fluorescent 4300 Kelvin"); + new LeeFilter ("243", 0xCDF5AF, "LEE Fluorescent 3600 Kelvin"); + new LeeFilter ("244", 0xE6FABE, "LEE Plus Green"); + new LeeFilter ("245", 0xF0FCD2, "Half Plus Green"); + new LeeFilter ("246", 0xF5FFE6, "Quarter Plus Green"); + new LeeFilter ("247", 0xFAC3D7, "LEE Minus Green"); + new LeeFilter ("248", 0xFFE2E4, "Half Minus Green"); + new LeeFilter ("249", 0xFFECF0, "Quarter Minus Green"); + new LeeFilter ("250", 0xFFFFFF, "Half White Diffusion"); + new LeeFilter ("251", 0xFFFFFF, "Quarter White Diffusion"); + new LeeFilter ("252", 0xFFFFFF, "Eighth White Diffusion"); + new LeeFilter ("253", 0xFFFFFF, "Hampshire Frost"); + new LeeFilter ("254", 0xFFFFFF, "New Hampshire Frost"); + new LeeFilter ("255", 0xFFFFFF, "Hollywood Frost"); + new LeeFilter ("256", 0xFFFFFF, "Half Hampshire Frost"); + new LeeFilter ("257", 0xFFFFFF, "Quarter Hampshire Frost"); + new LeeFilter ("258", 0xFFFFFF, "Eighth Hampshire Frost"); + new LeeFilter ("261", 0xFFFFFF, "Tough Spun FR - Full"); + new LeeFilter ("262", 0xFFFFFF, "Tough Spun FR - 3/4"); + new LeeFilter ("263", 0xFFFFFF, "Tough Spun FR - 1/2"); + new LeeFilter ("264", 0xFFFFFF, "Tough Spun FR - 3/8"); + new LeeFilter ("265", 0xFFFFFF, "Tough Spun FR - 1/4"); + new LeeFilter ("269", 0xFFFFFF, "LEE Heat Shield"); + new LeeFilter ("270", 0xBEBEBE, "LEE Scrim"); + new LeeFilter ("271", 0xF0F0F0, "Mirror Silver"); + new LeeFilter ("272", 0xF0DC96, "Soft Gold Reflector"); + new LeeFilter ("273", 0xF3F3F3, "Soft Silver Reflector"); + new LeeFilter ("274", 0xEBD791, "Mirror Gold"); + new LeeFilter ("275", 0xBEBEBE, "Black Scrim"); + new LeeFilter ("278", 0xF3FFF3, "Eighth Plus Green"); + new LeeFilter ("279", 0xFFF3F7, "Eighth Minus Green"); + new LeeFilter ("280", 0x000000, "Black Foil"); + new LeeFilter ("281", 0xCDE6FA, "Three Quarter C.T. Blue"); + new LeeFilter ("283", 0xAFD9F5, "One and a Half C.T. Blue"); + new LeeFilter ("285", 0xFCCD94, "Three Quarter C.T. Orange"); + new LeeFilter ("286", 0xFFB464, "One and a Half C.T. Orange"); + new LeeFilter ("287", 0xFFA055, "Double C.T. Orange"); + new LeeFilter ("298", 0xE6E6E6, "0.15 ND"); + new LeeFilter ("299", 0x5F5F5F, "1.2 ND"); + new LeeFilter ("322", 0x41F5BE, "Soft Green"); + new LeeFilter ("323", 0x00E1AA, "Jade"); + new LeeFilter ("327", 0x008C50, "Forest Green"); + new LeeFilter ("328", 0xFF64C8, "Follies Pink"); + new LeeFilter ("332", 0xFF3787, "Special Rose Pink"); + new LeeFilter ("343", 0x8C00D2, "Special Medium Lavender"); + new LeeFilter ("345", 0xCD6ED7, "Fuchsia Pink"); + new LeeFilter ("352", 0x5AC8E1, "Glacier Blue"); + new LeeFilter ("353", 0x61E8E3, "Lighter Blue"); + new LeeFilter ("354", 0x00F0D7, "Special Steel Blue"); + new LeeFilter ("363", 0x006EC3, "Special Medium Blue"); + new LeeFilter ("366", 0xAAD2F0, "Cornflower"); + new LeeFilter ("400", 0xFFFFFF, "LEELux"); + new LeeFilter ("402", 0xFFFFFF, "Soft Frost"); + new LeeFilter ("404", 0xFFFFFF, "Half Soft Frost"); + new LeeFilter ("410", 0xFFFFFF, "Opal Frost"); + new LeeFilter ("414", 0xFFFFFF, "Highlight"); + new LeeFilter ("416", 0xFFFFFF, "Three Quarter White Diffusion"); + new LeeFilter ("420", 0xFFFFFF, "Light Opal Frost"); + new LeeFilter ("429", 0xFFFFFF, "Quiet Frost"); + new LeeFilter ("430", 0xFFFFFF, "Grid Cloth"); + new LeeFilter ("432", 0xFFFFFF, "Light Grid Cloth"); + new LeeFilter ("434", 0xFFFFFF, "Quarter Grid Cloth"); + new LeeFilter ("439", 0xFFFFFF, "Heavy Quiet Frost"); + new LeeFilter ("441", 0xFAC084, "Full C.T. Straw"); + new LeeFilter ("442", 0xFCDCAD, "Half C.T. Straw"); + new LeeFilter ("443", 0xFCEFDB, "Quarter C.T. Straw"); + new LeeFilter ("444", 0xFAF3E8, "Eighth C.T. Straw"); + new LeeFilter ("450", 0xFFFFFF, "Three Eighth White Diffusion"); + new LeeFilter ("452", 0xFFFFFF, "Sixteenth White Diffusion"); + new LeeFilter ("460", 0xFFFFFF, "Quiet Grid Cloth"); + new LeeFilter ("462", 0xFFFFFF, "Quiet Light Grid Cloth"); + new LeeFilter ("464", 0xFFFFFF, "Quiet Quarter Grid Cloth"); + new LeeFilter ("500", 0xB4D2FF, "Double New Colour Blue"); + new LeeFilter ("501", 0xD7EBFA, "New Colour Blue (Robertson Blue)"); + new LeeFilter ("502", 0xE1F0FF, "Half New Colour Blue"); + new LeeFilter ("503", 0xF4FAFF, "Quarter New Colour Blue"); + new LeeFilter ("504", 0xD2F5DC, "Waterfront Green"); + new LeeFilter ("505", 0xE3FF5A, "Sally Green"); + new LeeFilter ("506", 0xFFDACE, "Marlene"); + new LeeFilter ("507", 0xF85000, "Madge"); + new LeeFilter ("508", 0x5A46C3, "Midnight Maya"); + new LeeFilter ("511", 0x963C00, "Bacon Brown"); + new LeeFilter ("512", 0xcc6100, "Amber Delight"); + new LeeFilter ("513", 0xf5ff7d, "Ice and a Slice"); + new LeeFilter ("514", 0xf5ff5a, "Double G&T"); + new LeeFilter ("525", 0x8EB4FA, "Argent Blue"); + new LeeFilter ("550", 0xe3ca3c, "ALD Gold"); + new LeeFilter ("600", 0x98a8aa, "Arctic White"); + new LeeFilter ("601", 0x90a0a0, "Silver"); + new LeeFilter ("602", 0xa5a5aa, "Platinum"); + new LeeFilter ("603", 0xc8cdcd, "Moonlight White"); + new LeeFilter ("604", 0xFFC295, "Full C.T. Eight Five"); + + new LeeFilter ("642", 0x968200, "Half Mustard Yellow"); + new LeeFilter ("643", 0xB4A000, "Quarter Mustard Yellow"); + new LeeFilter ("650", 0xC8A862, "Industry Sodium"); + new LeeFilter ("651", 0xFF9B5F, "HI Sodium"); + new LeeFilter ("652", 0xFF8246, "Urban Sodium"); + new LeeFilter ("653", 0x965500, "LO Sodium"); + new LeeFilter ("700", 0x7D00CD, "Perfect Lavender"); + new LeeFilter ("701", 0xB45ADC, "Provence"); + new LeeFilter ("702", 0xE6D2F0, "Special Pale Lavender"); + new LeeFilter ("703", 0xD282DC, "Cold Lavender"); + new LeeFilter ("704", 0xF0AAFA, "Lily"); + new LeeFilter ("705", 0xF0AAFA, "Lily Frost"); + new LeeFilter ("706", 0x6E46C8, "King Fals Lavender"); + new LeeFilter ("707", 0x6400B4, "Ultimate Violet"); + new LeeFilter ("708", 0xDCEBFA, "Cool Lavender"); + new LeeFilter ("709", 0xC8C8FA, "Electric Lilac"); + new LeeFilter ("710", 0x8CA0F0, "Spir Special Blue"); + new LeeFilter ("711", 0xAABEDC, "Cold Blue"); + new LeeFilter ("712", 0xA0BEF0, "Bedford Blue"); + new LeeFilter ("713", 0x003CA0, "J.Winter Blue"); + new LeeFilter ("714", 0x5A91D2, "Elysian Blue"); + new LeeFilter ("715", 0x3C6EDC, "Cabana Blue"); + new LeeFilter ("716", 0x0064D2, "Mikkel Blue"); + new LeeFilter ("717", 0xC3E1FA, "Shanklin Frost"); + new LeeFilter ("718", 0xD4EDFA, "Half Shanklin Frost"); + new LeeFilter ("719", 0x9BC3F0, "Colour Wash Blue"); + new LeeFilter ("720", 0xC3E1FA, "Durham Daylight Frost"); + new LeeFilter ("721", 0x0082E6, "Berry Blue"); + new LeeFilter ("722", 0x008CD2, "Bray Blue"); + new LeeFilter ("723", 0x5082DC, "Virgin Blue"); + new LeeFilter ("724", 0x69E1EB, "Ocean Blue"); + new LeeFilter ("725", 0xBEF2F3, "Old Steel Blue"); + new LeeFilter ("727", 0x00A5B4, "QFD Blue"); + new LeeFilter ("728", 0xC8EBD2, "Steel Green"); + new LeeFilter ("729", 0x00AFAA, "Scuba Blue"); + new LeeFilter ("730", 0xDCFFE6, "Liberty Green"); + new LeeFilter ("731", 0xE1FAD7, "Dirty Ice"); + new LeeFilter ("733", 0xEBF7CF, "Damp Squib"); + new LeeFilter ("735", 0x00BE78, "Velvet Green"); + new LeeFilter ("736", 0x00AA00, "Twickenham Green"); + new LeeFilter ("738", 0xAAFF00, "JAS Green"); + new LeeFilter ("740", 0x5A6E00, "Aurora Borealis Green"); + new LeeFilter ("741", 0x826400, "Mustard Yellow"); + new LeeFilter ("742", 0xE19B50, "Bram Brown"); + new LeeFilter ("744", 0xF8C882, "Dirty White"); + new LeeFilter ("746", 0x6E3C00, "Brown"); + new LeeFilter ("747", 0xF5B99F, "Easy White"); + new LeeFilter ("748", 0xE96785, "Seedy Pink"); + new LeeFilter ("749", 0xFCD3CD, "Hampshire Rose"); + new LeeFilter ("750", 0xFAF1FE, "Durham Frost"); + new LeeFilter ("763", 0xFCF0D2, "Wheat"); + new LeeFilter ("764", 0xFCE6B4, "Sun Colour Straw"); + new LeeFilter ("765", 0xFFE591, "LEE Yellow"); + new LeeFilter ("767", 0xFFE600, "Oklahoma Yellow"); + new LeeFilter ("768", 0xFFC600, "Egg Yolk Yellow"); + new LeeFilter ("770", 0xFFB400, "Burnt Yellow"); + new LeeFilter ("773", 0xFCC5B2, "Cardbox Amber"); + new LeeFilter ("774", 0xFCD2BE, "Soft Amber Key 1"); + new LeeFilter ("775", 0xFCC6A5, "Soft Amber Key 2"); + new LeeFilter ("776", 0xFCBE9B, "Nectarine"); + new LeeFilter ("777", 0xF58200, "Rust"); + new LeeFilter ("778", 0xFF7600, "Millennium Gold"); + new LeeFilter ("779", 0xFC9885, "Bastard Pink"); + new LeeFilter ("780", 0xFF6F00, "AS Golden Amber"); + new LeeFilter ("781", 0xFF5000, "Terry Red"); + new LeeFilter ("787", 0xB9003C, "Marius Red"); + new LeeFilter ("789", 0xAA3C32, "Blood Red"); + new LeeFilter ("790", 0xFFB4A5, "Moroccan Pink"); + new LeeFilter ("791", 0xF5B9AA, "Moroccan Frost"); + new LeeFilter ("793", 0xFF3CA0, "Vanity Fair"); + new LeeFilter ("794", 0xFFAFDC, "Pretty 'n Pink"); + new LeeFilter ("795", 0xFA46C8, "Magical Magenta"); + new LeeFilter ("797", 0xAF0096, "Deep Purple"); + new LeeFilter ("798", 0xA000BE, "Chrysalis Pink"); + new LeeFilter ("799", 0x3C00B4, "Special KH Lavender"); + + new LeeFilter ("CL104", 0xff9600, "Cool LED Deep Amber"); + new LeeFilter ("CL105", 0xff6e00, "Cool LED Orange"); + new LeeFilter ("CL106", 0xbe0032, "Cool LED Primary Red"); + new LeeFilter ("CL113", 0xc80050, "Cool LED Magenta"); + new LeeFilter ("CL115", 0x00ffa0, "Cool LED Peacock Blue"); + new LeeFilter ("CL116", 0x00aa82, "Cool LED Medium Blue-Green"); + new LeeFilter ("CL117", 0xebffa0, "Cool LED Steel Blue"); + new LeeFilter ("CL118", 0x00f5b4, "Cool LED Light Blue"); + new LeeFilter ("CL119", 0x0091a5, "Cool LED Dark Blue"); + new LeeFilter ("CL126", 0xaf0050, "Cool LED Mauve"); + new LeeFilter ("CL128", 0xff0069, "Cool LED Bright Pink"); + new LeeFilter ("CL132", 0x00c8c8, "Cool LED Medium Blue"); + new LeeFilter ("CL139", 0x4bc300, "Cool LED Primary Green"); + new LeeFilter ("CL147", 0xff7d46, "Cool LED Apricot"); + new LeeFilter ("CL158", 0xff6900, "Cool LED Deep Orange"); + new LeeFilter ("CL164", 0xff0000, "Cool LED Flame Red"); + new LeeFilter ("CL180", 0xeb78a0, "Cool LED Dark Lavender"); + new LeeFilter ("CL181", 0x960078, "Cool LED Congo Blue"); + new LeeFilter ("CL182", 0xdc0052, "Cool LED Light Red"); + + new LeeFilter ("414P", 0xFFFFFF, "Perforated Highlight"); + new LeeFilter ("439P", 0xFFFFFF, "Perforated Heavy Quiet Frost"); + new LeeFilter ("A205", 0xFAD7AF, "Half C.T.O. Acrylic Panel"); + new LeeFilter ("A207", 0xF3B76E, "Full C.T.O. + 0.3 ND Acrylic Panel"); + new LeeFilter ("A208", 0xE7A651, "Full C.T.O. + 0.6 ND Acrylic Panel"); + new LeeFilter ("A209", 0xCDCDCD, "0.3 ND Acrylic Panel"); + new LeeFilter ("A210", 0xAAAAAA, "0.6 ND Acrylic Panel"); + new LeeFilter ("A211", 0x878787, "0.9 ND Acrylic Panel"); + } + + // + // + // + // + // + // + // + // + // + // + // + // +} diff --git a/src/java/adecWatt/model/Patch.java b/src/java/adecWatt/model/Patch.java new file mode 100644 index 0000000..5a83ddf --- /dev/null +++ b/src/java/adecWatt/model/Patch.java @@ -0,0 +1,90 @@ +package adecWatt.model; + +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + +public class Patch { + public TreeMap lineConsumption = new TreeMap (); + public TreeMap lineCircuit = new TreeMap (Circuits.lineComparator); + + public TreeMap circuitConsumption = new TreeMap (); + public TreeMap> circuitLines = new TreeMap > (Circuits.lineComparator); + public TreeSet circuitless = new TreeSet (); + public TreeSet unplug = new TreeSet (Circuits.lineComparator); + public TreeSet shortcut = new TreeSet (Circuits.lineComparator); + + private void addConsumption (TreeMap map, String name, int value) { + Integer oldValue = map.get (name); + map.put (name, oldValue == null ? value : oldValue+value); + } + + public Set getLineKeys () { + TreeSet result = new TreeSet (Circuits.lineComparator); + result.addAll (lineCircuit.keySet ()); + return result; + } + + public Set getCircuitKeys () { + TreeSet result = new TreeSet (Circuits.lineComparator); + result.addAll (circuitLines.keySet ()); + return result; + } + + public Patch (Circuits circuits) { + for (Comp lastComp : circuits.keySet ()) { + Circuits.Circuit circuit = circuits.get (lastComp); + String lineName = lastComp.getLine (); + if (lineName == null) + continue; + TreeSet circuitNames = circuit.names; + int consumption = circuit.consumption; + switch (circuitNames.size ()) { + case 0: + continue; + case 1: + String circuitName = circuitNames.first (); + addConsumption (lineConsumption, lineName, consumption); + lineCircuit.put (lineName, circuitName); + addConsumption (circuitConsumption, circuitName, consumption); + TreeSet otherLines = circuitLines.get (circuitName); + if (otherLines == null) + circuitLines.put (circuitName, otherLines = new TreeSet (Circuits.lineComparator)); + otherLines.add (lineName); + break; + default: + lineCircuit.put (lineName, Circuits.SHORTCUT); + for (String circuitName2 : circuitNames) + shortcut.add (circuitName2); + } + } + for (Comp beginComp : circuits.getPlugedComps ()) + accLoop : + for (Acc beginAcc : beginComp.allPlugs) { + String circuitName = beginAcc.getCircuit (beginComp); + String compName = beginComp.getName (); + if (circuits.inLoop (beginAcc)) { + if (circuitName != null) + unplug.add (circuitName); + else + circuitless.add (compName); + continue; + } + for (Comp lastComp : circuits.keySet ()) { + Circuits.Circuit circuit = circuits.get (lastComp); + if (!circuit.nodes.contains (beginAcc)) + continue; + if (lastComp.getLine () == null) + if (circuitName != null) + unplug.add (circuitName); + else + circuitless.add (compName); + continue accLoop; + } + if (circuitName != null) + unplug.add (circuitName); + else + circuitless.add (compName); + } + } +} diff --git a/src/java/adecWatt/model/Permanent.java b/src/java/adecWatt/model/Permanent.java new file mode 100644 index 0000000..b386e60 --- /dev/null +++ b/src/java/adecWatt/model/Permanent.java @@ -0,0 +1,162 @@ +package adecWatt.model; + +import java.util.Arrays; +import java.util.Collection; +import java.util.TreeSet; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import misc.Bundle; +import adecWatt.model.xml.XmlPermanent; + +public abstract class Permanent