merge
This commit is contained in:
@@ -1,4 +1,26 @@
|
||||
@echo off
|
||||
REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt
|
||||
REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt
|
||||
|
||||
call diff_dimensions.bat --type WEICHE --json_2d omniflo_weichen.json --json_dimensions dimensions.json --tolerance 0.05
|
||||
REM Standardwerte setzen
|
||||
set "DEFAULT_TYPE=WEICHE"
|
||||
set "DEFAULT_JSON2D=omniflo_weichen.json"
|
||||
set "DEFAULT_JSONDIM=dimensions.json"
|
||||
set "DEFAULT_TOLERANCE=0.05"
|
||||
|
||||
echo Mögliche Werte für --type: BOGEN, WEICHE, TEFBOGEN, TEFWEICHE
|
||||
|
||||
REM Benutzereingaben mit Standardwerten
|
||||
set /p TYPE=Gib den Typ ein (Standard: %DEFAULT_TYPE%):
|
||||
if "%TYPE%"=="" set "TYPE=%DEFAULT_TYPE%"
|
||||
|
||||
set /p JSON2D=Gib den Namen der 2D-JSON-Datei ein (Standard: %DEFAULT_JSON2D%):
|
||||
if "%JSON2D%"=="" set "JSON2D=%DEFAULT_JSON2D%"
|
||||
|
||||
set /p JSONDIM=Gib den Namen der Dimensions-JSON-Datei ein (Standard: %DEFAULT_JSONDIM%):
|
||||
if "%JSONDIM%"=="" set "JSONDIM=%DEFAULT_JSONDIM%"
|
||||
|
||||
set /p TOLERANCE=Gib die Toleranz ein (Standard: %DEFAULT_TOLERANCE%):
|
||||
if "%TOLERANCE%"=="" set "TOLERANCE=%DEFAULT_TOLERANCE%"
|
||||
|
||||
REM Aufruf des Skripts mit den eingegebenen oder Standardwerten
|
||||
call diff_dimensions.bat --type %TYPE% --json_2d %JSON2D% --json_dimensions %JSONDIM% --tolerance %TOLERANCE%
|
||||
|
||||
@@ -2,16 +2,17 @@
|
||||
REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt
|
||||
pushd %~dp0\..
|
||||
|
||||
for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set SSG_RD_DIR=%%i
|
||||
REM for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set SSG_RD_DIR=%%i
|
||||
|
||||
|
||||
set PROJECT_DIR=%SSG_RD_DIR%\CAD\Code
|
||||
set PROJECT_DIR=%cd%
|
||||
|
||||
set PROJECT_BIN=%PROJECT_DIR%\bin
|
||||
set PROJECT_LIB=%PROJECT_DIR%\lib
|
||||
set PROJECT_WORK=%PROJECT_DIR%\work
|
||||
set PROJECT_DATA=%PROJECT_DIR%\data
|
||||
set PROJECT_INPUT=%PROJECT_DIR%\input
|
||||
set PROJECT_TEMPLATE=\\ssg.local\freigaben\RuleDesigner\Templates\CreateAssemblies
|
||||
|
||||
if not exist %PROJECT_WORK% mkdir %PROJECT_WORK%
|
||||
if not exist %PROJECT_INPUT% mkdir %PROJECT_INPUT%
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -84,6 +84,7 @@ if __name__ == "__main__":
|
||||
# Umgebungsvariablen & Ordner
|
||||
work_dir = os.environ.get("PROJECT_WORK", "../work")
|
||||
data_dir = os.environ.get("PROJECT_DATA", "../data")
|
||||
template_dir = os.environ.get("PROJECT_TEMPLATE", "//ssg.local/freigaben/RuleDesigner/Templates/CreateAssemblies")
|
||||
|
||||
if args.input_dir:
|
||||
input_dir = args.input_dir
|
||||
@@ -100,7 +101,7 @@ if __name__ == "__main__":
|
||||
os.makedirs(work_dir, exist_ok=True)
|
||||
os.makedirs(output_dir, exist_ok=True)
|
||||
|
||||
dummy_asm_path = os.path.join(data_dir, "dummy.asm")
|
||||
dummy_asm_path = os.path.join(template_dir, "dummy.asm")
|
||||
placeholder_name = "dummy.par"
|
||||
|
||||
documents = start_solid_edge()
|
||||
|
||||
+76
-28
@@ -937,6 +937,7 @@
|
||||
<FIELD Id="RDK:1516704" Name="NachbarIds" Type="string" />
|
||||
<FIELD Id="RDK:1516705" Name="Bezeichnung" Type="string" DesignTimeNotes="Bezeichnung sollte vom Benutzer jedem Objekt zugewiesen werden können, um in den Listen besser ein Verständnis zu diesem Objekt zu finden" />
|
||||
<FIELD Id="RDK:1516706" Name="Planquadrat" Type="string" DesignTimeNotes="Planquadrat ist die Position des Objekts auf der 2D Ebene. Wurde kein Planquadrat definiert, sollen einfach die X/Y Koordinaten des Objekts ausgegeben werden" />
|
||||
<FIELD Id="RDK:24365624" Name="rotation" Type="double" DesignTimeNotes="Planquadrat ist die Position des Objekts auf der 2D Ebene. Wurde kein Planquadrat definiert, sollen einfach die X/Y Koordinaten des Objekts ausgegeben werden" />
|
||||
<FIELD Id="RDK:1516707" Name="Merkmale" Type="string" DesignTimeNotes="Merkmale sind die vom Nutzer angegebenen Merkmale dieses Objeks, Z.B. Abstand der Motor zur Spannstation, Höhe, usw." />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:22305597" Name="SivasExportType" SubType="structure" HasArrayType="True" DesignTimeNotes="Der Rest der Datei ist eine Liste aller Objekte, welche vom Benutzer angelegt wurden. Die Merkmale jedes Objektes werden wie in die Datei geschrieben, wie sie im RD verwendet werden. Eine Übersetzung in die Merkmale für das ERP findet ausserhalb statt.">
|
||||
@@ -955,6 +956,8 @@
|
||||
<FIELD Id="RDK:900071" Name="Anzahl der Scanner" Type="string" />
|
||||
<FIELD Id="RDK:952180" Name="Anzahl der Rampen" Type="string" />
|
||||
<FIELD Id="RDK:1065211" Name="Höhe in m" Type="string" />
|
||||
<FIELD Id="RDK:24365618" Name="Drehrichtung" Type="string" />
|
||||
<FIELD Id="RDK:24365620" Name="Drehung" Type="double" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:903598" Name="GefaellestreckeMerkmaleType" SubType="structure">
|
||||
<TYPE_VALUES />
|
||||
@@ -1027,6 +1030,7 @@
|
||||
<FIELD Id="RDK:23017777" Name="Anzahl der Scanner" Type="integer" />
|
||||
<FIELD Id="RDK:23017778" Name="Höhe oben" Type="string" />
|
||||
<FIELD Id="RDK:23017779" Name="Höhe unten" Type="string" />
|
||||
<FIELD Id="RDK:24365630" Name="Drehung" Type="double" />
|
||||
<FIELD Id="RDK:24300973" Name="SivasNummer" Type="string" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" SubType="structure">
|
||||
@@ -1035,6 +1039,7 @@
|
||||
<FIELD Id="RDK:23017789" Name="Kurvenwinkel" Type="double" />
|
||||
<FIELD Id="RDK:24269555" Name="Radius" Type="double" />
|
||||
<FIELD Id="RDK:23017790" Name="Höhe" Type="string" />
|
||||
<FIELD Id="RDK:24365628" Name="Drehung" Type="double" />
|
||||
<FIELD Id="RDK:23017794" Name="SivasNummer" Type="string" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23221889" Name="OFWeicheMerkmaleType" SubType="structure">
|
||||
@@ -1046,16 +1051,10 @@
|
||||
<FIELD Id="RDK:23221901" Name="Richtung" Type="string" />
|
||||
<FIELD Id="RDK:23221885" Name="Weichenwinkel" Type="double" />
|
||||
<FIELD Id="RDK:23221886" Name="Höhe" Type="string" />
|
||||
<FIELD Id="RDK:24365626" Name="Drehung" Type="double" />
|
||||
<FIELD Id="RDK:23221899" Name="Antrieb Kurve" Type="boolean" />
|
||||
<FIELD Id="RDK:23221888" Name="SivasNummer" Type="string" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23747529" Name="TEFBogenMerkmaleType" SubType="structure">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:23747523" Name="Länge in Meter" Type="string" />
|
||||
<FIELD Id="RDK:23747525" Name="Kurvenwinkel" Type="double" />
|
||||
<FIELD Id="RDK:23747526" Name="Höhe" Type="string" />
|
||||
<FIELD Id="RDK:23747528" Name="SivasNummer" Type="string" />
|
||||
</TYPE>
|
||||
<TYPE Id="RDK:23747545" Name="TEFGeradeMerkmaleType" SubType="structure">
|
||||
<TYPE_VALUES />
|
||||
<FIELD Id="RDK:23747540" Name="Länge in Meter" Type="string" />
|
||||
@@ -1395,6 +1394,7 @@
|
||||
<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" />
|
||||
<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" DesignTimeRemark="Dropdown Liste aller Weichen im Interface" />
|
||||
<VAR Id="RDK:23747696" Name="TEFBogenData" Type="TEFBogenType[]" DesignTimeRemark="Liste aller TEF Bögen" />
|
||||
<VAR Id="RDK:24361660" Name="lineNumber" Type="integer" DesignTimeRemark="Generated by RD" />
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
|
||||
<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
|
||||
@@ -18675,6 +18675,7 @@ SSGConnectionPoint.x_M
|
||||
<EXP><![CDATA[$=$OrientationList]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
<PAR Name="WebviewSubType" />
|
||||
</ACTION_CALL>
|
||||
</GROUP>
|
||||
<ACTION_CALL Id="RDK:316398" Name="RDEngineering_ModernUIRender">
|
||||
@@ -33957,22 +33958,6 @@ me.x
|
||||
<FUNCTION Id="RDK:22305553" Name="CreateCsvItems" Bookmarked="True" DesignTimeRemark="Erzeugt aus jedem Element ein CSV Item" InputTypeName="boolean" ResultTypeName="CSVType[]">
|
||||
<GROUP Id="RDK:22305396" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<GROUP Id="RDK:22305394" Name="CSV Export" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:22305382" Name="KreiselMerkmale" Type="KreiselMerkmaleType" />
|
||||
<VAR Id="RDK:22305383" Name="GefaellestreckeMerkmale" Type="GefaellestreckeMerkmaleType" />
|
||||
<VAR Id="RDK:22305384" Name="FoerdererMerkmale" Type="FoerdererMerkmaleType" />
|
||||
<VAR Id="RDK:22305385" Name="VarioFoerdererMerkmale" Type="VarioFoerdererMerkmaleType" />
|
||||
<VAR Id="RDK:22305386" Name="WeicheMerkmale" Type="WeicheMerkmaleType" />
|
||||
<VAR Id="RDK:22305387" Name="KurveMerkmale" Type="KurveMerkmaleType" />
|
||||
<VAR Id="RDK:22305388" Name="KurveFoerdererMerkmale" Type="KurveFoerdererMerkmaleType" />
|
||||
<VAR Id="RDK:22305389" Name="EckradMerkmale" Type="EckradMerkmaleType" />
|
||||
<VAR Id="RDK:22305390" Name="BTMTBeladungMerkmale" Type="BTMTBeladungMerkmaleType" />
|
||||
<VAR Id="RDK:22305391" Name="BTMTEntladungMerkmale" Type="BTMTEntladungMerkmaleType" />
|
||||
<VAR Id="RDK:23017796" Name="OFGeradeMerkmale" Type="OFGeradeMerkmaleType" />
|
||||
<VAR Id="RDK:23017798" Name="OFBogenMerkmale" Type="OFBogenMerkmaleType" />
|
||||
<VAR Id="RDK:23222345" Name="OFWeicheMerkmale" Type="OFWeicheMerkmaleType" />
|
||||
<VAR Id="RDK:23747994" Name="TEFGeradeMerkmale" Type="TEFGeradeMerkmaleType" />
|
||||
<VAR Id="RDK:23747996" Name="TEFBogenMerkmale" Type="TEFGeradeMerkmaleType" />
|
||||
<VAR Id="RDK:23747998" Name="TEFUmlenkMerkmale" Type="TEFUmlenkMerkmaleType" />
|
||||
<VAR Id="RDK:22305392" Name="CSVFileName" Type="string" />
|
||||
<VAR Id="RDK:22305393" Name="CSVFile" Type="string" />
|
||||
</GROUP>
|
||||
@@ -33984,9 +33969,16 @@ me.x
|
||||
</SET>
|
||||
</VAR>
|
||||
<VAR Id="RDK:22305381" Name="CSV_List" Type="CSVType[]" />
|
||||
<VAR Id="RDK:24363641" Name="CSV_ListNumbered" Type="CSVType[]" />
|
||||
<VAR Id="RDK:24271448" Name="CSV_ListOmniflo" Type="CSVType[]" />
|
||||
<VAR Id="RDK:24271450" Name="CSV_ListILS" Type="CSVType[]" />
|
||||
<VAR Id="RDK:24271454" Name="CSV_ListGroup" Type="CSVType[]" />
|
||||
<VAR Id="RDK:24361664" Name="lineNumber" Type="integer">
|
||||
<SET Id="RDK:24361663" VarRef="Me">
|
||||
<EXP><![CDATA[$C$0]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</VAR>
|
||||
</GROUP>
|
||||
<CALLFUNCTION Id="RDK:24271458">
|
||||
<PAR Name="FuncName">
|
||||
@@ -34063,8 +34055,49 @@ me.x
|
||||
</LIST_ADD>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<FOREACHLOOP Id="RDK:24361653" ItemVarRef="CSV_Item">
|
||||
<PAR Name="ArrayValueExp">
|
||||
<EXP><![CDATA[$=$CSV_List]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<SET_STRUCT Id="RDK:24361655" VarRef="CSV_Item" ClearAll="True">
|
||||
<PAR Name="Elementnummer">
|
||||
<EXP><![CDATA[$=$lineNumber]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="TeileArt">
|
||||
<EXP><![CDATA[$=$CSV_Item.TeileArt]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="TeileId">
|
||||
<EXP><![CDATA[$=$CSV_Item.TeileId]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="NachbarIds">
|
||||
<EXP><![CDATA[$=$CSV_Item.NachbarIds]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Bezeichnung">
|
||||
<EXP><![CDATA[$=$CSV_Item.Bezeichnung]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Planquadrat">
|
||||
<EXP><![CDATA[$=$CSV_Item.Planquadrat]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Merkmale">
|
||||
<EXP><![CDATA[$=$CSV_Item.Merkmale]]></EXP>
|
||||
</PAR>
|
||||
</SET_STRUCT>
|
||||
<SET Id="RDK:24361657" VarRef="lineNumber">
|
||||
<EXP><![CDATA[$=$lineNumber + 1]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<LIST_ADD Id="RDK:24363643" ListRef="CSV_ListNumbered">
|
||||
<PAR Name="VALUE_TO_ADD">
|
||||
<EXP><![CDATA[$=$CSV_Item]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="POS_TO_ADD" />
|
||||
</LIST_ADD>
|
||||
</FOREACHLOOP>
|
||||
<SET Id="RDK:22305564" VarRef="Param.Result">
|
||||
<EXP><![CDATA[$=$CSV_List]]></EXP>
|
||||
<EXP><![CDATA[$=$CSV_ListNumbered]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</FUNCTION>
|
||||
@@ -34085,7 +34118,6 @@ me.x
|
||||
<VAR Id="RDK:24270589" Name="OFBogenMerkmale" Type="OFBogenMerkmaleType" />
|
||||
<VAR Id="RDK:24270590" Name="OFWeicheMerkmale" Type="OFWeicheMerkmaleType" />
|
||||
<VAR Id="RDK:24270591" Name="TEFGeradeMerkmale" Type="TEFGeradeMerkmaleType" />
|
||||
<VAR Id="RDK:24270592" Name="TEFBogenMerkmale" Type="TEFGeradeMerkmaleType" />
|
||||
<VAR Id="RDK:24270593" Name="TEFUmlenkMerkmale" Type="TEFUmlenkMerkmaleType" />
|
||||
<VAR Id="RDK:24270594" Name="CSVFileName" Type="string" />
|
||||
<VAR Id="RDK:24270595" Name="CSVFile" Type="string" />
|
||||
@@ -34221,6 +34253,12 @@ me.x
|
||||
<PAR Name="Höhe in m">
|
||||
<EXP><![CDATA[$=$StrReplace(ShapeItem.KreiselDefinition.Hoehe/1000, ",", ".")]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Drehrichtung">
|
||||
<EXP><![CDATA[$=$IIF(ShapeITem.KreiselDefinition.Drehung=1,"UZS", "GUZS")]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Drehung">
|
||||
<EXP><![CDATA[$=$ShapeITem.KreiselDefinition.OrientierungHV]]></EXP>
|
||||
</PAR>
|
||||
</SET_STRUCT>
|
||||
<SET Id="RDK:24270622" VarRef="CSV_Item.Merkmale">
|
||||
<EXP><![CDATA[$=$ToJSON(KreiselMerkmale)]]></EXP>
|
||||
@@ -34867,8 +34905,8 @@ me.x
|
||||
<EXIT_PROCESS Id="RDK:24271661" BreakType="2" ExitStatus="0" />
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<SET Id="RDK:24271804" VarRef="CSV_Item.TeileId">
|
||||
<EXP><![CDATA[$=$ShapeItem.id]]></EXP>
|
||||
<SET Id="RDK:24359676" VarRef="CSV_Item.TeileId">
|
||||
<EXP><![CDATA[$=$ToJSON(ShapeItem.id)]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SELECTCASE Id="RDK:24270187" DesignTimeRemark="Hier alle Omniflo Elemente behandeln. Hier braucht man nur eine Stückliste">
|
||||
@@ -34919,6 +34957,9 @@ me.x
|
||||
<PAR Name="Höhe unten">
|
||||
<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.HoeheUnten/1000, ",", ".")]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Drehung">
|
||||
<EXP><![CDATA[$=$IIF(IsEmpty(ShapeItem.rotation),0,ShapeItem.rotation)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="SivasNummer">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.Sivasnr]]></EXP>
|
||||
</PAR>
|
||||
@@ -34975,6 +35016,9 @@ me.x
|
||||
<PAR Name="Höhe">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Hoehe]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Drehung">
|
||||
<EXP><![CDATA[$=$IIF(IsEmpty(ShapeItem.rotation),0,ShapeItem.rotation)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="SivasNummer">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Sivasnr]]></EXP>
|
||||
</PAR>
|
||||
@@ -35034,6 +35078,9 @@ me.x
|
||||
<PAR Name="Höhe">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.Hoehe]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Drehung">
|
||||
<EXP><![CDATA[$=$IIF(IsEmpty(ShapeItem.rotation),0,ShapeItem.rotation)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Antrieb Kurve">
|
||||
<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.AntriebKurve]]></EXP>
|
||||
</PAR>
|
||||
@@ -44511,6 +44558,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<EXP><![CDATA[$=$OrientationList]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
<PAR Name="WebviewSubType" />
|
||||
</ACTION_CALL>
|
||||
<ACTION_CALL Id="RDK:620769" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} <-- {UIType}:{Field} {Id} {ParentID}">
|
||||
<PAR Name="RDLibraryName">
|
||||
@@ -54850,4 +54898,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
|
||||
Reference in New Issue
Block a user