Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-11 02:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve support for Powerproject import (#1865)

Browse Source 
This is tested with swedish PowerProject 14.0 file
This commit is contained in:
ecke101
2021-11-08 22:52:24 +01:00
committed by GitHub
parent ff6db5f24d
commit 7aa75d98d3
4 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/sequence/operator.py
+20
View File
@@ -1083,6 +1083,11 @@ class ImportP6(bpy.types.Operator, ImportHelper):
filename_ext = ".xml"
filter_glob: bpy.props.StringProperty(default="*.xml", options={"HIDDEN"})
@classmethod
def poll(cls, context):
ifc_file = IfcStore.get_file()
return ifc_file is not None
def execute(self, context):
from ifc4d.p62ifc import P62Ifc
@@ -1105,6 +1110,11 @@ class ImportP6XER(bpy.types.Operator, ImportHelper):
filename_ext = ".xer"
filter_glob: bpy.props.StringProperty(default="*.xer", options={"HIDDEN"})
@classmethod
def poll(cls, context):
ifc_file = IfcStore.get_file()
return ifc_file is not None
def execute(self, context):
from ifc4d.p6xer2ifc import P6XER2Ifc
@@ -1127,6 +1137,11 @@ class ImportPP(bpy.types.Operator, ImportHelper):
filename_ext = ".pp"
filter_glob: bpy.props.StringProperty(default="*.pp", options={"HIDDEN"})
@classmethod
def poll(cls, context):
ifc_file = IfcStore.get_file()
return ifc_file is not None
def execute(self, context):
from ifc4d.pp2ifc import PP2Ifc
@@ -1149,6 +1164,11 @@ class ImportMSP(bpy.types.Operator, ImportHelper):
filename_ext = ".xml"
filter_glob: bpy.props.StringProperty(default="*.xml", options={"HIDDEN"})
@classmethod
def poll(cls, context):
ifc_file = IfcStore.get_file()
return ifc_file is not None
def execute(self, context):
from ifc4d.msp2ifc import MSP2Ifc
src/ifc4d/ifc4d/pp2ifc.py
+18 -8
View File
@@ -107,14 +107,14 @@ class PP2Ifc:
def parse_calendar_pp(self):
calendars = self.get_json("CALENDAR")
wp_data = self.get_json("WORK_PATTERN")
work_types = self.get_json("EXCEPTIONN")
work_type_ids = [wt['ID'] for wt in work_types if wt['EXCEPTION_TYPE'] == 0]
for calendar in calendars:
calendar_id = calendar["ID"]
calendar_wp = calendar["DOMINANT_WORK_PATTERN"]
wp_data = self.get_json_with_filter("WORK_PATTERN", "ID", calendar_wp)
print("wp_data", wp_data[0]['SHIFTS'])
wp = AstaCalendarWorkPattern(wp_data[0]['SHIFTS'])
print(wp.dict_wp)
wp = AstaCalendarWorkPattern(wp_data[0]['SHIFTS'], work_type_ids)
exceptions = {}
timex = []
for times in wp.dict_wp:
@@ -164,6 +164,13 @@ class PP2Ifc:
for activity in activities:
activity_type = "TASK"
activity_id = activity["ID"]
if 'PLANNED_DURATION' in activity.keys():
activity_duration = float(activity["PLANNED_DURATION"].split(",")[-2].replace("<","").replace(">",""))
elif 'GIVEN_DURATION' in activity.keys():
activity_duration = float(activity["GIVEN_DURATION"].split(",")[-2].replace("<","").replace(">",""))
else:
activity_duration = 0.0
wbs_id = activity["BAR"]
if wbs_id:
self.wbs[wbs_id]["activities"].append(activity_id)
@@ -174,7 +181,7 @@ class PP2Ifc:
"Identification": activity["ID"],
"StartDate": datetime.datetime.fromisoformat(activity["LINKABLE_START"]),
"FinishDate": datetime.datetime.fromisoformat(activity["LINKABLE_FINISH"]),
"PlannedDuration": float(activity["PLANNED_DURATION"].split(",")[-2].replace("<","").replace(">","") ),
"PlannedDuration": activity_duration,
"Status": "PLANNED",
"CalendarObjectId": activity["CALENDAR"],
"ifc": None,
@@ -202,12 +209,15 @@ class PP2Ifc:
def parse_relationship_pp(self, project):
relations = self.get_json('LINK')
print(relations)
for relationship in relations:
predecessor = relationship['START_TASK']
successor = relationship['END_TASK']
if predecessor not in self.activities or successor not in self.activities:
print("!!!!!!!!!!!!!!!!!ERROR!!!!!!!!!!!!!!!!")
print(predecessor, successor)
if predecessor not in self.activities:
print(f"Linked predecessor task {predecessor} cannot be found.")
continue
if successor not in self.activities:
print(f"Linked successor task {successor} cannot be found.")
continue
self.relationships[relationship["ID"]] = {
"PredecessorActivity": predecessor,
src/ifc4d/ifc4d/test.py
View File
src/ifc4d/ifc4d/wpattern.py
+25 -18
View File
@@ -27,9 +27,12 @@ class AstaCalendarWorkPattern:
data = re.split('<[^<>]+>', s)
return data
def __init__(self, string):
def __init__(self, string, work_type_ids):
self.string = string
self.Days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
self.Days = {
'en': ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
'sv': ['Söndag', 'Måndag', 'Tisdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lördag'],
}
self.keys = self.get_keys(string)
self.values = self.get_values(string)
self.dict_wp = {}
@@ -37,25 +40,29 @@ class AstaCalendarWorkPattern:
for d, m in zip(self.values[1:], self.keys):
splt_data = d.strip().split(",")
workhours = []
if len(splt_data)>15:
print(splt_data)
st1_1 = datetime.strptime(splt_data[6], "%H%M%S")
st1_2 = datetime.strptime(splt_data[7], "%H%M%S")
st = {"Start":time(st1_1.hour, st1_1.minute), "Finish": time(st1_2.hour, st1_2.minute), "ifc": None}
workhours.append(st)
st2_1 = datetime.strptime(splt_data[12], "%H%M%S")
st2_2 = datetime.strptime(splt_data[13], "%H%M%S")
st2 = {"Start":time(st2_1.hour, st2_1.minute), "Finish": time(st2_2.hour, st2_2.minute), "ifc": None}
workhours.append(st2)
if len(splt_data)>=7:
number_of_work_slots = splt_data[1]
for i in range(int(number_of_work_slots)):
if int(splt_data[2+i*3]) in work_type_ids:
st1_1 = datetime.strptime(splt_data[2+i*3+1].ljust(5,'0'), "%H%M%S")
st1_2 = datetime.strptime(splt_data[2+i*3+2].ljust(5,'0'), "%H%M%S")
st = {"Start":time(st1_1.hour, st1_1.minute), "Finish": time(st1_2.hour, st1_2.minute), "ifc": None}
workhours.append(st)
self.dict_wp.append({'DayOfWeek': m.replace("\"",""),
'WorkTimes': workhours, "ifc": None})
for day in self.Days:
'WorkTimes': workhours, "ifc": None})
# Translate day names to english
for index, day in enumerate(self.Days['en']):
d = self.dict_wp[-1]['DayOfWeek']
for lang in self.Days.keys():
if lang == 'en':
continue
self.dict_wp[-1]['DayOfWeek'] = d.replace(self.Days[lang][index], self.Days['en'][index])
for day in self.Days['en']:
if not len(list(filter(lambda d: d['DayOfWeek']== day , self.dict_wp))) > 0:
print("MISSING", day)
self.dict_wp.append({'DayOfWeek': day,
'WorkTimes': [], "ifc": None})
print("final", self.dict_wp)