SchematicDrawing : Diverter painted correctly, closed-wet images added.

This commit is contained in:
Milan Hanajik 2021-03-29 11:10:52 +02:00
parent baf7f84343
commit eb142244e4
4 changed files with 382 additions and 243 deletions

View File

@ -25,6 +25,7 @@ namespace SchematicDrawing
public readonly Node[] Nodes; /// Nodes of this shape
public readonly Edge[] Edges; /// Edges (in the open state in case there are two states: open/closed)
/// open (route bit = 1), wet
public readonly bool HasImg; /// True when there is an image of this item to be displayed
public readonly Image ImgRight; /// Bitmap to be drawn (in the open state in case there are two states: open/closed)
public readonly Image ImgUp;
@ -35,15 +36,38 @@ namespace SchematicDrawing
public readonly Image ImgLeftFlipped;
public readonly Image ImgDownFlipped;
public readonly bool HasClosed; /// true = This shape can be displayed in a closed state
public readonly Image ImgRightClosed; /// Optional bitmap in the closed state, size should be the same as the size of Bmp
public readonly Image ImgUpClosed;
public readonly Image ImgLeftClosed;
public readonly Image ImgDownClosed;
public readonly Image ImgRightFlippedClosed;
public readonly Image ImgUpFlippedClosed;
public readonly Image ImgLeftFlippedClosed;
public readonly Image ImgDownFlippedClosed;
/// open (route bit = 1), dry
public readonly bool HasOpenDry; /// true = this shape can be displayed as dry in an open state
public readonly Image ImgRightOpenDry; /// Optional bitmap in the closed state, size should be the same as the size of Bmp
public readonly Image ImgUpOpenDry;
public readonly Image ImgLeftOpenDry;
public readonly Image ImgDownOpenDry;
public readonly Image ImgRightFlippedOpenDry;
public readonly Image ImgUpFlippedOpenDry;
public readonly Image ImgLeftFlippedOpenDry;
public readonly Image ImgDownFlippedOpenDry;
/// closed (route bit = 0), wet
public readonly bool HasClosedWet; /// true = This shape can be displayed as wet in a closed state
public readonly Image ImgRightClosedWet; /// Optional bitmap in the closed state, size should be the same as the size of Bmp
public readonly Image ImgUpClosedWet;
public readonly Image ImgLeftClosedWet;
public readonly Image ImgDownClosedWet;
public readonly Image ImgRightFlippedClosedWet;
public readonly Image ImgUpFlippedClosedWet;
public readonly Image ImgLeftFlippedClosedWet;
public readonly Image ImgDownFlippedClosedWet;
/// closed (route bit = 0), dry
public readonly bool HasClosedDry; /// true = This shape can be displayed as dry in a closed state
public readonly Image ImgRightClosedDry; /// Optional bitmap in the closed state, size should be the same as the size of Bmp
public readonly Image ImgUpClosedDry;
public readonly Image ImgLeftClosedDry;
public readonly Image ImgDownClosedDry;
public readonly Image ImgRightFlippedClosedDry;
public readonly Image ImgUpFlippedClosedDry;
public readonly Image ImgLeftFlippedClosedDry;
public readonly Image ImgDownFlippedClosedDry;
public readonly bool HasVacuum; /// true = This shape can display vacuum
public readonly Image ImgRightVacuum; /// Optional bitmap in the closed state, size should be the same as the size of Bmp
@ -55,20 +79,14 @@ namespace SchematicDrawing
public readonly Image ImgLeftFlippedVacuum;
public readonly Image ImgDownFlippedVacuum;
public readonly bool HasOpenDry; /// true = this shape can be displayed as dry in an open state
public readonly Image ImgRightOpenDry; /// Optional bitmap in the closed state, size should be the same as the size of Bmp
public readonly Image ImgUpOpenDry;
public readonly Image ImgLeftOpenDry;
public readonly Image ImgDownOpenDry;
public readonly Image ImgRightFlippedOpenDry;
public readonly Image ImgUpFlippedOpenDry;
public readonly Image ImgLeftFlippedOpenDry;
public readonly Image ImgDownFlippedOpenDry;
DrawingShape(Shape shape, Sz sz, int szX, int szY, Node[] nodes = null, Edge[] edges = null,
int offsX = -10, int offsY = -10, int wid = 20, int hgh = 20,
Bitmap bmp = null, Bitmap bmpClosed = null, Bitmap bmpVacuum = null, Bitmap bmpOpenDry = null)
Bitmap bmp = null, /// wet, open (route bit = 1)
Bitmap bmpClosedDry = null, /// dry (Dist == int.MaxValue), closed (route bit = 0)
Bitmap bmpVacuum = null, /// vacuum (int.MaxValue > Dist && Dist > Const.Vacuum)
Bitmap bmpOpenDry = null, /// dry (Dist == int.MaxValue), open (route bit = 1)
Bitmap bmpClosedWet = null) /// wet, closed (route bit = 0) ... diverter only
{
Shape = shape;
Sz = sz;
@ -103,27 +121,27 @@ namespace SchematicDrawing
bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmp.RotateFlip(RotateFlipType.RotateNoneFlipY);
}
HasClosed = (bmpClosed != null);
if (HasClosed)
HasClosedDry = (bmpClosedDry != null);
if (HasClosedDry)
{
ImgRightClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgDownClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgLeftClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgUpClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpClosed.RotateFlip(RotateFlipType.RotateNoneFlipY);
ImgRightFlippedClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgDownFlippedClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgLeftFlippedClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgUpFlippedClosed = bmpClosed.Clone() as Image;
bmpClosed.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpClosed.RotateFlip(RotateFlipType.RotateNoneFlipY);
ImgRightClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgDownClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgLeftClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgUpClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpClosedDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
ImgRightFlippedClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgDownFlippedClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgLeftFlippedClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgUpFlippedClosedDry = bmpClosedDry.Clone() as Image;
bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpClosedDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
}
HasVacuum = (bmpVacuum != null);
if (HasVacuum)
@ -169,6 +187,28 @@ namespace SchematicDrawing
bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpOpenDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
}
HasClosedWet = (bmpClosedWet != null);
if (HasClosedWet)
{
ImgRightClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgDownClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgLeftClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgUpClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpClosedWet.RotateFlip(RotateFlipType.RotateNoneFlipY);
ImgRightFlippedClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgDownFlippedClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgLeftFlippedClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
ImgUpFlippedClosedWet = bmpClosedWet.Clone() as Image;
bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
bmpClosedWet.RotateFlip(RotateFlipType.RotateNoneFlipY);
}
}
public Rectangle GetRotatedFlippedImageRectangle(IDrawingItem item)
@ -282,126 +322,169 @@ namespace SchematicDrawing
new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1), new Edge(1, 0, 20, RouteCouple.OpenWhen1) },
0, 0, 20, 20,
Properties.Resources.Valve_S_open, Properties.Resources.Valve_S_closed,
Properties.Resources.Valve_S_vacuum, Properties.Resources.Valve_S_open_dry);
Properties.Resources.Valve_S_open,
Properties.Resources.Valve_S_closed,
Properties.Resources.Valve_S_vacuum,
Properties.Resources.Valve_S_open_dry);
Shapes[DrShIx(Shape.Valve, Sz.M)] = new DrawingShape(Shape.Valve, Sz.M, 3, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1), new Edge(1, 0, 30, RouteCouple.OpenWhen1) },
0, 5, 30, 30,
Properties.Resources.Valve_M_open, Properties.Resources.Valve_M_closed,
Properties.Resources.Valve_M_vacuum, Properties.Resources.Valve_M_open_dry);
Properties.Resources.Valve_M_open,
Properties.Resources.Valve_M_closed,
Properties.Resources.Valve_M_vacuum,
Properties.Resources.Valve_M_open_dry);
Shapes[DrShIx(Shape.Valve, Sz.L)] = new DrawingShape(Shape.Valve, Sz.L, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1), new Edge(1, 0, 40, RouteCouple.OpenWhen1) },
0, 0, 40, 40,
Properties.Resources.Valve_L_open, Properties.Resources.Valve_L_closed,
Properties.Resources.Valve_L_vacuum, Properties.Resources.Valve_L_open_dry);
Properties.Resources.Valve_L_open,
Properties.Resources.Valve_L_closed,
Properties.Resources.Valve_L_vacuum,
Properties.Resources.Valve_L_open_dry);
Shapes[DrShIx(Shape.Valve, Sz.XL)] = new DrawingShape(Shape.Valve, Sz.XL, 5, 6,
new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1), new Edge(1, 0, 50, RouteCouple.OpenWhen1) },
0, 5, 50, 50,
Properties.Resources.Valve_XL_open, Properties.Resources.Valve_XL_closed,
Properties.Resources.Valve_XL_vacuum, Properties.Resources.Valve_XL_open_dry);
Properties.Resources.Valve_XL_open,
Properties.Resources.Valve_XL_closed,
Properties.Resources.Valve_XL_vacuum,
Properties.Resources.Valve_XL_open_dry);
/// Diverter
Shapes[DrShIx(Shape.Div, Sz.S)] = new DrawingShape(Shape.Div, Sz.S, 2, 2,
new Node[] { new Node(2, 0, Orient.Up), new Node(1, 2, Orient.Dn), new Node(3, 2, Orient.Dn) },
new Edge[] { new Edge(0, 1, 20), new Edge(0, 2, 20, RouteCouple.OpenWhen1) },
0, 0, 40, 20,
Properties.Resources.Div_S_tank_wet, Properties.Resources.Div_S_sink_wet,
Properties.Resources.Div_S_tank_dry, Properties.Resources.Div_S_sink_dry);
Properties.Resources.Div_S_tank_wet,
Properties.Resources.Div_S_sink_dry,
null,
Properties.Resources.Div_S_tank_dry,
Properties.Resources.Div_S_sink_wet);
Shapes[DrShIx(Shape.Div, Sz.M)] = new DrawingShape(Shape.Div, Sz.M, 3, 4,
new Node[] { new Node(2, 0, Orient.Up), new Node(1, 3, Orient.Dn), new Node(3, 3, Orient.Dn) },
new Edge[] { new Edge(0, 1, 30), new Edge(0, 2, 30, RouteCouple.OpenWhen1) },
0, 0, 40, 30,
Properties.Resources.Div_M_tank_wet, Properties.Resources.Div_M_sink_wet,
Properties.Resources.Div_M_tank_dry, Properties.Resources.Div_M_sink_dry);
Properties.Resources.Div_M_tank_wet,
Properties.Resources.Div_M_sink_dry,
null,
Properties.Resources.Div_M_tank_dry,
Properties.Resources.Div_M_sink_wet);
Shapes[DrShIx(Shape.Div, Sz.L)] = new DrawingShape(Shape.Div, Sz.L, 4, 4,
new Node[] { new Node(3, 0, Orient.Up), new Node(1, 4, Orient.Dn), new Node(5, 4, Orient.Dn) },
new Edge[] { new Edge(0, 1, 40), new Edge(0, 2, 40, RouteCouple.OpenWhen1) },
0, 0, 60, 40,
Properties.Resources.Div_L_tank_wet, Properties.Resources.Div_L_sink_wet,
Properties.Resources.Div_L_tank_dry, Properties.Resources.Div_L_sink_dry);
Properties.Resources.Div_L_tank_wet,
Properties.Resources.Div_L_sink_dry,
null,
Properties.Resources.Div_L_tank_dry,
Properties.Resources.Div_L_sink_wet);
Shapes[DrShIx(Shape.Div, Sz.XL)] = new DrawingShape(Shape.Div, Sz.XL, 5, 6,
new Node[] { new Node(3, 0, Orient.Up), new Node(1, 5, Orient.Dn), new Node(5, 5, Orient.Dn) },
new Edge[] { new Edge(0, 1, 50), new Edge(0, 2, 50, RouteCouple.OpenWhen1) },
0, 0, 60, 50,
Properties.Resources.Div_XL_tank_wet, Properties.Resources.Div_XL_sink_wet,
Properties.Resources.Div_XL_tank_dry, Properties.Resources.Div_XL_sink_dry);
Properties.Resources.Div_XL_tank_wet,
Properties.Resources.Div_XL_sink_dry,
null,
Properties.Resources.Div_XL_tank_dry,
Properties.Resources.Div_XL_sink_wet);
/// Regulation valve
Shapes[DrShIx(Shape.RegV, Sz.S)] = new DrawingShape(Shape.RegV, Sz.S, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
new Edge[] { new Edge(0, 1, 20), new Edge(1, 0, 20) },
0, 0, 20, 20, Properties.Resources.RegV_S);
0, 0, 20, 20,
Properties.Resources.RegV_S);
Shapes[DrShIx(Shape.RegV, Sz.M)] = new DrawingShape(Shape.RegV, Sz.M, 3, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 30), new Edge(1, 0, 30) },
0, 5, 30, 30, Properties.Resources.RegV_M);
0, 5, 30, 30,
Properties.Resources.RegV_M);
Shapes[DrShIx(Shape.RegV, Sz.L)] = new DrawingShape(Shape.RegV, Sz.L, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 40), new Edge(1, 0, 40) },
0, 0, 40, 40, Properties.Resources.RegV_L);
0, 0, 40, 40,
Properties.Resources.RegV_L);
Shapes[DrShIx(Shape.RegV, Sz.XL)] = new DrawingShape(Shape.RegV, Sz.XL, 5, 6,
new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
new Edge[] { new Edge(0, 1, 50), new Edge(1, 0, 50) },
0, 5, 50, 50, Properties.Resources.RegV_XL);
0, 5, 50, 50,
Properties.Resources.RegV_XL);
/// Pump
Shapes[DrShIx(Shape.Pump, Sz.S)] = new DrawingShape(Shape.Pump, Sz.S, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1) },
0, 0, 20, 20, Properties.Resources.Pump_S_open, Properties.Resources.Pump_S_closed);
0, 0, 20, 20,
Properties.Resources.Pump_S_open,
Properties.Resources.Pump_S_closed);
Shapes[DrShIx(Shape.Pump, Sz.M)] = new DrawingShape(Shape.Pump, Sz.M, 3, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1) },
0, 5, 30, 30, Properties.Resources.Pump_M_open, Properties.Resources.Pump_M_closed);
0, 5, 30, 30,
Properties.Resources.Pump_M_open,
Properties.Resources.Pump_M_closed);
Shapes[DrShIx(Shape.Pump, Sz.L)] = new DrawingShape(Shape.Pump, Sz.L, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1) },
0, 0, 40, 40, Properties.Resources.Pump_L_open, Properties.Resources.Pump_L_closed);
0, 0, 40, 40,
Properties.Resources.Pump_L_open,
Properties.Resources.Pump_L_closed);
Shapes[DrShIx(Shape.Pump, Sz.XL)] = new DrawingShape(Shape.Pump, Sz.XL, 5, 6,
new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1) },
0, 5, 50, 50, Properties.Resources.Pump_XL_open, Properties.Resources.Pump_XL_closed);
0, 5, 50, 50,
Properties.Resources.Pump_XL_open,
Properties.Resources.Pump_XL_closed);
/// Pump with frequency inverter
Shapes[DrShIx(Shape.PumpFM, Sz.S)] = new DrawingShape(Shape.PumpFM, Sz.S, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1) },
0, 0, 20, 20, Properties.Resources.Pump_S_open, Properties.Resources.Pump_S_closed);
0, 0, 20, 20,
Properties.Resources.Pump_S_open,
Properties.Resources.Pump_S_closed);
Shapes[DrShIx(Shape.PumpFM, Sz.M)] = new DrawingShape(Shape.PumpFM, Sz.M, 3, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1) },
0, 5, 30, 30, Properties.Resources.Pump_M_open, Properties.Resources.Pump_M_closed);
0, 5, 30, 30,
Properties.Resources.Pump_M_open,
Properties.Resources.Pump_M_closed);
Shapes[DrShIx(Shape.PumpFM, Sz.L)] = new DrawingShape(Shape.PumpFM, Sz.L, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1) },
0, 0, 40, 40, Properties.Resources.Pump_L_open, Properties.Resources.Pump_L_closed);
0, 0, 40, 40,
Properties.Resources.Pump_L_open,
Properties.Resources.Pump_L_closed);
Shapes[DrShIx(Shape.PumpFM, Sz.XL)] = new DrawingShape(Shape.PumpFM, Sz.XL, 5, 6,
new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1) },
0, 5, 50, 50, Properties.Resources.Pump_XL_open, Properties.Resources.Pump_XL_closed);
0, 5, 50, 50,
Properties.Resources.Pump_XL_open,
Properties.Resources.Pump_XL_closed);
/// Flow meter
Shapes[DrShIx(Shape.FlowM, Sz.S)] = new DrawingShape(Shape.FlowM, Sz.S, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) }, new Edge[] { new Edge(0, 1, 20) },
0, 0, 20, 20, Properties.Resources.FlowM_S);
new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
new Edge[] { new Edge(0, 1, 20) },
0, 0, 20, 20,
Properties.Resources.FlowM_S);
Shapes[DrShIx(Shape.FlowM, Sz.M)] = new DrawingShape(Shape.FlowM, Sz.M, 3, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) }, new Edge[] { new Edge(0, 1, 30) },
0, 5, 30, 30, Properties.Resources.FlowM_M);
new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 30) },
0, 5, 30, 30,
Properties.Resources.FlowM_M);
Shapes[DrShIx(Shape.FlowM, Sz.L)] = new DrawingShape(Shape.FlowM, Sz.L, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) }, new Edge[] { new Edge(0, 1, 40) },
0, 0, 40, 40, Properties.Resources.FlowM_L);
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 40) },
0, 0, 40, 40,
Properties.Resources.FlowM_L);
Shapes[DrShIx(Shape.FlowM, Sz.XL)] = new DrawingShape(Shape.FlowM, Sz.XL, 5, 6,
new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) }, new Edge[] { new Edge(0, 1, 50) },
0, 5, 50, 50, Properties.Resources.FlowM_XL);
new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
new Edge[] { new Edge(0, 1, 50) },
0, 5, 50, 50,
Properties.Resources.FlowM_XL);
/// Water meter
Shapes[DrShIx(Shape.WaterM, Sz.L)] = new DrawingShape(Shape.WaterM, Sz.L, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
new Edge[] { new Edge(0, 1, 40), new Edge(1, 0, 40) },
0, 0, 40, 40, Properties.Resources.WaterM_L);
0, 0, 40, 40,
Properties.Resources.WaterM_L);
Shapes[DrShIx(Shape.WaterM, Sz.S)] = Shapes[DrShIx(Shape.WaterM, Sz.L)];
Shapes[DrShIx(Shape.WaterM, Sz.M)] = Shapes[DrShIx(Shape.WaterM, Sz.L)];
Shapes[DrShIx(Shape.WaterM, Sz.XL)] = Shapes[DrShIx(Shape.WaterM, Sz.L)];
@ -420,38 +503,66 @@ namespace SchematicDrawing
/// Junction
Shapes[DrShIx(Shape.Junction, Sz.None)] = new DrawingShape(Shape.Junction, Sz.None, 0, 0, new Node[] { new Node(0, 0, Orient.R) });
Shapes[DrShIx(Shape.Junction, Sz.S)] = new DrawingShape(Shape.Junction, Sz.S, 2, 2, new Node[] { new Node(1, 1, Orient.R) }, null, 0, 0, 20, 20,
Properties.Resources.Junction_S, null, Properties.Resources.Junction_S_vacuum, Properties.Resources.Junction_S_closed);
Shapes[DrShIx(Shape.Junction, Sz.M)] = new DrawingShape(Shape.Junction, Sz.M, 2, 2, new Node[] { new Node(1, 1, Orient.R) }, null, 0, 0, 20, 20,
Properties.Resources.Junction_M, null, Properties.Resources.Junction_M_vacuum, Properties.Resources.Junction_M_closed);
Shapes[DrShIx(Shape.Junction, Sz.L)] = new DrawingShape(Shape.Junction, Sz.L, 2, 2, new Node[] { new Node(1, 1, Orient.R) }, null, 0, 0, 20, 20,
Properties.Resources.Junction_L, null, Properties.Resources.Junction_L_vacuum, Properties.Resources.Junction_L_closed);
Shapes[DrShIx(Shape.Junction, Sz.XL)] = new DrawingShape(Shape.Junction, Sz.XL, 2, 2, new Node[] { new Node(1, 1, Orient.R) }, null, 0, 0, 20, 20,
Properties.Resources.Junction_XL, null, Properties.Resources.Junction_XL_vacuum, Properties.Resources.Junction_XL_closed);
Shapes[DrShIx(Shape.Junction, Sz.S)] = new DrawingShape(Shape.Junction, Sz.S, 2, 2,
new Node[] { new Node(1, 1, Orient.R) }, null,
0, 0, 20, 20,
Properties.Resources.Junction_S_wet,
Properties.Resources.Junction_S_dry,
Properties.Resources.Junction_S_vacuum);
Shapes[DrShIx(Shape.Junction, Sz.M)] = new DrawingShape(Shape.Junction, Sz.M, 2, 2,
new Node[] { new Node(1, 1, Orient.R) }, null,
0, 0, 20, 20,
Properties.Resources.Junction_M_wet,
Properties.Resources.Junction_M_dry,
Properties.Resources.Junction_M_vacuum);
Shapes[DrShIx(Shape.Junction, Sz.L)] = new DrawingShape(Shape.Junction, Sz.L, 2, 2,
new Node[] { new Node(1, 1, Orient.R) }, null,
0, 0, 20, 20,
Properties.Resources.Junction_L_wet,
Properties.Resources.Junction_L_dry,
Properties.Resources.Junction_L_vacuum);
Shapes[DrShIx(Shape.Junction, Sz.XL)] = new DrawingShape(Shape.Junction, Sz.XL, 2, 2,
new Node[] { new Node(1, 1, Orient.R) }, null,
0, 0, 20, 20,
Properties.Resources.Junction_XL_wet,
Properties.Resources.Junction_XL_dry,
Properties.Resources.Junction_XL_vacuum);
/// Knee
Shapes[DrShIx(Shape.Knee, Sz.S)] = new DrawingShape(Shape.Knee, Sz.S, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(1, 0, Orient.Up) },
new Edge[] { new Edge(0, 1, 18), new Edge(1, 0, 18) },
0, 0, 20, 20, Properties.Resources.Knee_S_open, null, Properties.Resources.Knee_S_vacuum, Properties.Resources.Knee_S_closed);
0, 0, 20, 20,
Properties.Resources.Knee_S_wet,
Properties.Resources.Knee_S_dry,
Properties.Resources.Knee_S_vacuum);
Shapes[DrShIx(Shape.Knee, Sz.M)] = new DrawingShape(Shape.Knee, Sz.M, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(1, 0, Orient.Up) },
new Edge[] { new Edge(0, 1, 18), new Edge(1, 0, 18) },
0, 0, 20, 20, Properties.Resources.Knee_M_open, null, Properties.Resources.Knee_M_vacuum, Properties.Resources.Knee_M_closed);
0, 0, 20, 20,
Properties.Resources.Knee_M_wet,
Properties.Resources.Knee_M_dry,
Properties.Resources.Knee_M_vacuum);
Shapes[DrShIx(Shape.Knee, Sz.L)] = new DrawingShape(Shape.Knee, Sz.L, 2, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(1, 0, Orient.Up) },
new Edge[] { new Edge(0, 1, 17), new Edge(1, 0, 17) },
0, 0, 20, 20, Properties.Resources.Knee_L_open, null, Properties.Resources.Knee_L_vacuum, Properties.Resources.Knee_L_closed);
0, 0, 20, 20,
Properties.Resources.Knee_L_wet,
Properties.Resources.Knee_L_dry,
Properties.Resources.Knee_L_vacuum);
Shapes[DrShIx(Shape.Knee, Sz.XL)] = new DrawingShape(Shape.Knee, Sz.XL, 4, 4,
new Node[] { new Node(0, 2, Orient.L), new Node(2, 0, Orient.Up) },
new Edge[] { new Edge(0, 1, 36), new Edge(1, 0, 36) },
0, 0, 40, 40, Properties.Resources.Knee_XL_open, null, Properties.Resources.Knee_XL_vacuum, Properties.Resources.Knee_XL_closed);
0, 0, 40, 40,
Properties.Resources.Knee_XL_wet,
Properties.Resources.Knee_XL_dry,
Properties.Resources.Knee_XL_vacuum);
/// Vacuum
Shapes[DrShIx(Shape.Vacuum, Sz.L)] = new DrawingShape(Shape.Vacuum, Sz.L, 6, 2,
new Node[] { new Node(0, 1, Orient.L), new Node(6, 1, Orient.R), new Node(4, 0, Orient.Up) },
new Edge[] { new Edge(0, 1, 60), new Edge(1, 0, 60), new Edge(0, 2, Const.Vacuum) },
0, 0, 60, 20, Properties.Resources.Vacuum_L_wet, null, null, Properties.Resources.Vacuum_L_dry);
0, 0, 60, 20,
Properties.Resources.Vacuum_L_wet,
Properties.Resources.Vacuum_L_dry);
Shapes[DrShIx(Shape.Vacuum, Sz.S)] = Shapes[DrShIx(Shape.Vacuum, Sz.L)];
Shapes[DrShIx(Shape.Vacuum, Sz.M)] = Shapes[DrShIx(Shape.Vacuum, Sz.L)];
Shapes[DrShIx(Shape.Vacuum, Sz.XL)] = Shapes[DrShIx(Shape.Vacuum, Sz.L)];
@ -459,9 +570,7 @@ namespace SchematicDrawing
/// Control board UNI
Shapes[DrShIx(Shape.UniCB, Sz.L)] = new DrawingShape(Shape.UniCB, Sz.L, 2, 2, new Node[] { }, null, 0, 0, 20, 20,
Properties.Resources.UniCB_M_error,
Properties.Resources.UniCB_M_on,
Properties.Resources.UniCB_M_off,
Properties.Resources.UniCB_M_off);
Properties.Resources.UniCB_M_on);
Shapes[DrShIx(Shape.UniCB, Sz.S)] = Shapes[DrShIx(Shape.UniCB, Sz.L)];
Shapes[DrShIx(Shape.UniCB, Sz.M)] = Shapes[DrShIx(Shape.UniCB, Sz.L)];
Shapes[DrShIx(Shape.UniCB, Sz.XL)] = Shapes[DrShIx(Shape.UniCB, Sz.L)];

View File

@ -60,46 +60,6 @@ namespace SchematicDrawing.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_XL_sink_dry {
get {
object obj = ResourceManager.GetObject("Div_XL_sink_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_XL_tank_dry {
get {
object obj = ResourceManager.GetObject("Div_XL_tank_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_XL_sink_wet {
get {
object obj = ResourceManager.GetObject("Div_XL_sink_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_XL_tank_wet {
get {
object obj = ResourceManager.GetObject("Div_XL_tank_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -113,9 +73,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_L_tank_dry {
internal static System.Drawing.Bitmap Div_L_sink_wet {
get {
object obj = ResourceManager.GetObject("Div_L_tank_dry", resourceCulture);
object obj = ResourceManager.GetObject("Div_L_sink_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -123,9 +83,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_L_sink_wet {
internal static System.Drawing.Bitmap Div_L_tank_dry {
get {
object obj = ResourceManager.GetObject("Div_L_sink_wet", resourceCulture);
object obj = ResourceManager.GetObject("Div_L_tank_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -153,9 +113,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_M_tank_dry {
internal static System.Drawing.Bitmap Div_M_sink_wet {
get {
object obj = ResourceManager.GetObject("Div_M_tank_dry", resourceCulture);
object obj = ResourceManager.GetObject("Div_M_sink_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -163,9 +123,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_M_sink_wet {
internal static System.Drawing.Bitmap Div_M_tank_dry {
get {
object obj = ResourceManager.GetObject("Div_M_sink_wet", resourceCulture);
object obj = ResourceManager.GetObject("Div_M_tank_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -193,9 +153,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_S_tank_dry {
internal static System.Drawing.Bitmap Div_S_sink_wet {
get {
object obj = ResourceManager.GetObject("Div_S_tank_dry", resourceCulture);
object obj = ResourceManager.GetObject("Div_S_sink_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -203,9 +163,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_S_sink_wet {
internal static System.Drawing.Bitmap Div_S_tank_dry {
get {
object obj = ResourceManager.GetObject("Div_S_sink_wet", resourceCulture);
object obj = ResourceManager.GetObject("Div_S_tank_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -223,9 +183,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UniCB_M_error {
internal static System.Drawing.Bitmap Div_XL_sink_dry {
get {
object obj = ResourceManager.GetObject("UniCB_M_error", resourceCulture);
object obj = ResourceManager.GetObject("Div_XL_sink_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -233,9 +193,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UniCB_M_on {
internal static System.Drawing.Bitmap Div_XL_sink_wet {
get {
object obj = ResourceManager.GetObject("UniCB_M_on", resourceCulture);
object obj = ResourceManager.GetObject("Div_XL_sink_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -243,9 +203,19 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UniCB_M_off {
internal static System.Drawing.Bitmap Div_XL_tank_dry {
get {
object obj = ResourceManager.GetObject("UniCB_M_off", resourceCulture);
object obj = ResourceManager.GetObject("Div_XL_tank_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Div_XL_tank_wet {
get {
object obj = ResourceManager.GetObject("Div_XL_tank_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -293,19 +263,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_L {
internal static System.Drawing.Bitmap Junction_L_dry {
get {
object obj = ResourceManager.GetObject("Junction_L", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_L_closed {
get {
object obj = ResourceManager.GetObject("Junction_L_closed", resourceCulture);
object obj = ResourceManager.GetObject("Junction_L_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -323,9 +283,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_M {
internal static System.Drawing.Bitmap Junction_L_wet {
get {
object obj = ResourceManager.GetObject("Junction_M", resourceCulture);
object obj = ResourceManager.GetObject("Junction_L_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -333,9 +293,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_M_closed {
internal static System.Drawing.Bitmap Junction_M_dry {
get {
object obj = ResourceManager.GetObject("Junction_M_closed", resourceCulture);
object obj = ResourceManager.GetObject("Junction_M_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -353,9 +313,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_S {
internal static System.Drawing.Bitmap Junction_M_wet {
get {
object obj = ResourceManager.GetObject("Junction_S", resourceCulture);
object obj = ResourceManager.GetObject("Junction_M_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -363,9 +323,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_S_closed {
internal static System.Drawing.Bitmap Junction_S_dry {
get {
object obj = ResourceManager.GetObject("Junction_S_closed", resourceCulture);
object obj = ResourceManager.GetObject("Junction_S_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -383,9 +343,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_XL {
internal static System.Drawing.Bitmap Junction_S_wet {
get {
object obj = ResourceManager.GetObject("Junction_XL", resourceCulture);
object obj = ResourceManager.GetObject("Junction_S_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -393,9 +353,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Junction_XL_closed {
internal static System.Drawing.Bitmap Junction_XL_dry {
get {
object obj = ResourceManager.GetObject("Junction_XL_closed", resourceCulture);
object obj = ResourceManager.GetObject("Junction_XL_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -413,9 +373,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_L_closed {
internal static System.Drawing.Bitmap Junction_XL_wet {
get {
object obj = ResourceManager.GetObject("Knee_L_closed", resourceCulture);
object obj = ResourceManager.GetObject("Junction_XL_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -423,9 +383,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_L_open {
internal static System.Drawing.Bitmap Knee_L_dry {
get {
object obj = ResourceManager.GetObject("Knee_L_open", resourceCulture);
object obj = ResourceManager.GetObject("Knee_L_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -443,9 +403,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_M_closed {
internal static System.Drawing.Bitmap Knee_L_wet {
get {
object obj = ResourceManager.GetObject("Knee_M_closed", resourceCulture);
object obj = ResourceManager.GetObject("Knee_L_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -453,9 +413,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_M_open {
internal static System.Drawing.Bitmap Knee_M_dry {
get {
object obj = ResourceManager.GetObject("Knee_M_open", resourceCulture);
object obj = ResourceManager.GetObject("Knee_M_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -473,9 +433,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_S_closed {
internal static System.Drawing.Bitmap Knee_M_wet {
get {
object obj = ResourceManager.GetObject("Knee_S_closed", resourceCulture);
object obj = ResourceManager.GetObject("Knee_M_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -483,9 +443,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_S_open {
internal static System.Drawing.Bitmap Knee_S_dry {
get {
object obj = ResourceManager.GetObject("Knee_S_open", resourceCulture);
object obj = ResourceManager.GetObject("Knee_S_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -503,9 +463,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_XL_closed {
internal static System.Drawing.Bitmap Knee_S_wet {
get {
object obj = ResourceManager.GetObject("Knee_XL_closed", resourceCulture);
object obj = ResourceManager.GetObject("Knee_S_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -513,9 +473,9 @@ namespace SchematicDrawing.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_XL_open {
internal static System.Drawing.Bitmap Knee_XL_dry {
get {
object obj = ResourceManager.GetObject("Knee_XL_open", resourceCulture);
object obj = ResourceManager.GetObject("Knee_XL_dry", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -530,6 +490,16 @@ namespace SchematicDrawing.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Knee_XL_wet {
get {
object obj = ResourceManager.GetObject("Knee_XL_wet", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -730,6 +700,36 @@ namespace SchematicDrawing.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UniCB_M_error {
get {
object obj = ResourceManager.GetObject("UniCB_M_error", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UniCB_M_off {
get {
object obj = ResourceManager.GetObject("UniCB_M_off", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UniCB_M_on {
get {
object obj = ResourceManager.GetObject("UniCB_M_on", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View File

@ -187,73 +187,73 @@
<data name="FlowM_XL" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\FlowM-XL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_L_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_L_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_L_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-L-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_L_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-L-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_M" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_M_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-M.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_M_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_M_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-M-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_M_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-M-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_S" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_S_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-S.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_S_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_S_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-S-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_S_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-S-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_XL" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_XL_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-XL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_XL_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Junction_XL_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-XL-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Junction_XL_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Junction-XL-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_L_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_L_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-L-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_L_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_L_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-L-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_L_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-L-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_M_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_M_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-M-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_M_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_M_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-M-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_M_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-M-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_S_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_S_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-S-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_S_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_S_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-S-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_S_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-S-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_XL_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_XL_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-XL-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_XL_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Knee_XL_wet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Pictures\Knee-XL-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Knee_XL_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">

View File

@ -819,7 +819,7 @@ namespace SchematicDrawing
/// Joints between straight parts of the line and the bow
DrawingShape dsh = DrawingShape.GetDrawingShape(Shape.Junction, p.Sz);
Image image = (distance == int.MaxValue) ? dsh.ImgRightOpenDry : (distance < Const.Vacuum) ? dsh.ImgRight : dsh.ImgRightVacuum;
Image image = (distance == int.MaxValue) ? dsh.ImgRightClosedDry : (distance < Const.Vacuum) ? dsh.ImgRight : dsh.ImgRightVacuum;
e.Graphics.DrawImage(image, x3 - dsh.Wid / 2, y3 - dsh.Hgh / 2);
e.Graphics.DrawImage(image, x5 - dsh.Wid / 2, y5 - dsh.Hgh / 2);
@ -851,72 +851,102 @@ namespace SchematicDrawing
/// Draw the component image
Rectangle rect = dsh.GetRotatedFlippedImageRectangle(item);
if (dsh.HasClosed && item is IRouteBasedDrawingItem && routeBit == false)
if (item is IRouteBasedDrawingItem && routeBit == false /// closed
&& item.GNodes.Count > 0 && item.GNodes[0].Dist < Const.Vacuum /// wet
&& dsh.HasClosedWet) /// has appropriate image
{
if (item.Flip)
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedClosed, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedClosed, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedClosed, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedClosed, rect.X, rect.Y); break;
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedClosedWet, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedClosedWet, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedClosedWet, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedClosedWet, rect.X, rect.Y); break;
}
}
else
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightClosed, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpClosed, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftClosed, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownClosed, rect.X, rect.Y); break;
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightClosedWet, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpClosedWet, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftClosedWet, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownClosedWet, rect.X, rect.Y); break;
}
}
}
else if (dsh.HasOpenDry && item.GNodes.Count > 0 && item.GNodes[0].Dist == int.MaxValue)
else if (item is IRouteBasedDrawingItem && routeBit == true /// open
&& item.GNodes.Count > 0 && item.GNodes[0].Dist == int.MaxValue /// dry
&& dsh.HasOpenDry) /// has appropriate image
{
if (item.Flip)
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedOpenDry, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedOpenDry, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedOpenDry, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedOpenDry, rect.X, rect.Y); break;
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedOpenDry, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedOpenDry, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedOpenDry, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedOpenDry, rect.X, rect.Y); break;
}
}
else
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightOpenDry, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpOpenDry, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftOpenDry, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownOpenDry, rect.X, rect.Y); break;
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightOpenDry, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpOpenDry, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftOpenDry, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownOpenDry, rect.X, rect.Y); break;
}
}
}
else if (dsh.HasVacuum && item.GNodes.Count > 0 && item.GNodes[0].Dist > Const.Vacuum)
else if (((item is IRouteBasedDrawingItem && routeBit == false) || /// closed OR
(item.GNodes.Count > 0 && item.GNodes[0].Dist == int.MaxValue)) /// dry
&& dsh.HasClosedDry) /// has appropriate image
{
if (item.Flip)
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedVacuum, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedVacuum, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedVacuum, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedVacuum, rect.X, rect.Y); break;
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedClosedDry, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedClosedDry, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedClosedDry, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedClosedDry, rect.X, rect.Y); break;
}
}
else
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightVacuum, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpVacuum, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftVacuum, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownVacuum, rect.X, rect.Y); break;
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightClosedDry, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpClosedDry, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftClosedDry, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownClosedDry, rect.X, rect.Y); break;
}
}
}
else if (item.GNodes.Count > 0 && Const.Vacuum <= item.GNodes[0].Dist && item.GNodes[0].Dist < int.MaxValue /// vacuum
&& dsh.HasVacuum) /// has appropriate image
{
if (item.Flip)
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlippedVacuum, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlippedVacuum, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlippedVacuum, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlippedVacuum, rect.X, rect.Y); break;
}
}
else
{
switch (item.Orient)
{
case Orient.R: e.Graphics.DrawImage(dsh.ImgRightVacuum, rect.X, rect.Y); break;
case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpVacuum, rect.X, rect.Y); break;
case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftVacuum, rect.X, rect.Y); break;
case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownVacuum, rect.X, rect.Y); break;
}
}
}