From 3caf9311e7d16cb412878d5a2d770e79955076e1 Mon Sep 17 00:00:00 2001 From: pravindalve Date: Wed, 15 Feb 2023 14:46:13 +0530 Subject: Added 401, 701, 919, 920, 506, 1303, 1404, 1404A, 1002, 2001, and 529 --- src/main/python/shapes/shapes.py | 99 ++++++++++++++++++++++ src/main/resources/base/config/items.json | 82 ++++++++++++++++++ .../Oil Gas or Pulverized Fuel Furnace.svg | 55 ++++++++---- 3 files changed, 218 insertions(+), 18 deletions(-) diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py index 8225a12..5446e98 100644 --- a/src/main/python/shapes/shapes.py +++ b/src/main/python/shapes/shapes.py @@ -942,3 +942,102 @@ class SeparatorsForLiquidsDecanter(NodeItem): [100, 50, "right", 100], [50, 0, "bottom", 100] ] + +class GateValve(NodeItem): + def __init__(self): + super(GateValve, self).__init__("svg/Valves/Gate Valve") + self.grips = [ + [0, 50, "left"], + [100, 50, "right"] + ] + +class CentrifugalPump(NodeItem): + def __init__(self): + super(CentrifugalPump, self).__init__("svg/Pumps/Centrifugal Pump") + self.grips = [ + [100, 97.2, "right"], + [0, 58.78, "left"] + ] + + +class OneCellFiredHeaterFurnace(NodeItem): + def __init__(self): + super(OneCellFiredHeaterFurnace, self).__init__("svg/Furnaces and Boilers/One Cell Fired Heater, Furnace") + self.grips = [ + [50, 100, "top"], + [0, 25, "left", 50], + [25, 87.5, "left", 25], + [100, 25, "right", 50], + [75, 87.5, "right", 25], + [50, 0, "bottom", 100] + ] + + +class TwoCellFiredHeaterFurnace(NodeItem): + def __init__(self): + super(TwoCellFiredHeaterFurnace, self).__init__("svg/Furnaces and Boilers/Two Cell Fired Heater, Furnace") + self.grips = [ + [50, 100, "top"], + [0, 33.33, "left", 66.66], + [33.33, 91.66, "left", 16.66], + [100, 33.33, "right", 66.66], + [66.66, 91.66, "right", 16.66], + [16.67, 0, "bottom", 33.33], + [83.33, 0, "bottom", 33.33] + ] + + +class ReducerExpander(NodeItem): + def __init__(self): + super(ReducerExpander, self).__init__("svg/Fittings/Reducer, Expander") + self.grips = [ + [100, 50, "right"], + [0, 50, "left"] + ] + + +class Filter(NodeItem): + def __init__(self): + super(Filter, self).__init__("svg/Fittings/Filter") + self.grips = [ + [0, 50, "left"], + [100, 50, "right"] + ] + + +class ContinuousDryer(NodeItem): + def __init__(self): + super(ContinuousDryer, self).__init__("svg/Dryers/Continuous Dryer") + self.grips = [ + [8.13, 35.2, "top"], + [98.9, 28, "bottom"], + [50, 100, "top", 60.13] + ] + + +class JawCrusher(NodeItem): + def __init__(self): + super(JawCrusher, self).__init__("svg/Size Reduction Equipements/Jaw Crusher") + self.grips = [ + [79.65, 100, "top"], + [0, 0, "bottom"] + ] + + +class RollerCrusher(NodeItem): + def __init__(self): + super(RollerCrusher, self).__init__("svg/Size Reduction Equipements/Roller Crusher") + self.grips = [ + [50, 100, "top"], + [50, 0, "bottom"] + ] + + +class GeneralSymbol(NodeItem): + def __init__(self): + super(GeneralSymbol, self).__init__("svg/Feeders/General Symbol") + self.grips = [ + [20, 100, "top"], + [80, 0, "bottom"] + ] + diff --git a/src/main/resources/base/config/items.json b/src/main/resources/base/config/items.json index 6753a8f..5080c48 100644 --- a/src/main/resources/base/config/items.json +++ b/src/main/resources/base/config/items.json @@ -57,6 +57,20 @@ "class": "Furnaces and Boilers", "object": "SolidFuelFurnace", "args": [] + }, + "One Cell Fired Heater, Furnace": { + "name": "One Cell Fired Heater, Furnace", + "icon": ".\\Furnaces and Boilers\\One Cell Fired Heater, Furnace.png", + "class": "Furnaces and Boilers", + "object": "OneCellFiredHeater,Furnace", + "args": [] + }, + "Two Cell Fired Heater, Furnace": { + "name": "Two Cell Fired Heater, Furnace", + "icon": ".\\Furnaces and Boilers\\Two Cell Fired Heater, Furnace.png", + "class": "Furnaces and Boilers", + "object": "TwoCellFiredHeater,Furnace", + "args": [] } }, "Heating or Cooling Arrangements": { @@ -119,6 +133,22 @@ "args": [] } }, + "Fittings": { + "Reducer, Expander": { + "name": "Reducer, Expander", + "icon": ".\\Fittings\\Reducer, Expander.png", + "class": "Fittings", + "object": "ReducerExpander", + "args": [] + }, + "Filter": { + "name": "Filter", + "icon": ".\\Fittings\\Filter.png", + "class": "Filter", + "object": "Filter", + "args": [] + } + }, "Process Vessels": { "Horizontal Vessel": { "name": "Horizontal Vessel", @@ -198,6 +228,13 @@ "class": "Pumps", "object": "ReciprocatingPump", "args": [] + }, + "Centrifugal Pump": { + "name": "Centrifugal Pump", + "icon": ".\\Pumps\\Centrifugal Pump.png", + "class": "Pumps", + "object": "CentrifugalPump", + "args": [] } }, "Separators": { @@ -224,5 +261,50 @@ "object": "FloatingRoofTank", "args": [] } + }, + "Valves": { + "Gate Valve": { + "name": "Gate Valve", + "icon": ".\\Valves\\Gate Valve.png", + "class": "Valves", + "object": "GateValve", + "args": [] + } + + }, + "Dryers": { + "Continuos Dryer": { + "name": "Continuos Dryer", + "icon": ".\\Dryers\\Continuous Dryer.png", + "class": "Dryers", + "object": "ContinuousDryer", + "args": [] + } + + }, + "Size Reduction Equipements": { + "Jaw Crusher": { + "name": "Jaw Crusher", + "icon": ".\\Size Reduction Equipements\\Jaw Crusher.png", + "class": "Size Reduction Equipements", + "object": "JawCrusher", + "args": [] + }, + "Roller Crusher": { + "name": "Roller Crusher", + "icon": ".\\Size Reduction Equipements\\Roller Crusher.png", + "class": "Size Reduction Equipements", + "object": "RollerCrusher", + "args": [] + } + }, + "Feeders": { + "General Symbol": { + "name": "General Symbol", + "icon": ".\\Feeders\\General Symbol.png", + "class": "Feeders", + "object": "GeneralSymbol", + "args": [] + } } } \ No newline at end of file diff --git a/src/main/resources/base/svg/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.svg b/src/main/resources/base/svg/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.svg index ce0906b..d91b75c 100644 --- a/src/main/resources/base/svg/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.svg +++ b/src/main/resources/base/svg/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.svg @@ -1,19 +1,19 @@ + width="30.883684mm" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="base" + inkscape:pagecheckerboard="0" /> @@ -150,7 +151,7 @@ image/svg+xml - + @@ -160,10 +161,10 @@ inkscape:groupmode="layer" inkscape:label="Layer 1"> + id="g908"> + -- cgit