From 33f870e90d48a6e08b31f3751df120b45f562101 Mon Sep 17 00:00:00 2001 From: Blaine Date: Thu, 11 Jun 2020 11:27:05 +0530 Subject: new svg + ui --- src/main/resources/base/app.qss | 32 ++- src/main/resources/base/config/items.json | 243 ++++++++++++++++----- .../Oil Gas or Pulverized Fuel Furnace.svg | 204 +++++++++++++++++ .../Furnaces and Boilers/Solid Fuel Furnace.svg | 107 +++++++++ .../905Exchanger.svg | 85 +++++++ .../907Kettle Reboiler.svg | 93 ++++++++ .../Heating or Cooling Arrangements/Exchanger.svg | 101 +++++++++ .../Heat Exchanger.svg | 74 +++++++ .../Immersion Coil.svg | 40 ++++ .../Kettle Reboiler.svg | 83 +++++++ .../base/svg/Process Vessels/Horizontal Vessel.svg | 145 ++++++++++++ .../base/svg/Process Vessels/Packed Vessel.svg | 144 ++++++++++++ .../base/svg/Process Vessels/Trays or plates.svg | 64 ++++++ .../base/svg/Process Vessels/Vertical Vessel.svg | 107 +++++++++ src/main/resources/base/svg/Pumps/Duplex Pump.svg | 156 ++++++------- .../Separators for Liquids, Decanter.svg | 75 +++++++ .../svg/Storage Vessels Tanks/Fixed Roof Tank.svg | 34 +++ .../Storage Vessels Tanks/Floating Roof Tank.svg | 82 +++++++ src/main/resources/base/svg/Valves/Gate Valve.svg | 62 ++++++ src/main/resources/base/svg/Valves/Globe Valve.svg | 46 ++++ .../toolbar/Compressors/Centrifugal Compressor.png | Bin 1413 -> 1413 bytes .../toolbar/Compressors/Ejector Compressor.png | Bin 1126 -> 1126 bytes .../resources/base/toolbar/Compressors/Fan.png | Bin 1600 -> 1600 bytes .../Positive Displacement Compressor.png | Bin 1098 -> 1098 bytes .../Compressors/Reciprocating Compressor.png | Bin 1091 -> 1091 bytes .../resources/base/toolbar/Compressors/Turbine.png | Bin 1368 -> 1368 bytes .../Oil Gas or Pulverized Fuel Furnace.png | Bin 0 -> 1296 bytes .../Furnaces and Boilers/Solid Fuel Furnace.png | Bin 0 -> 1332 bytes .../905Exchanger.png | Bin 0 -> 1134 bytes .../907Kettle Reboiler.png | Bin 0 -> 1224 bytes .../Heating or Cooling Arrangements/Exchanger.png | Bin 0 -> 2145 bytes .../Heat Exchanger.png | Bin 0 -> 2140 bytes .../Immersion Coil.png | Bin 0 -> 1570 bytes .../Kettle Reboiler.png | Bin 0 -> 2445 bytes .../resources/base/toolbar/Piping/Inflow Line.png | Bin 1185 -> 1185 bytes .../resources/base/toolbar/Piping/Outflow Line.png | Bin 1244 -> 1244 bytes .../toolbar/Process Vessels/Horizontal Vessel.png | Bin 0 -> 1053 bytes .../base/toolbar/Process Vessels/Packed Vessel.png | Bin 0 -> 1710 bytes .../toolbar/Process Vessels/Trays or plates.png | Bin 0 -> 992 bytes .../toolbar/Process Vessels/Vertical Vessel.png | Bin 0 -> 1048 bytes .../resources/base/toolbar/Pumps/Blowing Egg.png | Bin 1556 -> 1556 bytes .../resources/base/toolbar/Pumps/Duplex Pump.png | Bin 1387 -> 1368 bytes .../base/toolbar/Pumps/Ejector(Vapor Service).png | Bin 1106 -> 1106 bytes .../base/toolbar/Pumps/Hand Pump with Drum.png | Bin 2166 -> 2166 bytes .../resources/base/toolbar/Pumps/Plunger Pump.png | Bin 1057 -> 1057 bytes .../base/toolbar/Pumps/Proportioning Pump.png | Bin 1272 -> 1272 bytes .../base/toolbar/Pumps/Reciprocating Pump.png | Bin 1258 -> 1258 bytes .../Separators for Liquids, Decanter.png | Bin 0 -> 946 bytes .../Storage Vessels Tanks/Fixed Roof Tank.png | Bin 0 -> 1167 bytes .../Storage Vessels Tanks/Floating Roof Tank.png | Bin 0 -> 1485 bytes .../resources/base/toolbar/Valves/Gate Valve.png | Bin 0 -> 980 bytes .../resources/base/toolbar/Valves/Globe Valve.png | Bin 0 -> 978 bytes 52 files changed, 1825 insertions(+), 152 deletions(-) create mode 100644 src/main/resources/base/svg/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.svg create mode 100644 src/main/resources/base/svg/Furnaces and Boilers/Solid Fuel Furnace.svg create mode 100644 src/main/resources/base/svg/Heating or Cooling Arrangements/905Exchanger.svg create mode 100644 src/main/resources/base/svg/Heating or Cooling Arrangements/907Kettle Reboiler.svg create mode 100644 src/main/resources/base/svg/Heating or Cooling Arrangements/Exchanger.svg create mode 100644 src/main/resources/base/svg/Heating or Cooling Arrangements/Heat Exchanger.svg create mode 100644 src/main/resources/base/svg/Heating or Cooling Arrangements/Immersion Coil.svg create mode 100644 src/main/resources/base/svg/Heating or Cooling Arrangements/Kettle Reboiler.svg create mode 100644 src/main/resources/base/svg/Process Vessels/Horizontal Vessel.svg create mode 100644 src/main/resources/base/svg/Process Vessels/Packed Vessel.svg create mode 100644 src/main/resources/base/svg/Process Vessels/Trays or plates.svg create mode 100644 src/main/resources/base/svg/Process Vessels/Vertical Vessel.svg create mode 100644 src/main/resources/base/svg/Separators/Separators for Liquids, Decanter.svg create mode 100644 src/main/resources/base/svg/Storage Vessels Tanks/Fixed Roof Tank.svg create mode 100644 src/main/resources/base/svg/Storage Vessels Tanks/Floating Roof Tank.svg create mode 100644 src/main/resources/base/svg/Valves/Gate Valve.svg create mode 100644 src/main/resources/base/svg/Valves/Globe Valve.svg create mode 100644 src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png create mode 100644 src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png create mode 100644 src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png create mode 100644 src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png create mode 100644 src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png create mode 100644 src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png create mode 100644 src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png create mode 100644 src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png create mode 100644 src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png create mode 100644 src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png create mode 100644 src/main/resources/base/toolbar/Process Vessels/Trays or plates.png create mode 100644 src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png create mode 100644 src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png create mode 100644 src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png create mode 100644 src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png create mode 100644 src/main/resources/base/toolbar/Valves/Gate Valve.png create mode 100644 src/main/resources/base/toolbar/Valves/Globe Valve.png (limited to 'src/main/resources/base') diff --git a/src/main/resources/base/app.qss b/src/main/resources/base/app.qss index 0d6e912..723bfa3 100644 --- a/src/main/resources/base/app.qss +++ b/src/main/resources/base/app.qss @@ -16,6 +16,10 @@ QLineEdit:focus{ border-color: #7cabf9; } +QFrame{ + background-color: white; +} + QTabBar { qproperty-drawBase: 0; left: 5px; @@ -89,7 +93,8 @@ QTabBar::tab:bottom:only-one { } QDockWidget { - color: #828282; + color: white; + background-color: white; border: 1px solid #e6e6e6; } @@ -113,19 +118,24 @@ QDockWidget::float-button:pressed { background-color: #e0e0e0; } +QScrollArea{ + border-style: none; + border-width: 0px; +} + QToolButton { color: #f2f2f2; text-align: center; background-color: rgba(213, 213, 213, 0); - border: 1px solid #828282; + border: 0px solid #828282; outline: none; + border-radius: 8px; } QToolButton:hover, QToolButton:focus { color: black; - background-color: qlineargradient(spread:pad, x1:1, y1:0.545, x2:1, y2:0, stop:0 #3874f2, stop:1 #5e90fa); - border-color: #3874f2; + border: 3px solid #3874f2; } QToolButton:disabled, @@ -145,13 +155,18 @@ QToolButton:checked { } sectionLabel{ + border-color: gray; border-style: solid; - border-color: grey; + border-width: 0px 0px 1px 0px; padding-bottom: 3px; margin-bottom: 3px; - margin-top: 5px; + margin-top: 10px; text-align: left; - border-width: 0px 0px 2px 0px; + font-size: 20px; +} + +sectionLabel:first-child{ + margin-top: 0px; } customView QPushButton{ @@ -184,4 +199,5 @@ customTabWidget::pane { border: 2px solid #E6E6E3; border-radius: 7px; padding: 1px; - background-color: #E6E6E3;} + background-color: #E6E6E3; +} \ No newline at end of file diff --git a/src/main/resources/base/config/items.json b/src/main/resources/base/config/items.json index 9a55a4d..bd453c5 100644 --- a/src/main/resources/base/config/items.json +++ b/src/main/resources/base/config/items.json @@ -1,4 +1,108 @@ { + "Compressors": { + "Centrifugal Compressor": { + "name": "Centrifugal Compressor", + "icon": ".\\Compressors\\Centrifugal Compressor.png", + "class": "Compressors", + "object": "CentrifugalCompressor", + "args": [] + }, + "Ejector Compressor": { + "name": "Ejector Compressor", + "icon": ".\\Compressors\\Ejector Compressor.png", + "class": "Compressors", + "object": "EjectorCompressor", + "args": [] + }, + "Fan": { + "name": "Fan", + "icon": ".\\Compressors\\Fan.png", + "class": "Compressors", + "object": "Fan", + "args": [] + }, + "Positive Displacement Compressor": { + "name": "Positive Displacement Compressor", + "icon": ".\\Compressors\\Positive Displacement Compressor.png", + "class": "Compressors", + "object": "PositiveDisplacementCompressor", + "args": [] + }, + "Reciprocating Compressor": { + "name": "Reciprocating Compressor", + "icon": ".\\Compressors\\Reciprocating Compressor.png", + "class": "Compressors", + "object": "ReciprocatingCompressor", + "args": [] + }, + "Turbine": { + "name": "Turbine", + "icon": ".\\Compressors\\Turbine.png", + "class": "Compressors", + "object": "Turbine", + "args": [] + } + }, + "Furnaces and Boilers": { + "Oil Gas or Pulverized Fuel Furnace": { + "name": "Oil Gas or Pulverized Fuel Furnace", + "icon": ".\\Furnaces and Boilers\\Oil Gas or Pulverized Fuel Furnace.png", + "class": "Furnaces and Boilers", + "object": "OilGasOrPulverizedFuelFurnace", + "args": [] + }, + "Solid Fuel Furnace": { + "name": "Solid Fuel Furnace", + "icon": ".\\Furnaces and Boilers\\Solid Fuel Furnace.png", + "class": "Furnaces and Boilers", + "object": "SolidFuelFurnace", + "args": [] + } + }, + "Heating or Cooling Arrangements": { + "905Exchanger": { + "name": "905Exchanger", + "icon": ".\\Heating or Cooling Arrangements\\905Exchanger.png", + "class": "Heating or Cooling Arrangements", + "object": "905Exchanger", + "args": [] + }, + "907Kettle Reboiler": { + "name": "907Kettle Reboiler", + "icon": ".\\Heating or Cooling Arrangements\\907Kettle Reboiler.png", + "class": "Heating or Cooling Arrangements", + "object": "907KettleReboiler", + "args": [] + }, + "Exchanger": { + "name": "Exchanger", + "icon": ".\\Heating or Cooling Arrangements\\Exchanger.png", + "class": "Heating or Cooling Arrangements", + "object": "Exchanger", + "args": [] + }, + "Heat Exchanger": { + "name": "Heat Exchanger", + "icon": ".\\Heating or Cooling Arrangements\\Heat Exchanger.png", + "class": "Heating or Cooling Arrangements", + "object": "HeatExchanger", + "args": [] + }, + "Immersion Coil": { + "name": "Immersion Coil", + "icon": ".\\Heating or Cooling Arrangements\\Immersion Coil.png", + "class": "Heating or Cooling Arrangements", + "object": "ImmersionCoil", + "args": [] + }, + "Kettle Reboiler": { + "name": "Kettle Reboiler", + "icon": ".\\Heating or Cooling Arrangements\\Kettle Reboiler.png", + "class": "Heating or Cooling Arrangements", + "object": "KettleReboiler", + "args": [] + } + }, "Piping": { "Inflow Line": { "name": "Inflow Line", @@ -15,7 +119,44 @@ "args": [] } }, + "Process Vessels": { + "Horizontal Vessel": { + "name": "Horizontal Vessel", + "icon": ".\\Process Vessels\\Horizontal Vessel.png", + "class": "Process Vessels", + "object": "HorizontalVessel", + "args": [] + }, + "Packed Vessel": { + "name": "Packed Vessel", + "icon": ".\\Process Vessels\\Packed Vessel.png", + "class": "Process Vessels", + "object": "PackedVessel", + "args": [] + }, + "Trays or plates": { + "name": "Trays or plates", + "icon": ".\\Process Vessels\\Trays or plates.png", + "class": "Process Vessels", + "object": "TraysOrPlates", + "args": [] + }, + "Vertical Vessel": { + "name": "Vertical Vessel", + "icon": ".\\Process Vessels\\Vertical Vessel.png", + "class": "Process Vessels", + "object": "VerticalVessel", + "args": [] + } + }, "Pumps": { + "Blowing Egg": { + "name": "Blowing Egg", + "icon": ".\\Pumps\\Blowing Egg.png", + "class": "Pumps", + "object": "BlowingEgg", + "args": [] + }, "Duplex Pump": { "name": "Duplex Pump", "icon": ".\\Pumps\\Duplex Pump.png", @@ -23,6 +164,20 @@ "object": "DuplexPump", "args": [] }, + "Ejector(Vapor Service)": { + "name": "Ejector(Vapor Service)", + "icon": ".\\Pumps\\Ejector(Vapor Service).png", + "class": "Pumps", + "object": "EjectorVaporService", + "args": [] + }, + "Hand Pump with Drum": { + "name": "Hand Pump with Drum", + "icon": ".\\Pumps\\Hand Pump with Drum.png", + "class": "Pumps", + "object": "HandPumpWithDrum", + "args": [] + }, "Plunger Pump": { "name": "Plunger Pump", "icon": ".\\Pumps\\Plunger Pump.png", @@ -43,70 +198,46 @@ "class": "Pumps", "object": "ReciprocatingPump", "args": [] - }, - "Blowing Egg": { - "name": "Blowing Egg", - "icon": ".\\Pumps\\Blowing Egg.png", - "class": "Pumps", - "object": "BlowingEgg", - "args": [] - }, - "Ejector(Vapor Service)": { - "name": "Ejector(Vapor Service)", - "icon": ".\\Pumps\\Ejector(Vapor Service).png", - "class": "Pumps", - "object": "Ejector(VaporService)", - "args": [] - }, - "Hand Pump with Drum": { - "name": "Hand Pump with Drum", - "icon": ".\\Pumps\\Hand Pump with Drum.png", - "class": "Pumps", - "object": "HandPumpWithDrum", - "args": [] } }, - "Compressors": { - "Centrifugal Compressor": { - "name": "Centrifugal Compressor", - "icon": ".\\Compressors\\Centrifugal Compressor.png", - "class": "Compressors", - "object": "CentrifugalCompressor", + "Separators": { + "Separators for Liquids, Decanter": { + "name": "Separators for Liquids, Decanter", + "icon": ".\\Separators\\Separators for Liquids, Decanter.png", + "class": "Separators", + "object": "SeparatorsForLiquids,Decanter", "args": [] - }, - "Ejector Compressor": { - "name": "Ejector Compressor", - "icon": ".\\Compressors\\Ejector Compressor.png", - "class": "Compressors", - "object": "EjectorCompressor", + } + }, + "Storage Vessels Tanks": { + "Fixed Roof Tank": { + "name": "Fixed Roof Tank", + "icon": ".\\Storage Vessels Tanks\\Fixed Roof Tank.png", + "class": "Storage Vessels Tanks", + "object": "FixedRoofTank", "args": [] }, - "Fan": { - "name": "Fan", - "icon": ".\\Compressors\\Fan.png", - "class": "Compressors", - "object": "Fan", + "Floating Roof Tank": { + "name": "Floating Roof Tank", + "icon": ".\\Storage Vessels Tanks\\Floating Roof Tank.png", + "class": "Storage Vessels Tanks", + "object": "FloatingRoofTank", "args": [] - }, - "Positive Displacement Compressor": { - "name": "Positive Displacement Compressor", - "icon": ".\\Compressors\\Positive Displacement Compressor.png", - "class": "Compressors", - "object": "PositiveDisplacementCompressor", - "args": [] - }, - "Reciprocating Compressor": { - "name": "Reciprocating Compressor", - "icon": ".\\Compressors\\Reciprocating Compressor.png", - "class": "Compressors", - "object": "ReciprocatingCompressor", + } + }, + "Valves": { + "Gate Valve": { + "name": "Gate Valve", + "icon": ".\\Valves\\Gate Valve.png", + "class": "Valves", + "object": "GateValve", "args": [] }, - "Turbine": { - "name": "Turbine", - "icon": ".\\Compressors\\Turbine.png", - "class": "Compressors", - "object": "Turbine", + "Globe Valve": { + "name": "Globe Valve", + "icon": ".\\Valves\\Globe Valve.png", + "class": "Valves", + "object": "GlobeValve", "args": [] } } 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 new file mode 100644 index 0000000..ce0906b --- /dev/null +++ b/src/main/resources/base/svg/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.svg @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Furnaces and Boilers/Solid Fuel Furnace.svg b/src/main/resources/base/svg/Furnaces and Boilers/Solid Fuel Furnace.svg new file mode 100644 index 0000000..1274675 --- /dev/null +++ b/src/main/resources/base/svg/Furnaces and Boilers/Solid Fuel Furnace.svg @@ -0,0 +1,107 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Heating or Cooling Arrangements/905Exchanger.svg b/src/main/resources/base/svg/Heating or Cooling Arrangements/905Exchanger.svg new file mode 100644 index 0000000..c558faf --- /dev/null +++ b/src/main/resources/base/svg/Heating or Cooling Arrangements/905Exchanger.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Heating or Cooling Arrangements/907Kettle Reboiler.svg b/src/main/resources/base/svg/Heating or Cooling Arrangements/907Kettle Reboiler.svg new file mode 100644 index 0000000..8de832d --- /dev/null +++ b/src/main/resources/base/svg/Heating or Cooling Arrangements/907Kettle Reboiler.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Heating or Cooling Arrangements/Exchanger.svg b/src/main/resources/base/svg/Heating or Cooling Arrangements/Exchanger.svg new file mode 100644 index 0000000..ee9aa2e --- /dev/null +++ b/src/main/resources/base/svg/Heating or Cooling Arrangements/Exchanger.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Heating or Cooling Arrangements/Heat Exchanger.svg b/src/main/resources/base/svg/Heating or Cooling Arrangements/Heat Exchanger.svg new file mode 100644 index 0000000..84bc22e --- /dev/null +++ b/src/main/resources/base/svg/Heating or Cooling Arrangements/Heat Exchanger.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Heating or Cooling Arrangements/Immersion Coil.svg b/src/main/resources/base/svg/Heating or Cooling Arrangements/Immersion Coil.svg new file mode 100644 index 0000000..8d1155c --- /dev/null +++ b/src/main/resources/base/svg/Heating or Cooling Arrangements/Immersion Coil.svg @@ -0,0 +1,40 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Heating or Cooling Arrangements/Kettle Reboiler.svg b/src/main/resources/base/svg/Heating or Cooling Arrangements/Kettle Reboiler.svg new file mode 100644 index 0000000..94852e6 --- /dev/null +++ b/src/main/resources/base/svg/Heating or Cooling Arrangements/Kettle Reboiler.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Process Vessels/Horizontal Vessel.svg b/src/main/resources/base/svg/Process Vessels/Horizontal Vessel.svg new file mode 100644 index 0000000..7881b2e --- /dev/null +++ b/src/main/resources/base/svg/Process Vessels/Horizontal Vessel.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Process Vessels/Packed Vessel.svg b/src/main/resources/base/svg/Process Vessels/Packed Vessel.svg new file mode 100644 index 0000000..b7a488f --- /dev/null +++ b/src/main/resources/base/svg/Process Vessels/Packed Vessel.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Process Vessels/Trays or plates.svg b/src/main/resources/base/svg/Process Vessels/Trays or plates.svg new file mode 100644 index 0000000..3824a10 --- /dev/null +++ b/src/main/resources/base/svg/Process Vessels/Trays or plates.svg @@ -0,0 +1,64 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Process Vessels/Vertical Vessel.svg b/src/main/resources/base/svg/Process Vessels/Vertical Vessel.svg new file mode 100644 index 0000000..9c195f8 --- /dev/null +++ b/src/main/resources/base/svg/Process Vessels/Vertical Vessel.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Pumps/Duplex Pump.svg b/src/main/resources/base/svg/Pumps/Duplex Pump.svg index d499cc7..7557711 100644 --- a/src/main/resources/base/svg/Pumps/Duplex Pump.svg +++ b/src/main/resources/base/svg/Pumps/Duplex Pump.svg @@ -7,63 +7,39 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" - sodipodi:docname="Duplex Pump.svg" - width="21.156015mm" - height="22.703859mm" - viewBox="0 0 21.156015 22.703859" + id="svg5576" version="1.1" - id="svg5576"> - + viewBox="0 0 21.156015 22.703859" + height="22.703859mm" + width="21.156015mm"> + x1="2331.7856" + y1="280.57645" + x2="2365.7141" + y2="280.57645" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-547.69335,-4.3953684)" /> + id="linearGradient4926" + osb:paint="solid"> + id="stop4924" /> + gradientUnits="userSpaceOnUse" + x1="2331.7856" + y1="280.57645" + x2="2365.7141" + y2="280.57645" + gradientTransform="matrix(0.73140497,0,0,0.73140497,-702.68351,233.03624)" /> @@ -73,56 +49,60 @@ image/svg+xml - + - + transform="translate(-64.994234,-64.999262)" + id="layer1"> + id="g6206"> - + + + M + id="text5053">M + + + + + - - - - diff --git a/src/main/resources/base/svg/Separators/Separators for Liquids, Decanter.svg b/src/main/resources/base/svg/Separators/Separators for Liquids, Decanter.svg new file mode 100644 index 0000000..03e0d1a --- /dev/null +++ b/src/main/resources/base/svg/Separators/Separators for Liquids, Decanter.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Storage Vessels Tanks/Fixed Roof Tank.svg b/src/main/resources/base/svg/Storage Vessels Tanks/Fixed Roof Tank.svg new file mode 100644 index 0000000..59d046c --- /dev/null +++ b/src/main/resources/base/svg/Storage Vessels Tanks/Fixed Roof Tank.svg @@ -0,0 +1,34 @@ + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/main/resources/base/svg/Storage Vessels Tanks/Floating Roof Tank.svg b/src/main/resources/base/svg/Storage Vessels Tanks/Floating Roof Tank.svg new file mode 100644 index 0000000..e0f66b9 --- /dev/null +++ b/src/main/resources/base/svg/Storage Vessels Tanks/Floating Roof Tank.svg @@ -0,0 +1,82 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/base/svg/Valves/Gate Valve.svg b/src/main/resources/base/svg/Valves/Gate Valve.svg new file mode 100644 index 0000000..53b3b6f --- /dev/null +++ b/src/main/resources/base/svg/Valves/Gate Valve.svg @@ -0,0 +1,62 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/main/resources/base/svg/Valves/Globe Valve.svg b/src/main/resources/base/svg/Valves/Globe Valve.svg new file mode 100644 index 0000000..f584bf8 --- /dev/null +++ b/src/main/resources/base/svg/Valves/Globe Valve.svg @@ -0,0 +1,46 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png b/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png index 0dd5c81..29c417f 100644 Binary files a/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png and b/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png differ diff --git a/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png b/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png index 2401524..c1d0486 100644 Binary files a/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png and b/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png differ diff --git a/src/main/resources/base/toolbar/Compressors/Fan.png b/src/main/resources/base/toolbar/Compressors/Fan.png index 44ee063..38ecb21 100644 Binary files a/src/main/resources/base/toolbar/Compressors/Fan.png and b/src/main/resources/base/toolbar/Compressors/Fan.png differ diff --git a/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png b/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png index f7e6e8e..6f7be8f 100644 Binary files a/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png and b/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png differ diff --git a/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png b/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png index 781f722..f3f284c 100644 Binary files a/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png and b/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png differ diff --git a/src/main/resources/base/toolbar/Compressors/Turbine.png b/src/main/resources/base/toolbar/Compressors/Turbine.png index 795cc90..c2acd75 100644 Binary files a/src/main/resources/base/toolbar/Compressors/Turbine.png and b/src/main/resources/base/toolbar/Compressors/Turbine.png differ diff --git a/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png b/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png new file mode 100644 index 0000000..f2f1c7d Binary files /dev/null and b/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png differ diff --git a/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png b/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png new file mode 100644 index 0000000..e5e97c1 Binary files /dev/null and b/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png differ diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png new file mode 100644 index 0000000..2e0c546 Binary files /dev/null and b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png differ diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png new file mode 100644 index 0000000..dcb2789 Binary files /dev/null and b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png differ diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png new file mode 100644 index 0000000..13493f9 Binary files /dev/null and b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png differ diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png new file mode 100644 index 0000000..4183d4b Binary files /dev/null and b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png differ diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png new file mode 100644 index 0000000..35bd22d Binary files /dev/null and b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png differ diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png new file mode 100644 index 0000000..3fc7bd0 Binary files /dev/null and b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png differ diff --git a/src/main/resources/base/toolbar/Piping/Inflow Line.png b/src/main/resources/base/toolbar/Piping/Inflow Line.png index 7e5356d..123a2b0 100644 Binary files a/src/main/resources/base/toolbar/Piping/Inflow Line.png and b/src/main/resources/base/toolbar/Piping/Inflow Line.png differ diff --git a/src/main/resources/base/toolbar/Piping/Outflow Line.png b/src/main/resources/base/toolbar/Piping/Outflow Line.png index 84d1645..0e1d2ee 100644 Binary files a/src/main/resources/base/toolbar/Piping/Outflow Line.png and b/src/main/resources/base/toolbar/Piping/Outflow Line.png differ diff --git a/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png b/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png new file mode 100644 index 0000000..e0ea727 Binary files /dev/null and b/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png differ diff --git a/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png b/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png new file mode 100644 index 0000000..78e32a9 Binary files /dev/null and b/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png differ diff --git a/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png b/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png new file mode 100644 index 0000000..1cb1119 Binary files /dev/null and b/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png differ diff --git a/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png b/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png new file mode 100644 index 0000000..25b7539 Binary files /dev/null and b/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png differ diff --git a/src/main/resources/base/toolbar/Pumps/Blowing Egg.png b/src/main/resources/base/toolbar/Pumps/Blowing Egg.png index 87118a4..25d0ad3 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Blowing Egg.png and b/src/main/resources/base/toolbar/Pumps/Blowing Egg.png differ diff --git a/src/main/resources/base/toolbar/Pumps/Duplex Pump.png b/src/main/resources/base/toolbar/Pumps/Duplex Pump.png index b2ee84b..7b230aa 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Duplex Pump.png and b/src/main/resources/base/toolbar/Pumps/Duplex Pump.png differ diff --git a/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png b/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png index e317698..bc9b9fb 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png and b/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png differ diff --git a/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png b/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png index a183826..11a84c6 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png and b/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png differ diff --git a/src/main/resources/base/toolbar/Pumps/Plunger Pump.png b/src/main/resources/base/toolbar/Pumps/Plunger Pump.png index c6dc484..5112bca 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Plunger Pump.png and b/src/main/resources/base/toolbar/Pumps/Plunger Pump.png differ diff --git a/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png b/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png index c00c923..f027301 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png and b/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png differ diff --git a/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png b/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png index de8155e..f6e4507 100644 Binary files a/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png and b/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png differ diff --git a/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png b/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png new file mode 100644 index 0000000..927aa93 Binary files /dev/null and b/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png differ diff --git a/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png b/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png new file mode 100644 index 0000000..85b832f Binary files /dev/null and b/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png differ diff --git a/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png b/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png new file mode 100644 index 0000000..d38fa0c Binary files /dev/null and b/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png differ diff --git a/src/main/resources/base/toolbar/Valves/Gate Valve.png b/src/main/resources/base/toolbar/Valves/Gate Valve.png new file mode 100644 index 0000000..74a65ed Binary files /dev/null and b/src/main/resources/base/toolbar/Valves/Gate Valve.png differ diff --git a/src/main/resources/base/toolbar/Valves/Globe Valve.png b/src/main/resources/base/toolbar/Valves/Globe Valve.png new file mode 100644 index 0000000..887608a Binary files /dev/null and b/src/main/resources/base/toolbar/Valves/Globe Valve.png differ -- cgit