implement recent svg items

10 files changed, 60 insertions, 920 deletions

diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py
index 5f673cf..b825653 100644
--- a/src/main/python/shapes/shapes.py
+++ b/src/main/python/shapes/shapes.py
@@ -326,16 +326,13 @@ class NodeItem(QGraphicsSvgItem):
         Extends PyQt5's QGraphicsSvgItem to create the basic structure of shapes with given unit operation type
     """
     # set a common renderer for all svg
-    renderer = QSvgRenderer(fileImporter(f'svg/ellipse.svg'))
+    # renderer = QSvgRenderer(fileImporter(f'svg/ellipse.svg'))
 
     def __init__(self, unitOperationType=None, parent=None):
         QGraphicsSvgItem.__init__(self, parent)
         self.m_type = str(unitOperationType)
         self.id = None
-        # self.m_renderer = QSvgRenderer("svg/" + unitOperationType + ".svg")
-        # self.m_renderer = QSvgRenderer(fileImporter(f'svg/{unitOperationType}.svg'))
-        self.m_renderer = QSvgRenderer(fileImporter(f'svg/ellipse.svg'))
-        # self.m_renderer = QSvgRenderer(resourceManager.get_resource(f'toolbar/{unitOperationType}.svg'))
+        self.m_renderer = QSvgRenderer(fileImporter(f'{unitOperationType}.svg'))
         self.setSharedRenderer(self.m_renderer)
         # set initial size of item
         self.width = 100
diff --git a/src/main/python/utils/toolbar.py b/src/main/python/utils/toolbar.py
index af6feae..7883136 100644
--- a/src/main/python/utils/toolbar.py
+++ b/src/main/python/utils/toolbar.py
@@ -20,6 +20,7 @@ class toolbar(QDockWidget):
     def __init__(self, parent = None):
         super(toolbar, self).__init__(parent)
         self.toolbarButtonDict = dict() #initializes empty dict to store toolbar buttons
+        self.toolbarButtonClassList = []
         self.toolbarItems(toolbarItems.keys()) #creates all necessary buttons
         
         self.setFeatures(QDockWidget.DockWidgetFloatable | QDockWidget.DockWidgetMovable)
@@ -59,8 +60,9 @@ class toolbar(QDockWidget):
     def populateToolbar(self, list):
         #called everytime the button box needs to be updated(incase of a filter)
         self.clearLayout() #clears layout
-        for item in list:
-            self.diagAreaLayout.addWidget(self.toolbarButtonDict[item])
+        for itemClass in list:
+            for item in self.toolbarButtonDict[itemClass].keys():
+                self.diagAreaLayout.addWidget(self.toolbarButtonDict[itemClass][item])
         self.resize()
             
     def searchQuery(self):
@@ -86,13 +88,16 @@ class toolbar(QDockWidget):
         self.diagAreaWidget.setLayout(self.diagAreaLayout)
         self.diagArea.setWidget(self.diagAreaWidget)
 
-    def toolbarItems(self, items):
+    def toolbarItems(self, itemClasses):
         #helper functions to create required buttons
-        for item in items:
-            obj = toolbarItems[item]
-            button = toolbarButton(self, obj)
-            button.clicked.connect(lambda : self.toolbuttonClicked.emit(obj))
-            self.toolbarButtonDict[item] = button
+        for itemClass in itemClasses:
+            self.toolbarButtonDict[itemClass] = {}
+            self.toolbarButtonClassList.append(itemClass)
+            for item in toolbarItems[itemClass].keys():
+                obj = toolbarItems[itemClass][item]
+                button = toolbarButton(self, obj)
+                button.clicked.connect(lambda : self.toolbuttonClicked.emit(obj))
+                self.toolbarButtonDict[itemClass][item] = button
             
     @property
     def toolbarItemList(self):
diff --git a/src/main/resources/base/config/items.json b/src/main/resources/base/config/items.json
index 3fbc55b..fff7505 100644
--- a/src/main/resources/base/config/items.json
+++ b/src/main/resources/base/config/items.json
@@ -1,902 +1,48 @@
 {
-	"Ellipse": {
-		"name": "Ellipse",
-		"icon": "ellipse.png",
-		"object": "QGraphicsEllipseItem",
-        "args": [20, 20, 300, 300]
-    },
-    "airBlownCooler": {
-        "name": "Air blown cooler",
-        "icon": "AirBlownCooler.png",
-        "object": "NodeItem",
-        "args": ["airBlownCooler"]
-    },
-    "alkylation": {
-        "name": "Alkylation",
-        "icon": "Alkylation.png",
-        "object": "NodeItem",
-        "args": ["alkylation"]
-    },
-    "automaticStroker": {
-        "name": "Automatic stroker",
-        "icon": "AutomaticStroker.png",
-        "object": "NodeItem",
-        "args": ["automaticStroker"]
-    },
-    "axialCompressor": {
-        "name": "Axial compressor",
-        "icon": "AxialCompressor.png",
-        "object": "NodeItem",
-        "args": ["axialCompressor"]
-    },
-    "axialFlowFan": {
-        "name": "Axial flow fan",
-        "icon": "AxialFlowFan.png",
-        "object": "NodeItem",
-        "args": ["axialFlowFan"]
-    },
-    "bag": {
-        "name": "Bag",
-        "icon": "Bag.png",
-        "object": "NodeItem",
-        "args": ["bag"]
-    },
-    "boiler": {
-        "name": "Boiler",
-        "icon": "Boiler.png",
-        "object": "NodeItem",
-        "args": ["boiler"]
-    },
-    "boomLoader": {
-        "name": "Boom loader",
-        "icon": "BoomLoader.png",
-        "object": "NodeItem",
-        "args": ["boomLoader"]
-    },
-    "breaker": {
-        "name": "Breaker",
-        "icon": "Breaker.png",
-        "object": "NodeItem",
-        "args": ["breaker"]
-    },
-    "briquettingMachine": {
-        "name": "Briquetting machine",
-        "icon": "BriquettingMachine.png",
-        "object": "NodeItem",
-        "args": ["briquettingMachine"]
-    },
-    "cavityPump": {
-        "name": "Cavity pump",
-        "icon": "CavityPump.png",
-        "object": "NodeItem",
-        "args": ["cavityPump"]
-    },
-    "centrifugal": {
-        "name": "Centrifugal",
-        "icon": "Centrifugal.png",
-        "object": "NodeItem",
-        "args": ["centrifugal"]
-    },
-    "centrifugalBlower": {
-        "name": "Centrifugal blower",
-        "icon": "CentrifugalBlower.png",
-        "object": "NodeItem",
-        "args": ["centrifugalBlower"]
-    },
-    "centrifugalCompressor": {
-        "name": "Centrifugal compressor",
-        "icon": "CentrifugalCompressor.png",
-        "object": "NodeItem",
-        "args": ["centrifugalCompressor"]
-    },
-    "centrifugalCompressor2": {
-        "name": "Centrifugal compressor2",
-        "icon": "CentrifugalCompressor2.png",
-        "object": "NodeItem",
-        "args": ["centrifugalCompressor2"]
-    },
-    "centrifugalCompressor3": {
-        "name": "Centrifugal compressor3",
-        "icon": "CentrifugalCompressor3.png",
-        "object": "NodeItem",
-        "args": ["centrifugalCompressor3"]
-    },
-    "centrifugalCompressor4": {
-        "name": "Centrifugal compressor4",
-        "icon": "CentrifugalCompressor4.png",
-        "object": "NodeItem",
-        "args": ["centrifugalCompressor4"]
-    },
-    "centrifugalPump": {
-        "name": "Centrifugal pump",
-        "icon": "CentrifugalPump.png",
-        "object": "NodeItem",
-        "args": ["centrifugalPump"]
-    },
-    "centrifugalPump2": {
-        "name": "Centrifugal pump2",
-        "icon": "CentrifugalPump2.png",
-        "object": "NodeItem",
-        "args": ["centrifugalPump2"]
-    },
-    "centrifugalPump3": {
-        "name": "Centrifugal pump3",
-        "icon": "CentrifugalPump3.png",
-        "object": "NodeItem",
-        "args": ["centrifugalPump3"]
-    },
-    "centrifugalPump4": {
-        "name": "Centrifugal pump4",
-        "icon": "CentrifugalPump4.png",
-        "object": "NodeItem",
-        "args": ["centrifugalPump4"]
-    },
-    "chimneyTowerHyperbolic": {
-        "name": "Chimney tower hyperbolic",
-        "icon": "ChimneyTowerHyperbolic.png",
-        "object": "NodeItem",
-        "args": ["chimneyTowerHyperbolic"]
-    },
-    "coarseCrusher": {
-        "name": "Coarse crusher",
-        "icon": "CoarseCrusher.png",
-        "object": "NodeItem",
-        "args": ["coarseCrusher"]
-    },
-    "column": {
-        "name": "Column",
-        "icon": "Column.png",
-        "object": "NodeItem",
-        "args": ["column"]
-    },
-    "compressor": {
-        "name": "Compressor",
-        "icon": "Compressor.png",
-        "object": "NodeItem",
-        "args": ["compressor"]
-    },
-    "compressor2": {
-        "name": "Compressor2",
-        "icon": "Compressor2.png",
-        "object": "NodeItem",
-        "args": ["compressor2"]
-    },
-    "compressorSilencer": {
-        "name": "Compressor silencer",
-        "icon": "CompressorSilencer.png",
-        "object": "NodeItem",
-        "args": ["compressorSilencer"]
-    },
-    "compressorVaccumPump": {
-        "name": "Compressor vaccum pump",
-        "icon": "CompressorVaccumPump.png",
-        "object": "NodeItem",
-        "args": ["compressorVaccumPump"]
-    },
-    "condenser": {
-        "name": "Condenser",
-        "icon": "Condenser.png",
-        "object": "NodeItem",
-        "args": ["condenser"]
-    },
-    "coneCrusher": {
-        "name": "Cone crusher",
-        "icon": "ConeCrusher.png",
-        "object": "NodeItem",
-        "args": ["coneCrusher"]
-    },
-    "cooler": {
-        "name": "Cooler",
-        "icon": "Cooler.png",
-        "object": "NodeItem",
-        "args": ["cooler"]
-    },
-    "coolingTower2": {
-        "name": "Cooling tower2",
-        "icon": "CoolingTower2.png",
-        "object": "NodeItem",
-        "args": ["coolingTower2"]
-    },
-    "coolingTower3": {
-        "name": "Cooling tower3",
-        "icon": "CoolingTower3.png",
-        "object": "NodeItem",
-        "args": ["coolingTower3"]
-    },
-    "counterflowForcedDraft": {
-        "name": "Counterflow forced draft",
-        "icon": "CounterflowForcedDraft.png",
-        "object": "NodeItem",
-        "args": ["counterflowForcedDraft"]
-    },
-    "crossflowInducedDraft": {
-        "name": "Crossflow induced draft",
-        "icon": "CrossflowInducedDraft.png",
-        "object": "NodeItem",
-        "args": ["crossflowInducedDraft"]
-    },
-    "crusher": {
-        "name": "Crusher",
-        "icon": "Crusher.png",
-        "object": "NodeItem",
-        "args": ["crusher"]
-    },
-    "diaphragmCompressor": {
-        "name": "Diaphragm compressor",
-        "icon": "DiaphragmCompressor.png",
-        "object": "NodeItem",
-        "args": ["diaphragmCompressor"]
-    },
-    "dieselMotor": {
-        "name": "Diesel motor",
-        "icon": "DieselMotor.png",
-        "object": "NodeItem",
-        "args": ["dieselMotor"]
-    },
-    "doubleFlowTurbine": {
-        "name": "Double flow turbine",
-        "icon": "DoubleFlowTurbine.png",
-        "object": "NodeItem",
-        "args": ["doubleFlowTurbine"]
-    },
-    "doublePipeHeat": {
-        "name": "Double pipe heat",
-        "icon": "DoublePipeHeat.png",
-        "object": "NodeItem",
-        "args": ["doublePipeHeat"]
-    },
-    "dryer": {
-        "name": "Dryer",
-        "icon": "Dryer.png",
-        "object": "NodeItem",
-        "args": ["dryer"]
-    },
-    "dryingOven": {
-        "name": "Drying oven",
-        "icon": "DryingOven.png",
-        "object": "NodeItem",
-        "args": ["dryingOven"]
-    },
-    "ejector": {
-        "name": "Ejector",
-        "icon": "Ejector.png",
-        "object": "NodeItem",
-        "args": ["ejector"]
-    },
-    "ejectorCompressor": {
-        "name": "Ejector compressor",
-        "icon": "EjectorCompressor.png",
-        "object": "NodeItem",
-        "args": ["ejectorCompressor"]
-    },
-    "electricMotor": {
-        "name": "Electric motor",
-        "icon": "ElectricMotor.png",
-        "object": "NodeItem",
-        "args": ["electricMotor"]
-    },
-    "extractorHood": {
-        "name": "Extractor hood",
-        "icon": "ExtractorHood.png",
-        "object": "NodeItem",
-        "args": ["extractorHood"]
-    },
-    "fan": {
-        "name": "Fan",
-        "icon": "Fan.png",
-        "object": "NodeItem",
-        "args": ["fan"]
-    },
-    "fanBlades": {
-        "name": "Fan blades",
-        "icon": "FanBlades.png",
-        "object": "NodeItem",
-        "args": ["fanBlades"]
-    },
-    "fanBlades2": {
-        "name": "Fan blades2",
-        "icon": "FanBlades2.png",
-        "object": "NodeItem",
-        "args": ["fanBlades2"]
-    },
-    "fineCrushers": {
-        "name": "Fine crushers",
-        "icon": "FineCrushers.png",
-        "object": "NodeItem",
-        "args": ["fineCrushers"]
-    },
-    "firedHeater": {
-        "name": "Fired heater",
-        "icon": "FiredHeater.png",
-        "object": "NodeItem",
-        "args": ["firedHeater"]
-    },
-    "fluidCatalyticCracking": {
-        "name": "Fluid catalytic cracking",
-        "icon": "FluidCatalyticCracking.png",
-        "object": "NodeItem",
-        "args": ["fluidCatalyticCracking"]
-    },
-    "fluidCoking": {
-        "name": "Fluid coking",
-        "icon": "FluidCoking.png",
-        "object": "NodeItem",
-        "args": ["fluidCoking"]
-    },
-    "fluidizedBedDryer": {
-        "name": "Fluidized bed dryer",
-        "icon": "FluidizedBedDryer.png",
-        "object": "NodeItem",
-        "args": ["fluidizedBedDryer"]
-    },
-    "fluidizedReactor": {
-        "name": "Fluidized reactor",
-        "icon": "FluidizedReactor.png",
-        "object": "NodeItem",
-        "args": ["fluidizedReactor"]
-    },
-    "forcedDraftCooling": {
-        "name": "Forced draft cooling",
-        "icon": "ForcedDraftCooling.png",
-        "object": "NodeItem",
-        "args": ["forcedDraftCooling"]
-    },
-    "forcedDraftCoolingTower": {
-        "name": "Forced draft cooling tower",
-        "icon": "ForcedDraftCoolingTower.png",
-        "object": "NodeItem",
-        "args": ["forcedDraftCoolingTower"]
-    },
-    "furnace": {
-        "name": "Furnace",
-        "icon": "Furnace.png",
-        "object": "NodeItem",
-        "args": ["furnace"]
-    },
-    "furnace2": {
-        "name": "Furnace2",
-        "icon": "Furnace2.png",
-        "object": "NodeItem",
-        "args": ["furnace2"]
-    },
-    "gasBlower": {
-        "name": "Gas blower",
-        "icon": "GasBlower.png",
-        "object": "NodeItem",
-        "args": ["gasBlower"]
-    },
-    "gasBottle": {
-        "name": "Gas bottle",
-        "icon": "GasBottle.png",
-        "object": "NodeItem",
-        "args": ["gasBottle"]
-    },
-    "gearPump": {
-        "name": "Gear pump",
-        "icon": "GearPump.png",
-        "object": "NodeItem",
-        "args": ["gearPump"]
-    },
-    "generator": {
-        "name": "Generator",
-        "icon": "Generator.png",
-        "object": "NodeItem",
-        "args": ["generator"]
-    },
-    "halfPipeMixingVessel": {
-        "name": "Half pipe mixing vessel",
-        "icon": "HalfPipeMixingVessel.png",
-        "object": "NodeItem",
-        "args": ["halfPipeMixingVessel"]
-    },
-    "hammerCrusher": {
-        "name": "Hammer crusher",
-        "icon": "HammerCrusher.png",
-        "object": "NodeItem",
-        "args": ["hammerCrusher"]
-    },
-    "hammerCrusher2": {
-        "name": "Hammer crusher2",
-        "icon": "HammerCrusher2.png",
-        "object": "NodeItem",
-        "args": ["hammerCrusher2"]
-    },
-    "heatConsumer": {
-        "name": "Heat consumer",
-        "icon": "HeatConsumer.png",
-        "object": "NodeItem",
-        "args": ["heatConsumer"]
-    },
-    "heater": {
-        "name": "Heater",
-        "icon": "Heater.png",
-        "object": "NodeItem",
-        "args": ["heater"]
-    },
-    "heatExchanger": {
-        "name": "Heat exchanger",
-        "icon": "HeatExchanger.png",
-        "object": "NodeItem",
-        "args": ["heatExchanger"]
-    },
-    "heatExchanger2": {
-        "name": "Heat exchanger2",
-        "icon": "HeatExchanger2.png",
-        "object": "NodeItem",
-        "args": ["heatExchanger2"]
-    },
-    "horizontalPump": {
-        "name": "Horizontal pump",
-        "icon": "HorizontalPump.png",
-        "object": "NodeItem",
-        "args": ["horizontalPump"]
-    },
-    "horizontalVessel": {
-        "name": "Horizontal vessel",
-        "icon": "HorizontalVessel.png",
-        "object": "NodeItem",
-        "args": ["horizontalVessel"]
-    },
-    "hydroCracking": {
-        "name": "Hydro cracking",
-        "icon": "HydroCracking.png",
-        "object": "NodeItem",
-        "args": ["hydroCracking"]
-    },
-    "hydrocracking2": {
-        "name": "Hydrocracking2",
-        "icon": "Hydrocracking2.png",
-        "object": "NodeItem",
-        "args": ["hydrocracking2"]
-    },
-    "hydrodesulfurization": {
-        "name": "Hydrodesulfurization",
-        "icon": "Hydrodesulfurization.png",
-        "object": "NodeItem",
-        "args": ["hydrodesulfurization"]
-    },
-    "impactCrusher": {
-        "name": "Impact crusher",
-        "icon": "ImpactCrusher.png",
-        "object": "NodeItem",
-        "args": ["impactCrusher"]
-    },
-    "iSOCentrifugalPump": {
-        "name": "ISOCentrifugal pump",
-        "icon": "ISOCentrifugalPump.png",
-        "object": "NodeItem",
-        "args": ["iSOCentrifugalPump"]
-    },
-    "iSODiaphragmPump": {
-        "name": "ISODiaphragm pump",
-        "icon": "ISODiaphragmPump.png",
-        "object": "NodeItem",
-        "args": ["iSODiaphragmPump"]
-    },
-    "iSOGearPump": {
-        "name": "ISOGear pump",
-        "icon": "ISOGearPump.png",
-        "object": "NodeItem",
-        "args": ["iSOGearPump"]
-    },
-    "iSOLiquidPump": {
-        "name": "ISOLiquid pump",
-        "icon": "ISOLiquidPump.png",
-        "object": "NodeItem",
-        "args": ["iSOLiquidPump"]
-    },
-    "iSOPositiveDisplacementPump": {
-        "name": "ISOPositive displacement pump",
-        "icon": "ISOPositiveDisplacementPump.png",
-        "object": "NodeItem",
-        "args": ["iSOPositiveDisplacementPump"]
-    },
-    "iSOProgressivePump": {
-        "name": "ISOProgressive pump",
-        "icon": "ISOProgressivePump.png",
-        "object": "NodeItem",
-        "args": ["iSOProgressivePump"]
-    },
-    "iSOReciprocatingPistonPump": {
-        "name": "ISOReciprocating piston pump",
-        "icon": "ISOReciprocatingPistonPump.png",
-        "object": "NodeItem",
-        "args": ["iSOReciprocatingPistonPump"]
-    },
-    "iSOScrewPump": {
-        "name": "ISOScrew pump",
-        "icon": "ISOScrewPump.png",
-        "object": "NodeItem",
-        "args": ["iSOScrewPump"]
-    },
-    "jacketedMixingVessel": {
-        "name": "Jacketed mixing vessel",
-        "icon": "JacketedMixingVessel.png",
-        "object": "NodeItem",
-        "args": ["jacketedMixingVessel"]
-    },
-    "jawCrusher": {
-        "name": "Jaw crusher",
-        "icon": "JawCrusher.png",
-        "object": "NodeItem",
-        "args": ["jawCrusher"]
-    },
-    "liquidRingCompressor": {
-        "name": "Liquid ring compressor",
-        "icon": "LiquidRingCompressor.png",
-        "object": "NodeItem",
-        "args": ["liquidRingCompressor"]
-    },
-    "liquidRingVaccumPump": {
-        "name": "Liquid ring vaccum pump",
-        "icon": "LiquidRingVaccumPump.png",
-        "object": "NodeItem",
-        "args": ["liquidRingVaccumPump"]
-    },
-    "mediumCrusher": {
-        "name": "Medium crusher",
-        "icon": "MediumCrusher.png",
-        "object": "NodeItem",
-        "args": ["mediumCrusher"]
-    },
-    "mixing": {
-        "name": "Mixing",
-        "icon": "Mixing.png",
-        "object": "NodeItem",
-        "args": ["mixing"]
-    },
-    "mixingReactor": {
-        "name": "Mixing reactor",
-        "icon": "MixingReactor.png",
-        "object": "NodeItem",
-        "args": ["mixingReactor"]
-    },
-    "motor": {
-        "name": "Motor",
-        "icon": "Motor.png",
-        "object": "NodeItem",
-        "args": ["motor"]
-    },
-    "motorDrivenTurbin": {
-        "name": "Motor driven turbin",
-        "icon": "MotorDrivenTurbin.png",
-        "object": "NodeItem",
-        "args": ["motorDrivenTurbin"]
-    },
-    "motorGenerator": {
-        "name": "Motor generator",
-        "icon": "MotorGenerator.png",
-        "object": "NodeItem",
-        "args": ["motorGenerator"]
-    },
-    "movingShelfDryer": {
-        "name": "Moving shelf dryer",
-        "icon": "MovingShelfDryer.png",
-        "object": "NodeItem",
-        "args": ["movingShelfDryer"]
-    },
-    "oilBurner": {
-        "name": "Oil burner",
-        "icon": "OilBurner.png",
-        "object": "NodeItem",
-        "args": ["oilBurner"]
-    },
-    "openTank": {
-        "name": "Open tank",
-        "icon": "OpenTank.png",
-        "object": "NodeItem",
-        "args": ["openTank"]
-    },
-    "packedTower": {
-        "name": "Packed tower",
-        "icon": "PackedTower.png",
-        "object": "NodeItem",
-        "args": ["packedTower"]
-    },
-    "peristallticPump": {
-        "name": "Peristalltic pump",
-        "icon": "PeristallticPump.png",
-        "object": "NodeItem",
-        "args": ["peristallticPump"]
-    },
-    "pistonCompressor": {
-        "name": "Piston compressor",
-        "icon": "PistonCompressor.png",
-        "object": "NodeItem",
-        "args": ["pistonCompressor"]
-    },
-    "plateTower": {
-        "name": "Plate tower",
-        "icon": "PlateTower.png",
-        "object": "NodeItem",
-        "args": ["plateTower"]
-    },
-    "positiveDisplacementPump": {
-        "name": "Positive displacement pump",
-        "icon": "PositiveDisplacementPump.png",
-        "object": "NodeItem",
-        "args": ["positiveDisplacementPump"]
-    },
-    "positiveDisplacementPump2": {
-        "name": "Positive displacement pump2",
-        "icon": "PositiveDisplacementPump2.png",
-        "object": "NodeItem",
-        "args": ["positiveDisplacementPump2"]
-    },
-    "proportioningPump": {
-        "name": "Proportioning pump",
-        "icon": "ProportioningPump.png",
-        "object": "NodeItem",
-        "args": ["proportioningPump"]
-    },
-    "proportioningPump2": {
-        "name": "Proportioning pump2",
-        "icon": "ProportioningPump2.png",
-        "object": "NodeItem",
-        "args": ["proportioningPump2"]
-    },
-    "pump": {
-        "name": "Pump",
-        "icon": "Pump.png",
-        "object": "NodeItem",
-        "args": ["pump"]
-    },
-    "pump2": {
-        "name": "Pump2",
-        "icon": "Pump2.png",
-        "object": "NodeItem",
-        "args": ["pump2"]
-    },
-    "reboilerHeatExchanger": {
-        "name": "Reboiler heat exchanger",
-        "icon": "ReboilerHeatExchanger.png",
-        "object": "NodeItem",
-        "args": ["reboilerHeatExchanger"]
-    },
-    "reciprocatingCompressor": {
-        "name": "Reciprocating compressor",
-        "icon": "ReciprocatingCompressor.png",
-        "object": "NodeItem",
-        "args": ["reciprocatingCompressor"]
-    },
-    "reciprocatingCompressor2": {
-        "name": "Reciprocating compressor2",
-        "icon": "ReciprocatingCompressor2.png",
-        "object": "NodeItem",
-        "args": ["reciprocatingCompressor2"]
-    },
-    "reciprocatingPump": {
-        "name": "Reciprocating pump",
-        "icon": "ReciprocatingPump.png",
-        "object": "NodeItem",
-        "args": ["reciprocatingPump"]
-    },
-    "reciprocatingPump2": {
-        "name": "Reciprocating pump2",
-        "icon": "ReciprocatingPump2.png",
-        "object": "NodeItem",
-        "args": ["reciprocatingPump2"]
-    },
-    "reciprocativeCompressor": {
-        "name": "Reciprocative compressor",
-        "icon": "ReciprocativeCompressor.png",
-        "object": "NodeItem",
-        "args": ["reciprocativeCompressor"]
-    },
-    "ringCompressor": {
-        "name": "Ring compressor",
-        "icon": "RingCompressor.png",
-        "object": "NodeItem",
-        "args": ["ringCompressor"]
-    },
-    "rollerConveryorBeltDryer": {
-        "name": "Roller converyor belt dryer",
-        "icon": "RollerConveryorBeltDryer.png",
-        "object": "NodeItem",
-        "args": ["rollerConveryorBeltDryer"]
-    },
-    "rollerCrusher": {
-        "name": "Roller crusher",
-        "icon": "RollerCrusher.png",
-        "object": "NodeItem",
-        "args": ["rollerCrusher"]
-    },
-    "rollerVaneCompressor": {
-        "name": "Roller vane compressor",
-        "icon": "RollerVaneCompressor.png",
-        "object": "NodeItem",
-        "args": ["rollerVaneCompressor"]
-    },
-    "rotaryCompressor": {
-        "name": "Rotary compressor",
-        "icon": "RotaryCompressor.png",
-        "object": "NodeItem",
-        "args": ["rotaryCompressor"]
-    },
-    "rotaryCompressor2": {
-        "name": "Rotary compressor2",
-        "icon": "RotaryCompressor2.png",
-        "object": "NodeItem",
-        "args": ["rotaryCompressor2"]
-    },
-    "rotaryCompressor3": {
-        "name": "Rotary compressor3",
-        "icon": "RotaryCompressor3.png",
-        "object": "NodeItem",
-        "args": ["rotaryCompressor3"]
-    },
-    "rotaryCompressorSilencers": {
-        "name": "Rotary compressor silencers",
-        "icon": "RotaryCompressorSilencers.png",
-        "object": "NodeItem",
-        "args": ["rotaryCompressorSilencers"]
-    },
-    "rotaryGearPump": {
-        "name": "Rotary gear pump",
-        "icon": "RotaryGearPump.png",
-        "object": "NodeItem",
-        "args": ["rotaryGearPump"]
-    },
-    "rotaryPump": {
-        "name": "Rotary pump",
-        "icon": "RotaryPump.png",
-        "object": "NodeItem",
-        "args": ["rotaryPump"]
-    },
-    "screen": {
-        "name": "Screen",
-        "icon": "Screen.png",
-        "object": "NodeItem",
-        "args": ["screen"]
-    },
-    "screwPump": {
-        "name": "Screw pump",
-        "icon": "ScrewPump.png",
-        "object": "NodeItem",
-        "args": ["screwPump"]
-    },
-    "screwPump2": {
-        "name": "Screw pump2",
-        "icon": "ScrewPump2.png",
-        "object": "NodeItem",
-        "args": ["screwPump2"]
-    },
-    "selectableCompressor": {
-        "name": "Selectable compressor",
-        "icon": "SelectableCompressor.png",
-        "object": "NodeItem",
-        "args": ["selectableCompressor"]
-    },
-    "selectableFan": {
-        "name": "Selectable fan",
-        "icon": "SelectableFan.png",
-        "object": "NodeItem",
-        "args": ["selectableFan"]
-    },
-    "singlePassHeat": {
-        "name": "Single pass heat",
-        "icon": "SinglePassHeat.png",
-        "object": "NodeItem",
-        "args": ["singlePassHeat"]
-    },
-    "spiralHeatExchanger": {
-        "name": "Spiral heat exchanger",
-        "icon": "SpiralHeatExchanger.png",
-        "object": "NodeItem",
-        "args": ["spiralHeatExchanger"]
-    },
-    "spray": {
-        "name": "Spray",
-        "icon": "Spray.png",
-        "object": "NodeItem",
-        "args": ["spray"]
-    },
-    "sprayDryer": {
-        "name": "Spray dryer",
-        "icon": "SprayDryer.png",
-        "object": "NodeItem",
-        "args": ["sprayDryer"]
-    },
-    "straightTubesHeat": {
-        "name": "Straight tubes heat",
-        "icon": "StraightTubesHeat.png",
-        "object": "NodeItem",
-        "args": ["straightTubesHeat"]
-    },
-    "submersiblePump": {
-        "name": "Submersible pump",
-        "icon": "SubmersiblePump.png",
-        "object": "NodeItem",
-        "args": ["submersiblePump"]
-    },
-    "sumpPump": {
-        "name": "Sump pump",
-        "icon": "SumpPump.png",
-        "object": "NodeItem",
-        "args": ["sumpPump"]
-    },
-    "tank": {
-        "name": "Tank",
-        "icon": "Tank.png",
-        "object": "NodeItem",
-        "args": ["tank"]
-    },
-    "transport": {
-        "name": "Transport",
-        "icon": "Transport.png",
-        "object": "NodeItem",
-        "args": ["transport"]
-    },
-    "tripleFanBlades": {
-        "name": "Triple fan blades",
-        "icon": "TripleFanBlades.png",
-        "object": "NodeItem",
-        "args": ["tripleFanBlades"]
-    },
-    "tubular": {
-        "name": "Tubular",
-        "icon": "Tubular.png",
-        "object": "NodeItem",
-        "args": ["tubular"]
-    },
-    "turbineDriver": {
-        "name": "Turbine driver",
-        "icon": "TurbineDriver.png",
-        "object": "NodeItem",
-        "args": ["turbineDriver"]
-    },
-    "turbinePump": {
-        "name": "Turbine pump",
-        "icon": "TurbinePump.png",
-        "object": "NodeItem",
-        "args": ["turbinePump"]
-    },
-    "uTubeHeatExchanger": {
-        "name": "UTube heat exchanger",
-        "icon": "UTubeHeatExchanger.png",
-        "object": "NodeItem",
-        "args": ["uTubeHeatExchanger"]
-    },
-    "vaccumPump": {
-        "name": "Vaccum pump",
-        "icon": "VaccumPump.png",
-        "object": "NodeItem",
-        "args": ["vaccumPump"]
-    },
-    "variousCrushers": {
-        "name": "Various crushers",
-        "icon": "VariousCrushers.png",
-        "object": "NodeItem",
-        "args": ["variousCrushers"]
-    },
-    "verticalPump": {
-        "name": "Vertical pump",
-        "icon": "VerticalPump.png",
-        "object": "NodeItem",
-        "args": ["verticalPump"]
-    },
-    "verticalPump2": {
-        "name": "Vertical pump2",
-        "icon": "VerticalPump2.png",
-        "object": "NodeItem",
-        "args": ["verticalPump2"]
-    },
-    "verticalVessel": {
-        "name": "Vertical vessel",
-        "icon": "VerticalVessel.png",
-        "object": "NodeItem",
-        "args": ["verticalVessel"]
-    },
-    "vibrationCrusher": {
-        "name": "Vibration crusher",
-        "icon": "VibrationCrusher.png",
-        "object": "NodeItem",
-        "args": ["vibrationCrusher"]
-    },
-    "wastewaterTreatment": {
-        "name": "Wastewater treatment",
-        "icon": "WastewaterTreatment.png",
-        "object": "NodeItem",
-        "args": ["wastewaterTreatment"]
+    "Piping": {
+        "Inflow Line": {
+            "name": "Inflow Line",
+            "icon": ".\\Piping\\Inflow Line.png",
+            "class": "Piping",
+            "object": "InflowLine",
+            "args": []
+        },
+        "Outflow Line": {
+            "name": "Outflow Line",
+            "icon": ".\\Piping\\Outflow Line.png",
+            "class": "Piping",
+            "object": "OutflowLine",
+            "args": []
+        }
+    },
+    "Pumps": {
+        "Duplex Pump": {
+            "name": "Duplex Pump",
+            "icon": ".\\Pumps\\Duplex Pump.png",
+            "class": "Pumps",
+            "object": "DuplexPump",
+            "args": []
+        },
+        "Plunger Pump": {
+            "name": "Plunger Pump",
+            "icon": ".\\Pumps\\Plunger Pump.png",
+            "class": "Pumps",
+            "object": "PlungerPump",
+            "args": []
+        },
+        "Proportioning Pump": {
+            "name": "Proportioning Pump",
+            "icon": ".\\Pumps\\Proportioning Pump.png",
+            "class": "Pumps",
+            "object": "ProportioningPump",
+            "args": []
+        },
+        "Reciprocating Pump": {
+            "name": "Reciprocating Pump",
+            "icon": ".\\Pumps\\Reciprocating Pump.png",
+            "class": "Pumps",
+            "object": "ReciprocatingPump",
+            "args": []
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/base/svg/ellipse.svg b/src/main/resources/base/svg/ellipse.svg
deleted file mode 100644
index c455408..0000000
--- a/src/main/resources/base/svg/ellipse.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://example.org" xmlns:svg="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" viewBox="0 0 100 100">
-   <!-- parent contents here -->
-   <!-- <svg:svg version="1.2" baseProfile="tiny" viewBox="0 0 100 100"> -->
-      <svg:ellipse cx="50" cy="50" rx="50" ry="50" fill="none" stroke="black" stroke-width="1" />
-   <!-- </svg:svg> -->
-   <!-- ... -->
-</svg>
\ No newline at end of file
diff --git a/src/main/resources/base/toolbar/Piping/Inflow Line.png b/src/main/resources/base/toolbar/Piping/Inflow Line.png
new file mode 100644
index 0000000..eee1712
--- /dev/null
+++ b/src/main/resources/base/toolbar/Piping/Inflow Line.png
diff --git a/src/main/resources/base/toolbar/Piping/Outflow Line.png b/src/main/resources/base/toolbar/Piping/Outflow Line.png
new file mode 100644
index 0000000..1d69427
--- /dev/null
+++ b/src/main/resources/base/toolbar/Piping/Outflow Line.png
diff --git a/src/main/resources/base/toolbar/Pumps/Duplex Pump.png b/src/main/resources/base/toolbar/Pumps/Duplex Pump.png
new file mode 100644
index 0000000..50ba6a4
--- /dev/null
+++ b/src/main/resources/base/toolbar/Pumps/Duplex Pump.png
diff --git a/src/main/resources/base/toolbar/Pumps/Plunger Pump.png b/src/main/resources/base/toolbar/Pumps/Plunger Pump.png
new file mode 100644
index 0000000..ea202cd
--- /dev/null
+++ b/src/main/resources/base/toolbar/Pumps/Plunger Pump.png
diff --git a/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png b/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png
new file mode 100644
index 0000000..cf23409
--- /dev/null
+++ b/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png
diff --git a/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png b/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png
new file mode 100644
index 0000000..a697be3
--- /dev/null
+++ b/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png