pyforcedirectedlayout 2.0.0__tar.gz → 2.1.0__tar.gz

{pyforcedirectedlayout-2.0.0/src/pyforcedirectedlayout.egg-info → pyforcedirectedlayout-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyforcedirectedlayout
-Version: 2.0.0
+Version: 2.1.0
 Summary: Python Implementation of a Force Directed Layout Algorithm
 Author-email: "Humberto A. Sanchez II" <Humbert.A.Sanchez.II@gmail.com>
 Maintainer-email: "Humberto A. Sanchez II" <Humbert.A.Sanchez.II@gmail.com>
@@ -18,15 +18,19 @@ Requires-Dist: wheel==0.46.3; extra == "deploy"
 Requires-Dist: setuptools==82.0.1; extra == "deploy"
 Requires-Dist: twine==6.2.0; extra == "deploy"
 Requires-Dist: build==1.2.2.post1; extra == "deploy"
+Provides-Extra: ui
+Requires-Dist: wxPython>=4.3.1; extra == "ui"
+Requires-Dist: codeallyadvanced>=2.5.8; extra == "ui"
 Provides-Extra: demo
-Requires-Dist: wxPython==4.2.4; extra == "demo"
+Requires-Dist: wxPython>=4.3.1; extra == "demo"
+Requires-Dist: codeallyadvanced>=2.5.8; extra == "demo"
 Dynamic: license-file
 
 ![](https://github.com/hasii2011/code-ally-basic/blob/master/developer/agpl-license-web-badge-version-2-256x48.png "AGPL")
 
-[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/Naereen/StrapDown.js/graphs/commit-activity)
-[![CircleCI](https://dl.circleci.com/status-badge/img/gh/hasii2011/py-force-directed-layout/tree/master.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/hasii2011/py-force-directed-layout/tree/master)
+[![CI](https://github.com/hasii2011/py-force-directed-layout/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/hasii2011/py-force-directed-layout/actions/workflows/ci.yml)
 [![PyPI version](https://badge.fury.io/py/pyforcedirectedlayout.svg)](https://badge.fury.io/py/pyforcedirectedlayout)
+[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/hasii2011/py-force-directed-layout/graphs/commit-activity)
 
 
 # Introduction
@@ -79,25 +83,7 @@ ___
 
 # Note
 For all kinds of problems, requests, enhancements, bug reports, etc., drop me an e-mail.
-Written by <a href="mailto:email@humberto.a.sanchez.ii@gmail.com?subject=Hello Humberto">Humberto A. Sanchez II</a>  (C) 2024
+Written by <a href="mailto:humberto.a.sanchez.ii@gmail.com?subject=Hello Humberto">Humberto A. Sanchez II</a>  ©2026
 
 
-
-![Humberto's Modified Logo](https://raw.githubusercontent.com/wiki/hasii2011/gittodoistclone/images/SillyGitHub.png)
-
-I am concerned about GitHub's Copilot project.
-
-
-I urge you to read about the
-[Give up GitHub](https://GiveUpGitHub.org) campaign from
-[the Software Freedom Conservancy](https://sfconservancy.org).
-
-While I do not advocate for all the issues listed there, I do not like that
-a company like Microsoft may profit from open source projects.
-
-I continue to use GitHub because it offers the services I need for free.  But I continue
-to monitor their terms of service.
-
-Any use of this project's code by GitHub Copilot, past or present, is done
-without my permission.  I do not consent to GitHub's use of this project's
-code in Copilot.
+[Copilot Statement](https://github.com/hasii2011/code-ally-basic/wiki/GitHub-Copilot).

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/README.md

@@ -1,8 +1,8 @@
 ![](https://github.com/hasii2011/code-ally-basic/blob/master/developer/agpl-license-web-badge-version-2-256x48.png "AGPL")
 
-[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/Naereen/StrapDown.js/graphs/commit-activity)
-[![CircleCI](https://dl.circleci.com/status-badge/img/gh/hasii2011/py-force-directed-layout/tree/master.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/hasii2011/py-force-directed-layout/tree/master)
+[![CI](https://github.com/hasii2011/py-force-directed-layout/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/hasii2011/py-force-directed-layout/actions/workflows/ci.yml)
 [![PyPI version](https://badge.fury.io/py/pyforcedirectedlayout.svg)](https://badge.fury.io/py/pyforcedirectedlayout)
+[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/hasii2011/py-force-directed-layout/graphs/commit-activity)
 
 
 # Introduction
@@ -55,25 +55,7 @@ ___
 
 # Note
 For all kinds of problems, requests, enhancements, bug reports, etc., drop me an e-mail.
-Written by <a href="mailto:email@humberto.a.sanchez.ii@gmail.com?subject=Hello Humberto">Humberto A. Sanchez II</a>  (C) 2024
+Written by <a href="mailto:humberto.a.sanchez.ii@gmail.com?subject=Hello Humberto">Humberto A. Sanchez II</a>  ©2026
 
 
-
-![Humberto's Modified Logo](https://raw.githubusercontent.com/wiki/hasii2011/gittodoistclone/images/SillyGitHub.png)
-
-I am concerned about GitHub's Copilot project.
-
-
-I urge you to read about the
-[Give up GitHub](https://GiveUpGitHub.org) campaign from
-[the Software Freedom Conservancy](https://sfconservancy.org).
-
-While I do not advocate for all the issues listed there, I do not like that
-a company like Microsoft may profit from open source projects.
-
-I continue to use GitHub because it offers the services I need for free.  But I continue
-to monitor their terms of service.
-
-Any use of this project's code by GitHub Copilot, past or present, is done
-without my permission.  I do not consent to GitHub's use of this project's
-code in Copilot.
+[Copilot Statement](https://github.com/hasii2011/code-ally-basic/wiki/GitHub-Copilot).

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/pyproject.toml

@@ -29,8 +29,14 @@ deploy = [
     'build==1.2.2.post1',
 ]
 
+ui = [
+    'wxPython>=4.3.1',
+    'codeallyadvanced>=2.5.8',
+]
+
 demo = [
-    'wxPython==4.2.4',
+    'wxPython>=4.3.1',
+    'codeallyadvanced>=2.5.8',
 ]
 
 [project.urls]

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/src/pyforcedirectedlayout/Configuration.py

@@ -15,10 +15,10 @@ from codeallybasic.SecureConversions import SecureConversions
 
 from codeallybasic.SingletonV3 import SingletonV3
 
-X_RANGE_MIN: int = -1024
-X_RANGE_MAX: int = 1024
-Y_RANGE_MIN: int = -1024
-Y_RANGE_MAX: int = 1024
+X_RANGE_MIN: int = 0
+X_RANGE_MAX: int = 2048
+Y_RANGE_MIN: int = 0
+Y_RANGE_MAX: int = 2048
 
 arrangeProperties: ValueDescriptions = ValueDescriptions(
     {
@@ -30,10 +30,10 @@ arrangeProperties: ValueDescriptions = ValueDescriptions(
     }
 )
 
-DEFAULT_MIN_X_COORDINATE: int = -50
-DEFAULT_MAX_X_COORDINATE: int = 50
-DEFAULT_MIN_Y_COORDINATE: int = -50
-DEFAULT_MAX_Y_COORDINATE: int = 50
+DEFAULT_MIN_X_COORDINATE: int = 50
+DEFAULT_MAX_X_COORDINATE: int = 500
+DEFAULT_MIN_Y_COORDINATE: int = 50
+DEFAULT_MAX_Y_COORDINATE: int = 500
 
 DEFAULT_MIN_MAX_X: str = MinMax(minValue=DEFAULT_MIN_X_COORDINATE, maxValue=DEFAULT_MAX_X_COORDINATE).__repr__()
 DEFAULT_MIN_MAX_Y: str = MinMax(minValue=DEFAULT_MIN_Y_COORDINATE, maxValue=DEFAULT_MAX_Y_COORDINATE).__repr__()
@@ -62,6 +62,7 @@ PYFDL_SECTIONS: Sections = Sections(
     }
 )
 
+MODULE_NAME: str = 'pyfdl'
 
 class Configuration(DynamicConfiguration, metaclass=SingletonV3):
 
@@ -69,4 +70,4 @@ class Configuration(DynamicConfiguration, metaclass=SingletonV3):
 
         self._logger: Logger = getLogger(__name__)
 
-        super().__init__(baseFileName='pyfdl.ini', moduleName='pydfl', sections=PYFDL_SECTIONS)
+        super().__init__(baseFileName=f'{MODULE_NAME}.ini', moduleName=f'{MODULE_NAME}', sections=PYFDL_SECTIONS)

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/src/pyforcedirectedlayout/ForceDirectedLayout.py

@@ -16,6 +16,8 @@ from random import randint
 from uuid import uuid4
 from uuid import UUID
 
+from codeallybasic.MinMax import MinMax
+
 from pyforcedirectedlayout.Configuration import Configuration
 from pyforcedirectedlayout.LayoutTypes import LayoutStatus
 from pyforcedirectedlayout.LayoutTypes import LayoutStatusCallback
@@ -193,14 +195,14 @@ class ForceDirectedLayout:
 
     def _adjustNodes(self):
         logicalBounds: Rectangle = self._getDiagramBounds()
-        # midPoint:      Point     = Point(x=logicalBounds.x + (logicalBounds.width // 2),
-        #                                  y=logicalBounds.y + (logicalBounds.height // 2)
-        #                                  )
-        midPoint:      Point     = Point(x=logicalBounds.x + logicalBounds.width,
-                                         y=logicalBounds.y + logicalBounds.height
+        midPoint:      Point     = Point(x=logicalBounds.x + (logicalBounds.width // 2),
+                                         y=logicalBounds.y + (logicalBounds.height // 2)
                                          )
+        # midPoint:      Point     = Point(x=logicalBounds.x + logicalBounds.width,
+        #                                  y=logicalBounds.y + logicalBounds.height
+        #                                  )
         for n in self._nodes:
-            node: Node = cast(Node, n)
+            node: Node = n
             node.location -= midPoint
             node.location.x += node.size.width
             node.location.y += node.size.height
@@ -232,7 +234,7 @@ class ForceDirectedLayout:
             netForce += self._calculateAttractionForce(x=currentLayoutNode, y=child, springLength=springLength)
 
         for p in self._nodes:
-            parent: Node = cast(Node, p)
+            parent: Node = p
             if currentLayoutNode in parent.connections:
                 netForce += self._calculateAttractionForce(x=currentLayoutNode, y=parent, springLength=springLength)
 
@@ -248,14 +250,12 @@ class ForceDirectedLayout:
         layout: NodeLayoutInformationList = NodeLayoutInformationList([])
         for node in self._nodes:
             diagramNode: Node = node
-            # minRandomX: int = self._configuration.minPoint.x
-            # maxRandomX: int = self._configuration.maxPoint.x
-            # minRandomY: int = self._configuration.minPoint.y
-            # maxRandomY: int = self._configuration.maxPoint.y
-
-            # diagramNode.location = Point(x=randint(minRandomX, maxRandomX), y=randint(minRandomY, maxRandomY))
-            diagramNode.location = Point(x=randint(-50, 50), y=randint(-50, 50))
-            # diagramNode.location = Point(x=randint(10, 100), y=randint(10, 100))
+
+            minMaxX: MinMax = self._configuration.minMaxX
+            minMaxY: MinMax = self._configuration.minMaxY
+
+            diagramNode.location = Point(x=randint(minMaxX.minValue, minMaxX.maxValue), y=randint(minMaxY.minValue, minMaxY.minValue))
+
             layoutInformation: NodeLayoutInformation = NodeLayoutInformation(node=diagramNode,
                                                                              velocity=Vector(magnitude=0, direction=0),
                                                                              nextPosition=Point(),
@@ -396,9 +396,10 @@ class ForceDirectedLayout:
 
         return int(distance)
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
 
         if isinstance(other, ForceDirectedLayout) is False:
             return False
 
-        return self.id == other.id
+        otherMe: ForceDirectedLayout = cast(ForceDirectedLayout, other)     # noqa
+        return self.id == otherMe.id

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/src/pyforcedirectedlayout/Node.py

@@ -168,10 +168,15 @@ class Node(ABC):
         else:
             return True
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
 
-        ans: bool = False
-        if self.x == other.x and self.y == other .y and self.location == other.location:
+        ans:       bool = False
+        realOther: Node = cast(Node, other)
+
+        if self.x == realOther.x and realOther.y == realOther.y and self.location == realOther.location:
             ans = True
 
         return ans
+
+    def __repr__(self) -> str:
+        return f'Node: location: {self.location})'

pyforcedirectedlayout-2.1.0/src/pyforcedirectedlayout/_version.py

@@ -0,0 +1 @@
+__version__: str = '2.1.0'

pyforcedirectedlayout-2.1.0/src/pyforcedirectedlayout/ui/ConfigurationPanel.py

@@ -0,0 +1,198 @@
+
+from typing import cast
+
+from logging import Logger
+from logging import getLogger
+
+from wx import EVT_SPINCTRL
+from wx import EVT_SPINCTRLDOUBLE
+from wx import SP_VERTICAL
+
+from wx import Size
+from wx import SpinCtrl
+from wx import SpinEvent
+from wx import SpinCtrlDouble
+from wx import DefaultPosition
+from wx import SpinDoubleEvent
+
+from wx.lib.sized_controls import SizedPanel
+from wx.lib.sized_controls import SizedStaticBox
+
+from codeallybasic.MinMax import MinMax
+
+from codeallyadvanced.ui.widgets.DialSelector import DialSelector
+from codeallyadvanced.ui.widgets.DialSelector import DialSelectorParameters
+from codeallyadvanced.ui.widgets.MinMaxControl import MinMaxControl
+
+from pyforcedirectedlayout.Configuration import Configuration
+from pyforcedirectedlayout.Configuration import X_RANGE_MAX
+from pyforcedirectedlayout.Configuration import X_RANGE_MIN
+from pyforcedirectedlayout.Configuration import Y_RANGE_MAX
+from pyforcedirectedlayout.Configuration import Y_RANGE_MIN
+
+
+NODE_ATTRACTION_FORCE_MIN:       float = 0.01
+NODE_ATTRACTION_FORCE_MAX:       float = 1.0
+NODE_ATTRACTION_FORCE_INCREMENT: float = 0.05
+
+REPULSION_FORCE_MIN: int = 500
+REPULSION_FORCE_MAX: int = 25000
+
+NO_DIAL_SELECTOR: DialSelector = cast(DialSelector, cast(object, None))
+
+
+class ConfigurationPanel:
+    """
+    Builds the force-directed layout configuration controls inside a parent SizedPanel.
+    Assumes the parent panel is vertically oriented.
+
+    Updates the Configuration singleton as the user changes values.
+    """
+    def __init__(self, sizedPanel: SizedPanel):
+
+        self.logger: Logger = getLogger(__name__)
+
+        self._configuration: Configuration = Configuration()
+
+        self._damping:       DialSelector = NO_DIAL_SELECTOR
+        self._springLength:  DialSelector = NO_DIAL_SELECTOR
+        self._maxIterations: DialSelector = NO_DIAL_SELECTOR
+
+        self._layoutForceParameters(parentPanel=sizedPanel)
+        self._layoutRandomizeParameters(parentPanel=sizedPanel)
+        self._layoutAlgorithmParameters(parentPanel=sizedPanel)
+
+    def _layoutForceParameters(self, parentPanel: SizedPanel):
+        """
+        Sets the protected properties:
+
+        self._damping
+        self._springLength
+        self._maxIterations
+
+        Args:
+            parentPanel:  The panel that hosts these components
+        """
+
+        localPanel: SizedStaticBox = SizedStaticBox(parentPanel, label='Directed Layout Parameters')
+        localPanel.SetSizerType('horizontal')
+        localPanel.SetSizerProps(expand=True, proportion=2)
+
+        dampingParameters: DialSelectorParameters = DialSelectorParameters(minValue=0.1, maxValue=1.0, dialLabel='Damping',
+                                                                           formatValueCallback=self._formatDampingValue,
+                                                                           valueChangedCallback=self._dampingChanged)
+        damping: DialSelector = DialSelector(localPanel, parameters=dampingParameters)
+        damping.tickFrequency = 10
+        damping.tickValue     = 0.1
+        damping.value         = self._configuration.damping
+
+        springLengthParameters: DialSelectorParameters = DialSelectorParameters(minValue=100, maxValue=500, dialLabel='Spring Length',
+                                                                                formatValueCallback=self._formatSpringLength,
+                                                                                valueChangedCallback=self._springLengthChanged)
+
+        springLength: DialSelector = DialSelector(localPanel, parameters=springLengthParameters)
+        springLength.tickFrequency = 20
+        springLength.tickValue     = 25
+        springLength.value         = self._configuration.springLength
+
+        maxIterationsParameters: DialSelectorParameters = DialSelectorParameters(minValue=100,
+                                                                                 maxValue=1000,
+                                                                                 dialLabel='Maximum Iterations',
+                                                                                 formatValueCallback=self._formatMaxIterations,
+                                                                                 valueChangedCallback=self._maxIterationsChanged)
+        maxIterations: DialSelector = DialSelector(localPanel, parameters=maxIterationsParameters)
+        maxIterations.tickFrequency = 50
+        maxIterations.tickValue     = 20
+        maxIterations.value         = self._configuration.maxIterations
+
+        self._damping       = damping
+        self._springLength  = springLength
+        self._maxIterations = maxIterations
+
+    def _layoutRandomizeParameters(self, parentPanel: SizedPanel):
+
+        localPanel: SizedStaticBox = SizedStaticBox(parentPanel, label='Randomize Initial Layout Parameters')
+        localPanel.SetSizerType('vertical')
+        localPanel.SetSizerProps(expand=True, proportion=1)
+
+        horizontalPanel: SizedPanel = SizedPanel(localPanel)
+        horizontalPanel.SetSizerType('horizontal')
+        horizontalPanel.SetSizerProps(expand=True, proportion=1)
+
+        minMaxX: MinMaxControl = MinMaxControl(sizedPanel=horizontalPanel, displayText='Minimum/Maximum X Value',
+                                               minValue=X_RANGE_MIN, maxValue=X_RANGE_MAX,
+                                               valueChangedCallback=self._onMinMaxX,
+                                               setControlsSize=False)
+        minMaxX.minMax = self._configuration.minMaxX
+
+        minMaxY: MinMaxControl = MinMaxControl(sizedPanel=horizontalPanel, displayText='Minimum/Maximum Y Value',
+                                               minValue=Y_RANGE_MIN, maxValue=Y_RANGE_MAX,
+                                               valueChangedCallback=self._onMinMaxY,
+                                               setControlsSize=False)
+        minMaxY.minMax = self._configuration.minMaxY
+
+    def _layoutAlgorithmParameters(self, parentPanel: SizedPanel):
+
+        algorithmFactorsPanel: SizedStaticBox = SizedStaticBox(parentPanel, label='Algorithm Parameters')
+        algorithmFactorsPanel.SetSizerType('horizontal')
+        algorithmFactorsPanel.SetSizerProps(expand=True, proportion=1)
+
+        attractionPanel: SizedStaticBox = SizedStaticBox(algorithmFactorsPanel, label='Node Attraction Force')
+        attractionPanel.SetSizerType('vertical')
+        attractionPanel.SetSizerProps(proportion=0)
+
+        attractionForce: SpinCtrlDouble = SpinCtrlDouble(attractionPanel,
+                                                         min=NODE_ATTRACTION_FORCE_MIN,
+                                                         max=NODE_ATTRACTION_FORCE_MAX,
+                                                         inc=NODE_ATTRACTION_FORCE_INCREMENT,
+                                                         size=Size(75, 35))
+        attractionForce.SetDigits(2)
+        attractionForce.SetValue(self._configuration.attractionForce)
+        attractionForce.Bind(EVT_SPINCTRLDOUBLE, self._attractionForceChanged)
+
+        repulsionPanel: SizedStaticBox = SizedStaticBox(algorithmFactorsPanel, label='Node Repulsion Force')
+        repulsionPanel.SetSizerType('vertical')
+        repulsionPanel.SetSizerProps(proportion=0)
+
+        repulsionForce: SpinCtrl = SpinCtrl(repulsionPanel, size=Size(75, 35), pos=DefaultPosition, style=SP_VERTICAL)
+        repulsionForce.SetRange(REPULSION_FORCE_MIN, REPULSION_FORCE_MAX)
+        repulsionForce.SetValue(self._configuration.repulsionForce)
+        repulsionForce.SetIncrement(100)
+        repulsionForce.Bind(EVT_SPINCTRL, self._repulsionForceChanged)
+
+    def _formatDampingValue(self, valueToFormat: float):
+
+        return f'{valueToFormat:.2f}'
+
+    def _formatSpringLength(self, valueToFormat: int):
+        return f'{valueToFormat}'
+
+    def _formatMaxIterations(self, valueToFormat: int):
+        return f'{valueToFormat}'
+
+    def _dampingChanged(self, newValue: int):
+        self._configuration.damping = newValue
+
+    def _springLengthChanged(self, newValue: int):
+        self._configuration.springLength = newValue
+
+    def _maxIterationsChanged(self, newValue: int):
+        self._configuration.maxIterations = newValue
+
+    def _onMinMaxX(self, minMaxX: MinMax):
+        self._configuration.minMaxX = minMaxX
+
+    def _onMinMaxY(self, minMaxY: MinMax):
+        self._configuration.minMaxY = minMaxY
+
+    def _attractionForceChanged(self, event: SpinDoubleEvent):
+
+        spinCtrlDouble: SpinCtrlDouble = cast(SpinCtrlDouble, event.GetEventObject())
+
+        self._configuration.attractionForce = spinCtrlDouble.GetValue()
+
+    def _repulsionForceChanged(self, event: SpinEvent):
+
+        spinCtrl: SpinCtrl = cast(SpinCtrl, event.GetEventObject())
+
+        self._configuration.repulsionForce = spinCtrl.GetValue()

pyforcedirectedlayout-2.1.0/src/pyforcedirectedlayout/ui/DlgConfiguration.py

@@ -0,0 +1,67 @@
+
+from logging import Logger
+from logging import getLogger
+
+from wx import OK
+from wx import ID_OK
+from wx import CANCEL
+from wx import EVT_CLOSE
+from wx import EVT_BUTTON
+from wx import ID_CANCEL
+from wx import DEFAULT_DIALOG_STYLE
+
+from wx import Size
+from wx import Window
+from wx import CommandEvent
+from wx import StdDialogButtonSizer
+
+from wx.lib.sized_controls import SizedDialog
+from wx.lib.sized_controls import SizedPanel
+
+from pyforcedirectedlayout.ui.ConfigurationPanel import ConfigurationPanel
+
+
+class DlgConfiguration(SizedDialog):
+    """
+    A reusable dialog wrapping ConfigurationPanel with standard OK/Cancel buttons.
+    """
+
+    def __init__(self, parent: Window):
+
+        style:   int  = DEFAULT_DIALOG_STYLE
+        dlgSize: Size = Size(470, 540)
+
+        super().__init__(parent, title='Force Directed Configuration', size=dlgSize, style=style)
+
+        self.logger: Logger = getLogger(__name__)
+
+        sizedPanel: SizedPanel = self.GetContentsPane()
+        sizedPanel.SetSizerType('vertical')
+        sizedPanel.SetSizerProps(proportion=1)
+
+        self._configurationPanel: ConfigurationPanel = ConfigurationPanel(sizedPanel=sizedPanel)
+        self._layoutStandardOkCancelButtonSizer()
+
+    def _layoutStandardOkCancelButtonSizer(self):
+        """
+        Call this last when creating controls; Will take care of
+        adding callbacks for the Ok and Cancel buttons
+        """
+        buttSizer: StdDialogButtonSizer = self.CreateStdDialogButtonSizer(OK | CANCEL)
+
+        self.SetButtonSizer(buttSizer)
+        self.Bind(EVT_BUTTON, self._onOk,    id=ID_OK)
+        self.Bind(EVT_BUTTON, self._onClose, id=ID_CANCEL)
+        self.Bind(EVT_CLOSE,  self._onClose)
+
+    # noinspection PyUnusedLocal
+    def _onOk(self, _event: CommandEvent):
+        """
+        """
+        self.EndModal(OK)
+
+    # noinspection PyUnusedLocal
+    def _onClose(self, _event: CommandEvent):
+        """
+        """
+        self.EndModal(CANCEL)

pyforcedirectedlayout-2.1.0/src/pyforcedirectedlayout/ui/__init__.py

@@ -0,0 +1 @@
+

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0/src/pyforcedirectedlayout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyforcedirectedlayout
-Version: 2.0.0
+Version: 2.1.0
 Summary: Python Implementation of a Force Directed Layout Algorithm
 Author-email: "Humberto A. Sanchez II" <Humbert.A.Sanchez.II@gmail.com>
 Maintainer-email: "Humberto A. Sanchez II" <Humbert.A.Sanchez.II@gmail.com>
@@ -18,15 +18,19 @@ Requires-Dist: wheel==0.46.3; extra == "deploy"
 Requires-Dist: setuptools==82.0.1; extra == "deploy"
 Requires-Dist: twine==6.2.0; extra == "deploy"
 Requires-Dist: build==1.2.2.post1; extra == "deploy"
+Provides-Extra: ui
+Requires-Dist: wxPython>=4.3.1; extra == "ui"
+Requires-Dist: codeallyadvanced>=2.5.8; extra == "ui"
 Provides-Extra: demo
-Requires-Dist: wxPython==4.2.4; extra == "demo"
+Requires-Dist: wxPython>=4.3.1; extra == "demo"
+Requires-Dist: codeallyadvanced>=2.5.8; extra == "demo"
 Dynamic: license-file
 
 ![](https://github.com/hasii2011/code-ally-basic/blob/master/developer/agpl-license-web-badge-version-2-256x48.png "AGPL")
 
-[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/Naereen/StrapDown.js/graphs/commit-activity)
-[![CircleCI](https://dl.circleci.com/status-badge/img/gh/hasii2011/py-force-directed-layout/tree/master.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/hasii2011/py-force-directed-layout/tree/master)
+[![CI](https://github.com/hasii2011/py-force-directed-layout/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/hasii2011/py-force-directed-layout/actions/workflows/ci.yml)
 [![PyPI version](https://badge.fury.io/py/pyforcedirectedlayout.svg)](https://badge.fury.io/py/pyforcedirectedlayout)
+[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/hasii2011/py-force-directed-layout/graphs/commit-activity)
 
 
 # Introduction
@@ -79,25 +83,7 @@ ___
 
 # Note
 For all kinds of problems, requests, enhancements, bug reports, etc., drop me an e-mail.
-Written by <a href="mailto:email@humberto.a.sanchez.ii@gmail.com?subject=Hello Humberto">Humberto A. Sanchez II</a>  (C) 2024
+Written by <a href="mailto:humberto.a.sanchez.ii@gmail.com?subject=Hello Humberto">Humberto A. Sanchez II</a>  ©2026
 
 
-
-![Humberto's Modified Logo](https://raw.githubusercontent.com/wiki/hasii2011/gittodoistclone/images/SillyGitHub.png)
-
-I am concerned about GitHub's Copilot project.
-
-
-I urge you to read about the
-[Give up GitHub](https://GiveUpGitHub.org) campaign from
-[the Software Freedom Conservancy](https://sfconservancy.org).
-
-While I do not advocate for all the issues listed there, I do not like that
-a company like Microsoft may profit from open source projects.
-
-I continue to use GitHub because it offers the services I need for free.  But I continue
-to monitor their terms of service.
-
-Any use of this project's code by GitHub Copilot, past or present, is done
-without my permission.  I do not consent to GitHub's use of this project's
-code in Copilot.
+[Copilot Statement](https://github.com/hasii2011/code-ally-basic/wiki/GitHub-Copilot).

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/src/pyforcedirectedlayout.egg-info/SOURCES.txt

@@ -17,4 +17,7 @@ src/pyforcedirectedlayout.egg-info/PKG-INFO
 src/pyforcedirectedlayout.egg-info/SOURCES.txt
 src/pyforcedirectedlayout.egg-info/dependency_links.txt
 src/pyforcedirectedlayout.egg-info/requires.txt
-src/pyforcedirectedlayout.egg-info/top_level.txt
+src/pyforcedirectedlayout.egg-info/top_level.txt
+src/pyforcedirectedlayout/ui/ConfigurationPanel.py
+src/pyforcedirectedlayout/ui/DlgConfiguration.py
+src/pyforcedirectedlayout/ui/__init__.py

{pyforcedirectedlayout-2.0.0 → pyforcedirectedlayout-2.1.0}/src/pyforcedirectedlayout.egg-info/requires.txt

@@ -1,7 +1,8 @@
 codeallybasic>=1.30.0
 
 [demo]
-wxPython==4.2.4
+wxPython>=4.3.1
+codeallyadvanced>=2.5.8
 
 [deploy]
 wheel==0.46.3
@@ -12,3 +13,7 @@ build==1.2.2.post1
 [test]
 mypy==1.19.1
 html-testRunner~=1.2.1
+
+[ui]
+wxPython>=4.3.1
+codeallyadvanced>=2.5.8

pyforcedirectedlayout-2.0.0/src/pyforcedirectedlayout/_version.py

@@ -1 +0,0 @@
-__version__: str = '2.0.0'