Osdag refactored v2025.01.a.2

.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,5 @@ Output_PDF/*
 **/ResourceFiles/last_designs/*
 **/ResourceFiles/html_page/*
 *.xlsx
-*.code-workspace
+*.code-workspace
+**/testing_code/

README.md

@@ -242,6 +242,8 @@ Mr. Shahadad PP
 
 Ms. Priti Kumari
 
+Mr. Adnan Abdullah
+
 ===============================
 
 Project Management

pyproject.toml

@@ -16,12 +16,14 @@ where = ["src"]
 [project]
 name = "osdag"
 dynamic = ["version"]
-dependencies = ["PyQt5", "requests", "pylatex", "numpy", "PyYaml", "PyGithub"]
-requires-python = ">= 3.8"
+dependencies = ["PyQt5", "PySide6", "requests", "pylatex", "numpy", "PyYaml", "PyGithub"]
+requires-python = ">= 3.11"
 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"
+osdag = "osdag_gui.__main__:GUI"
+[project.scripts]
+osdag-cli = "osdag_gui.__main__:cli"

src/osdag/Common.py

@@ -352,6 +352,13 @@ def is_valid_custom(self):
 KEY_DISP_BUTTJOINTBOLTED = 'Butt Joint Bolted Connection'
 WELD_SIZES = [3, 5, 6, 10, 12]
 
+
+#Simpleconnections (Tension+compression)
+KEY_DESIGN_FOR = 'Design.For'
+KEY_DISP_DESIGN_FOR = 'Design For'
+KEY_AXIAL_FORCE = 'Load.Axial.Force'  # If not using existing KEY_AXIAL
+KEY_DISP_AXIAL_FORCE = 'Axial Force (kN)'
+
 # MADE THIS t.s.
 KEY_DISP_BUTTJOINTWELDED = 'Butt Joint Welded Connection'
 KEY_OUT_UTILISATION_RATIO = 'Utilisation Ratio'
@@ -1904,6 +1911,11 @@ def is_valid_custom(self):
 KEY_WEB_CAPACITY ='section.web_capacities'
 KEY_DISP_WEB_CAPACITY ='Capacity'
 
+
+#SimpleConnection(Tension+Compression)
+KEY_OUT_DESIGN_FOR = "Design For" 
+KEY_OUT_DISP_DESIGN_FOR = "Design For"
+
 # Web plate
 KEY_REDUCTION_FACTOR_WEB ='web_plate.red,factor'
 KEY_DISP_REDUCTION_FACTOR_WEB ="Red. Factor"
@@ -2008,10 +2020,22 @@ def is_valid_custom(self):
 KEY_DISP_BOLT_HOLE = 'Hole Diameter (mm)'
 KEY_DISP_MIN_BOLT = 'Minimum Bolts (nos)'
 
+
+KEY_OUT_WELD_CONN_LEN = 'Weld.ConnLength'
+
+
 KEY_OUT_BOLT_CONN_LEN = 'Bolt.ConnLength'
 KEY_UTILIZATION_RATIO = 'Bolt.UtilizationRatio'
 KEY_DISP_UTILIZATION_RATIO = 'Utilization Ratio'
 KEY_OUT_DISP_BOLT_CONN_LEN = 'Length of Connection (mm)'
+KEY_OUT_DISP_WELD_CONN_LEN = 'Length of Connection (mm)'
+KEY_OUT_BOLT_UTILIZATION = 'Bolt.Utilization'
+KEY_OUT_DISP_BOLT_UTILIZATION = 'Bolt Utilization'
+KEY_OUT_BASE_METAL_CAPACITY = 'Plate.BaseCapacity'
+KEY_OUT_DISP_BASE_METAL_CAPACITY = 'Base Metal Capacity (kN)'
+KEY_OUT_BASE_METAL_UTILIZATION = 'Plate.BaseUtilization'
+KEY_OUT_DISP_BASE_METAL_UTILIZATION = 'Base Metal Utilization'
+
 
 KEY_DISP_BOLT_AREA = 'Nominal Stress Area (mm2)'
 KEY_DISP_KB = 'Kb'

src/osdag/_version.py

@@ -1 +1,2 @@
 __version__ = "2025.01.a.2"
+__installation_type__ = "conda"

src/osdag/cad/ShearConnections/CleatAngle/nutBoltPlacement.py

@@ -85,7 +85,7 @@ def init_bolt_place_params(self, bolt_place_obj):
         self.cGauge = bolt_place_obj.pitch_spting
         self.cEdge = bolt_place_obj.edge_spting
         self.cEnd = bolt_place_obj.end_spting
-        print(self.cEnd,"hghghwuuw")
+        print(self.cEnd)
         self.cRow = bolt_place_obj.bolt_one_line_spting
         self.cCol = bolt_place_obj.bolt_lines_spting
         # self.thk = bolt_place_obj.cleat.thickness

src/osdag/cad/common_logic.py

@@ -1852,6 +1852,21 @@ def createBoltedLapJoint(self):
                                                                          edge=Conn.final_edge_dist,end=Conn.final_end_dist)
         return lap_joint, plate1, plate2, bolts, nuts
 
+    def createWeldedLapJoint(self):
+        Conn = self.module_class
+
+        plate1_thickness = float(Conn.plate1.thickness[0])
+        plate2_thickness = float(Conn.plate2.thickness[0])
+        plate_width = float(Conn.width)
+        overlap_length = float(Conn.connection_length)
+        weld_size = float(Conn.weld_size)
+
+        print(f"DEBUG: createWeldedLapJoint called with: t1={plate1_thickness}, t2={plate2_thickness}, w={plate_width}, l={overlap_length}, s={weld_size}")
+
+        lap_joint, plate1, plate2, welds = create_welded_lap_joint(plate1_thickness, plate2_thickness, plate_width, overlap_length, weld_size)
+        print(f"DEBUG: create_welded_lap_joint returned: {lap_joint}, {plate1}, {plate2}, {welds}")
+        return lap_joint, plate1, plate2, welds
+
     def createButtJointBoltedCAD(self):
 
             # Get input values from the design object (i.e., instance of ButtJointBolted)
@@ -2396,10 +2411,36 @@ def display_3DModel(self, component, bgcolor):
                 for nut in self.nuts_models:
                     osdag_display_shape(self.display, nut, update=True,
                                             color=Quantity_NOC_SADDLEBROWN)
+
+        elif self.mainmodule == 'Lap Joint Welded Connection':
+            print("DEBUG: Inside display_3DModel for Lap Joint Welded Connection")
+            self.col = self.module_class()
+            self.assembly, self.plate1_model, self.plate2_model, self.weld_models = self.createWeldedLapJoint()
+            print(f"DEBUG: Models created. Assembly: {self.assembly}")
+
+            if self.component == "Model":
+                print("DEBUG: Displaying Model components")
+                osdag_display_shape(self.display, self.plate1_model, update=True, material=Graphic3d_NOM_ALUMINIUM)
+                osdag_display_shape(self.display, self.plate2_model, update=True)
+                for weld in self.weld_models:
+                    osdag_display_shape(self.display, weld, update=True, color=Quantity_NOC_RED)
+            elif self.component == "Plate1":
+                osdag_display_shape(self.display, self.plate1_model, update=True, material=Graphic3d_NOM_ALUMINIUM)
+            elif self.component == "Plate2":
+                osdag_display_shape(self.display, self.plate2_model, update=True)
+            elif self.component == "Weld":
+                for weld in self.weld_models:
+                    osdag_display_shape(self.display, weld, update=True, color=Quantity_NOC_RED)
 
         elif self.mainmodule == 'Butt Joint Bolted Connection':
             self.col = self.module_class()
-            self.assembly,self.plate1_model,self.plate2_model,self.platec_model,self.bolt_models,self.nuts_models = self.createButtJointBoltedCAD()
+
+            # Reuse ColObj if already created by call_3DModel, otherwise create it
+            if hasattr(self, 'ColObj') and self.ColObj is not None:
+                # ColObj is a tuple from createButtJointBoltedCAD()
+                self.assembly, self.plate1_model, self.plate2_model, self.platec_model, self.bolt_models, self.nuts_models = self.ColObj
+            else:
+                self.assembly, self.plate1_model, self.plate2_model, self.platec_model, self.bolt_models, self.nuts_models = self.createButtJointBoltedCAD()
 
             if self.component == "Model":
                 osdag_display_shape(self.display, self.plate1_model, update=True, material=Graphic3d_NOM_ALUMINIUM)
@@ -2412,6 +2453,7 @@ def display_3DModel(self, component, bgcolor):
                     osdag_display_shape(self.display, nut, update=True,
                                             color=Quantity_NOC_SADDLEBROWN)                     
 
+
         elif self.mainmodule == 'Flexure Member':
             self.flex = self.module_class()
             self.FObj = self.createSimplySupportedBeam()

src/osdag/cli.py

@@ -0,0 +1,223 @@
+from osdag.design_type.connection.fin_plate_connection import FinPlateConnection
+from osdag.design_type.connection.cleat_angle_connection import CleatAngleConnection
+from osdag.design_type.connection.seated_angle_connection import SeatedAngleConnection
+from osdag.design_type.connection.end_plate_connection import EndPlateConnection
+from osdag.design_type.connection.base_plate_connection import BasePlateConnection
+from osdag.design_type.connection.beam_cover_plate import BeamCoverPlate
+from osdag.design_type.connection.beam_cover_plate_weld import BeamCoverPlateWeld
+from osdag.design_type.connection.column_cover_plate_weld import ColumnCoverPlateWeld
+from osdag.design_type.tension_member.tension_bolted import Tension_bolted
+from osdag.design_type.tension_member.tension_welded import Tension_welded
+from osdag.design_type.connection.beam_beam_end_plate_splice import BeamBeamEndPlateSplice
+from osdag.design_type.connection.beam_column_end_plate import BeamColumnEndPlate
+from osdag.design_type.connection.column_cover_plate import ColumnCoverPlate
+from osdag.design_type.connection.column_end_plate import ColumnEndPlate
+from osdag.design_type.compression_member.compression import Compression
+from osdag.design_type.main import Main
+from osdag.Common import TYPE_TEXTBOX, TYPE_OUT_BUTTON
+from osdag.Common import (
+    # Shear Connection
+    KEY_DISP_FINPLATE,
+    KEY_DISP_ENDPLATE,
+    KEY_DISP_CLEATANGLE,
+    KEY_DISP_SEATED_ANGLE,
+
+    # Base Plate Connection
+    KEY_DISP_BASE_PLATE,
+
+    # Moment Connection
+    KEY_DISP_BEAMCOVERPLATE,
+    KEY_DISP_COLUMNCOVERPLATE,
+    KEY_DISP_BEAMCOVERPLATEWELD,
+    KEY_DISP_COLUMNCOVERPLATEWELD,
+    KEY_DISP_BB_EP_SPLICE,
+    KEY_DISP_COLUMNENDPLATE,
+    KEY_DISP_BCENDPLATE,
+
+    # Tension Member
+    KEY_DISP_TENSION_BOLTED,
+    KEY_DISP_TENSION_WELDED,
+
+    # Compression Member
+    KEY_DISP_COMPRESSION
+
+)
+
+
+available_modules = {
+    KEY_DISP_BASE_PLATE:BasePlateConnection, 
+    KEY_DISP_BEAMCOVERPLATE:BeamCoverPlate, 
+    KEY_DISP_CLEATANGLE:CleatAngleConnection,
+    KEY_DISP_COLUMNCOVERPLATE:ColumnCoverPlate, 
+    KEY_DISP_COLUMNENDPLATE:ColumnEndPlate, 
+    KEY_DISP_ENDPLATE:EndPlateConnection,
+    KEY_DISP_FINPLATE:FinPlateConnection, 
+    KEY_DISP_SEATED_ANGLE:SeatedAngleConnection, 
+    KEY_DISP_TENSION_BOLTED:Tension_bolted,
+    KEY_DISP_TENSION_WELDED:Tension_welded, 
+    KEY_DISP_COMPRESSION:Compression, 
+    KEY_DISP_BEAMCOVERPLATEWELD:BeamCoverPlateWeld,
+    KEY_DISP_COLUMNCOVERPLATEWELD:ColumnCoverPlateWeld, 
+    KEY_DISP_BB_EP_SPLICE:BeamBeamEndPlateSplice,
+    KEY_DISP_BCENDPLATE:BeamColumnEndPlate,
+}
+
+from pathlib import Path
+import yaml, click
+import pandas as pd
+
+def _print_result(out_dict:dict):
+    print("="*100)
+    for key, value in out_dict.items():
+        print(f"|| {key}: {value}")
+    print("="*100)
+
+def _get_design_dictionary(osi_path:Path) -> dict:
+    """return the design dictionary from an OSI file."""
+    with open(osi_path, 'r') as file:
+        return yaml.safe_load(file)
+
+def _get_output_dictionary(module_class:Main) -> dict:
+    """return the output dictionary for the design"""
+    status = module_class.design_status
+    out_list = module_class.output_values(module_class, status)
+    out_dict = {"Parameter": "Value"}
+    for option in out_list:
+        if option[0] is not None and option[2] == TYPE_TEXTBOX:
+            out_dict[option[0]] = option[3]
+        if option[2] == TYPE_OUT_BUTTON:
+            tup = option[3]
+            fn = tup[1]
+            for item in fn(module_class, status):
+                lable = item[0]
+                value = item[3]
+                if lable!=None and value!=None:
+                    out_dict[lable] = value
+    return out_dict
+
+
+def _save_to_csv(output_dictionary:dict, output_file:str):
+    """save the output dictionary to a csv file"""
+    df = pd.DataFrame(output_dictionary.items())
+    df.to_csv(output_file, index=False, header=None)
+
+def _save_to_pdf(module_class:Main, output_file:Path):
+    """save the output dictionary to a pdf file"""
+    popup_summary = {
+            'ProfileSummary': {
+            'CompanyName': 'LoremIpsum', 
+            'CompanyLogo': '', 
+            'Group/TeamName': 'LoremIpsum', 
+            'Designer': 'LoremIpsum'
+        }, 
+        'ProjectTitle': 'Fossee', 
+        'Subtitle': '', 
+        'JobNumber': '123', 
+        'AdditionalComments': 'No comments', 
+        'Client': 'LoremIpsum', 
+        'filename': f'{output_file}', 
+        'does_design_exist': True, 
+        'logger_messages': ''
+        }
+    module_class.save_design(module_class, popup_summary)
+
+
+
+def run_module(*args, **kargs) -> dict:
+    """Run the module specified in the OSI file located at osi_path."""
+    osi_path = kargs["input_path"] if len(kargs) > 0 else None
+    op_type = kargs["op_type"] if len(kargs) > 1 else "print_result"
+    output_path = kargs["output_path"] if len(kargs) > 2 else None
+
+    result = {
+        "success": False,
+        "operation": op_type,
+        "input": str(osi_path) if osi_path else None,
+        "output": None,
+        "data": None,
+        "errors": [],
+    }
+
+    if osi_path is None:
+        result["errors"].append("No input file provided.")
+        print(result)
+        return result
+
+    osi_path = Path(osi_path) if osi_path else None
+    output_path = Path(output_path) if output_path else None
+    if not osi_path.exists():
+        result["errors"].append(f"File not found: {osi_path}")
+        print(result)
+        return result
+
+    design_dict = _get_design_dictionary(osi_path)
+    module_name = design_dict.get("Module")
+    if not module_name:
+        result["errors"].append("Module not specified.")
+        print(result)
+        return result
+
+    module_class = available_modules.get(module_name)
+    if not module_class:
+        result["errors"].append(f"Not a valid module class: {module_name}")
+        print(result)
+        return result
+
+    input_filename = osi_path.stem
+    output_filename = output_path.stem if output_path else None
+    if not output_path:
+        output_folder_path = osi_path.parent / "Outputs" / f"{module_class.__name__}"
+    else:
+        output_folder_path = output_path.parent / f"{module_class.__name__}"
+    output_folder_path.mkdir(parents=True, exist_ok=True)
+    output_file = output_folder_path / f"{output_filename if output_filename else input_filename}"
+
+    module_class.set_osdaglogger(None)
+    val_errors = module_class.func_for_validation(module_class, design_dict)
+
+    if val_errors:
+        result["errors"].extend(val_errors)
+        print(result)
+        return result
+
+    out_dict = _get_output_dictionary(module_class)
+    result["data"] = out_dict
+    if op_type == "save_csv":
+        try:
+            _save_to_csv(out_dict, str(output_file) + ".csv")
+            result["success"] = True
+            result["output"] = str(output_file)
+        except Exception as e:
+            result["success"] = False
+            result["errors"].append(f"Failed to save CSV: {e}")
+
+    elif op_type == "save_pdf":
+        try:
+            _save_to_pdf(module_class, output_file)
+            result["success"] = True
+            result["output"] = str(output_file)
+        except Exception as e:
+            result["success"] = False
+            result["errors"].append(f"Failed to save PDF: {e}")
+
+    elif op_type == "print_result":
+        try:
+            result["success"] = True
+            click.echo(_print_result(out_dict=out_dict))
+        except Exception as e:
+            result["success"] = False
+            result["errors"].append(f"Failed to get result: {e}")
+
+    else:
+        result["errors"].append(f"Unsupported op_type: {op_type}")
+
+    if len(result["errors"]) > 0:
+        print(result)
+
+    return result
+
+
+
+# run_module(r"C:\Users\1hasa\Osdag\TensionBoltedTest4.osi",op_type="save to csv")
+# run_module(r"C:\Users\1hasa\Osdag\TensionBoltedTest4.osi",op_type="save to pdf")
+# print(run_module(r"C:\Users\1hasa\Osdag\TensionBoltedTest4.osi",op_type="output dictionary"))