Mansi UI corrections

.gitignore

@@ -28,6 +28,7 @@ Osdag_Workspace/*
 /backup
 OUTPUT_FILES/Output_PDF/*
 Output_PDF/*
+**/osdag_gui/data/reports/*
 **/ResourceFiles/images/3d.png
 **/ResourceFiles/images/front.png
 **/ResourceFiles/images/side.png
@@ -37,4 +38,6 @@ Output_PDF/*
 **/ResourceFiles/last_designs/*
 **/ResourceFiles/html_page/*
 *.xlsx
-*.code-workspace
+*.code-workspace
+**/testing_code/
+!license-dependencies.txt

conda-recipe/meta.yaml

@@ -0,0 +1,116 @@
+# Note: there are many handy hints in comments in this example -- remove them when you've finalized your recipe
+# If your package is python based, we recommend using Grayskull to generate it instead:
+# https://github.com/conda-incubator/grayskull
+
+# Jinja variables help maintain the recipe as you'll update the version only here.
+# Using the name variable with the URL in line 16 is convenient
+# when copying and pasting from another recipe, but not really needed.
+{% set name = "Osdag" %}
+{% set branch = "dev" %}
+{% set version = "2026.04.0.0" %}
+
+package:
+  name: {{ name|lower }}
+  version: {{ version }}
+
+source:
+  # url: https://github.com/osdag-admin/{{ name }}/archive/refs/heads/{{ branch }}.zip
+  # git_url: https://github.com/osdag-admin/Osdag.git
+  # git_rev: {{ branch }}
+  # sha256: ???
+  # sha256 is the preferred checksum -- you can get it for a file with:
+  #  `openssl sha256 <file name>`.
+  # You may need the openssl package, available on conda-forge:
+  #  `conda install openssl -c conda-forge``
+
+  git_url: https://github.com/osdag-admin/{{ name }}.git
+  git_rev: {{ version }}
+  git_depth: 1  # Only clone the latest commit, which is usually enough for building a package. This can speed up the cloning process and reduce disk space usage.
+  # path: .. # Use this if the source code is already on your local machine, and you don't want to upload it to GitHub or other hosting service. The path is relative to the location of the meta.yaml file.
+
+build:
+  number: 0
+  # Uncomment the following line if the package is pure Python and the recipe is exactly the same for all platforms.
+  # It is okay if the dependencies are not built for all platforms/versions, although selectors are still not allowed.
+  # See https://conda-forge.org/docs/maintainer/knowledge_base.html#noarch-python for more details.
+  noarch: python
+  # If the installation is complex, or different between Unix and Windows, use separate bld.bat and build.sh files instead of this key.
+  # By default, the package will be built for the Python versions supported by conda-forge and for all major OSs.
+  # Add the line "skip: True  # [py<35]" (for example) to limit to Python 3.5 and newer, or "skip: True  # [not win]" to limit to Windows.
+  # More info about selectors can be found in the conda-build docs:
+  # https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#preprocessing-selectors
+  script: {{ PYTHON }} -m pip install --no-deps --force-reinstall . -vv
+  entry_points:
+    - osdag = osdag_gui.__main__:main
+
+requirements:
+  build:
+    # If your project compiles code (such as a C extension) then add the required compilers as separate entries here.
+    # Compilers are named 'c', 'cxx' and 'fortran'.
+    - conda-forge::setuptools
+    - conda-forge::wheel
+
+  host:
+    - conda-forge::python>=3.11,<3.13
+    - conda-forge::setuptools
+    - conda-forge::wheel
+    - conda-forge::pip
+  run:
+    - conda-forge::python>=3.11,<3.13
+    - conda-forge::numpy
+    - conda-forge::openpyxl
+    - conda-forge::pandas
+    - conda-forge::pylatex
+    - conda-forge::pyside6
+    - conda-forge::markdown
+    - osdag::osdag_latex_env
+    - conda-forge::pythonocc-core
+    - conda-forge::click
+    - conda-forge::pyyaml
+    - conda-forge::smesh
+    - conda-forge::sqlite
+    - conda-forge::tbb
+    - conda-forge::ifcopenshell
+    - conda-forge::lark
+    - geompy::navcube
+
+test:
+  # Some packages might need a `test/commands` key to check CLI.
+  # List all the packages/modules that `run_test.py` imports.
+  #  imports:
+  #  - simplejson
+  #  - simplejson.tests
+  # For python packages, it is useful to run pip check. However, sometimes the
+  # metadata used by pip is out of date. Thus this section is optional if it is
+  # failing.
+  #  requires:
+  #    - pip
+  #  commands:
+  #    - pip check
+
+about:
+  home: https://osdag.fossee.in
+  summary: 'Open steel design and graphics'
+  description: |
+    Open steel design and graphics
+  # Remember to specify the license variants for BSD, Apache, GPL, and LGPL.
+  # Use the SPDX identifier, e.g: GPL-2.0-only instead of GNU General Public License version 2.0
+  # See https://spdx.org/licenses/
+  license: LGPL-3.0-only
+  # The license_family, i.e. "BSD" if license is "BSD-3-Clause".
+  # Optional
+  license_family: LGPL
+  # It is required to include a license file in the package,
+  # (even if the license doesn't require it) using the license_file entry.
+  # Please also note that some projects have multiple license files which all need to be added using a valid yaml list.
+  # See https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#license-file
+  license_file: LICENSE
+  # The doc_url and dev_url are optional.
+  doc_url: https://osdag.fossee.in
+  dev_url: https://github.com/osdag-admin/Osdag
+
+extra:
+  recipe-maintainers:
+    # GitHub IDs for maintainers of the recipe.
+    # Always check with the people listed below if they are OK becoming maintainers of the recipe. (There will be spam!)
+    - AjinkyaDahale

license-dependencies.txt

@@ -0,0 +1,128 @@
+Osdag incorporates third-party open-source components.
+Some components are licensed under the GNU Lesser General Public License (LGPL).
+Use of these components is compliant with the LGPL as they are dynamically linked
+and remain unmodified.
+
+The respective licenses apply to each dependency as listed below.
+
+----------------------------------------------------------------
+Dependencies
+----------------------------------------------------------------
+
+Package: python
+Source: conda-forge
+License: Python Software Foundation License (PSF)
+Link to Dependency: https://github.com/python/cpython
+Link to License: https://docs.python.org/3/license.html
+
+Package: setuptools
+Source: conda-forge
+License: MIT
+Link to Dependency: https://github.com/pypa/setuptools
+Link to License: https://opensource.org/licenses/MIT
+
+Package: wheel
+Source: conda-forge
+License: MIT
+Link to Dependency: https://github.com/pypa/wheel
+Link to License: https://opensource.org/licenses/MIT
+
+Package: pip
+Source: conda-forge
+License: MIT
+Link to Dependency: https://github.com/pypa/pip
+Link to License: https://opensource.org/licenses/MIT
+
+Package: numpy
+Source: conda-forge
+License: BSD 3-Clause License
+Link to Dependency: https://github.com/numpy/numpy
+Link to License: https://opensource.org/licenses/BSD-3-Clause
+
+Package: pandas
+Source: conda-forge
+License: BSD 3-Clause License
+Link to Dependency: https://github.com/pandas-dev/pandas
+Link to License: https://opensource.org/licenses/BSD-3-Clause
+
+Package: openpyxl
+Source: conda-forge
+License: MIT
+Link to Dependency: https://foss.heptapod.net/openpyxl/openpyxl
+Link to License: https://opensource.org/licenses/MIT
+
+Package: pyside6
+Source: conda-forge
+License: GNU Lesser General Public License v3 (LGPL-3.0)
+Link to Dependency: https://wiki.qt.io/Qt_for_Python
+Link to License: https://www.gnu.org/licenses/lgpl-3.0.html
+
+Package: pythonocc-core
+Source: conda-forge
+License: GNU Lesser General Public License v3 (LGPL-3.0)
+Link to Dependency: https://github.com/tpaviot/pythonocc-core
+Link to License: https://www.gnu.org/licenses/lgpl-3.0.html
+
+Package: smesh
+Source: conda-forge
+License: GNU Lesser General Public License v2.1 or later (LGPL-2.1+)
+Link to Dependency: https://github.com/SalomePlatform/smesh
+Link to License: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+
+Package: markdown
+Source: conda-forge
+License: BSD 3-Clause License
+Link to Dependency: https://github.com/Python-Markdown/markdown
+Link to License: https://opensource.org/licenses/BSD-3-Clause
+
+Package: click
+Source: conda-forge
+License: BSD 3-Clause License
+Link to Dependency: https://github.com/pallets/click
+Link to License: https://opensource.org/licenses/BSD-3-Clause
+
+Package: pyyaml
+Source: conda-forge
+License: MIT
+Link to Dependency: https://github.com/yaml/pyyaml
+Link to License: https://opensource.org/licenses/MIT
+
+Package: sqlite
+Source: conda-forge
+License: Public Domain
+Link to Dependency: https://www.sqlite.org/index.html
+Link to License: https://www.sqlite.org/copyright.html
+
+Package: tbb (Threading Building Blocks)
+Source: conda-forge
+License: Apache License 2.0
+Link to Dependency: https://github.com/oneapi-src/oneTBB
+Link to License: https://www.apache.org/licenses/LICENSE-2.0
+
+----------------------------------------------------------------
+LaTeX Environment
+----------------------------------------------------------------
+
+Package: osdag_latex_env 
+Source: osdag (osdag conda channel)
+License: Includes bundled LaTeX distribution components; see details below
+Link to Dependency: https://github.com/osdag-admin/osdag-latex-env
+
+Package: TeX Live 
+Link to Dependency: https://tug.org/texlive/
+License: LaTeX Project Public License (LPPL) 
+License Link: https://www.latex-project.org/lppl/
+----------------------------------------------------------------
+LGPL COMPLIANCE NOTICE
+----------------------------------------------------------------
+
+The LGPL-licensed components listed above are used as dynamically linked
+libraries. No modifications have been made to the source code of these
+components.
+
+In accordance with the LGPL, users retain the right to replace or relink
+these libraries with compatible versions.
+
+Copies of the LGPL licenses are available at:
+https://www.gnu.org/licenses/
+----------------------------------------------------------------

pyproject.toml

@@ -8,19 +8,25 @@ namespaces = true
 where = ["src"]
 
 [tool.setuptools.package-data]
-"osdag.data.ResourceFiles.images" = ["*.png", "*.PNG", "*.jpg", "*.jpeg"]
-"osdag.data.ResourceFiles.Database" = ["*"]
-"osdag.data.themes" = ["*"]
+"osdag_core.data.doc" = ["**/*.MD", "**/*.md", "**/*.TXT", "**/*.txt"]
+"osdag_core.data.ResourceFiles.images" = ["**/*.png", "**/*.PNG", "**/*.jpg", "**/*.JPG", "**/*.jpeg", "**/*.JPEG"]
+"osdag_core.data.ResourceFiles.Database" = ["*"]
+"osdag_gui.resources" = [
+    "**/*.png", "**/*.PNG", "**/*.jpg", "**/*.JPG", "**/*.jpeg", "**/*.JPEG", "**/*.svg",
+    "**/*.qss", "**/*.ttf", "**/*.qrc"
+]
+
 
 [project]
 name = "osdag"
 dynamic = ["version"]
-dependencies = ["PyQt5", "requests", "pylatex", "numpy", "PyYaml", "PyGithub"]
-requires-python = ">= 3.8"
+dependencies = ["PyQt5", "PySide6", "requests", "pylatex", "numpy", "PyYaml", "PyGithub", "Click", "navcube"]
+requires-python = ">= 3.10,<3.13"
 description = "Open steel design and graphics"
 readme = "README.md"
 license = {file = "LICENSE"}
 keywords = ["steel design", "civil engineering", "engineering"]
 
-[project.gui-scripts]
-osdag = "osdag.osdagMainPage:do_stuff"
+[project.scripts]
+osdag = "osdag_gui.__main__:main"
+

requirements.txt

@@ -1,4 +1,17 @@
+python>=3.10,<3.13
 numpy
+openpyxl
+pandas
 pylatex
+pyside6
+navcube
+markdown
+osdag_latex_env
+pythonocc-core
+click
 pyyaml
-wheel
+smesh
+sqlite
+tbb
+ifcopenshell
+lark

setup_report.md

@@ -0,0 +1 @@
+Arch Linux environment for Osdag is set up. Conda environment: osdag-env.