mirror of
http://gitlab.expertsoft.com.ua/git/expertcad
synced 2026-01-11 22:45:39 +02:00
First commit
This commit is contained in:
Anatoly
parent
713ddf52b4
commit
000979b6df
@ -1,10 +1,10 @@
|
|||||||
object frm3D: Tfrm3D
|
object frm3D: Tfrm3D
|
||||||
Left = -8
|
Left = 1
|
||||||
Top = -8
|
Top = 1
|
||||||
BorderIcons = [biSystemMenu]
|
BorderIcons = [biSystemMenu]
|
||||||
Caption = #1055#1088#1086#1089#1084#1086#1090#1088' '#1074' 3D'
|
Caption = #1055#1088#1086#1089#1084#1086#1090#1088' '#1074' 3D'
|
||||||
ClientHeight = 705
|
ClientHeight = 687
|
||||||
ClientWidth = 1360
|
ClientWidth = 1342
|
||||||
Color = clBtnFace
|
Color = clBtnFace
|
||||||
Font.Charset = DEFAULT_CHARSET
|
Font.Charset = DEFAULT_CHARSET
|
||||||
Font.Color = clWindowText
|
Font.Color = clWindowText
|
||||||
@ -35,15 +35,17 @@ object frm3D: Tfrm3D
|
|||||||
object panMain: TPanel
|
object panMain: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 1360
|
Width = 1342
|
||||||
Height = 705
|
Height = 687
|
||||||
Align = alClient
|
Align = alClient
|
||||||
Caption = 'Panel2'
|
Caption = 'Panel2'
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
|
ExplicitWidth = 1360
|
||||||
|
ExplicitHeight = 705
|
||||||
object Splitter1: TSplitter
|
object Splitter1: TSplitter
|
||||||
Left = 1356
|
Left = 1338
|
||||||
Top = 42
|
Top = 42
|
||||||
Height = 662
|
Height = 644
|
||||||
Align = alRight
|
Align = alRight
|
||||||
AutoSnap = False
|
AutoSnap = False
|
||||||
ResizeStyle = rsUpdate
|
ResizeStyle = rsUpdate
|
||||||
@ -53,14 +55,15 @@ object frm3D: Tfrm3D
|
|||||||
object panUpper: TPanel
|
object panUpper: TPanel
|
||||||
Left = 1
|
Left = 1
|
||||||
Top = 1
|
Top = 1
|
||||||
Width = 1358
|
Width = 1340
|
||||||
Height = 41
|
Height = 41
|
||||||
Align = alTop
|
Align = alTop
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
Color = 15329769
|
Color = 15329769
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
|
ExplicitWidth = 1358
|
||||||
DesignSize = (
|
DesignSize = (
|
||||||
1358
|
1340
|
||||||
41)
|
41)
|
||||||
object SpeedButton1: TSpeedButton
|
object SpeedButton1: TSpeedButton
|
||||||
Left = 8
|
Left = 8
|
||||||
@ -108,7 +111,7 @@ object frm3D: Tfrm3D
|
|||||||
OnClick = SpeedButton3Click
|
OnClick = SpeedButton3Click
|
||||||
end
|
end
|
||||||
object lbViewType: TLabel
|
object lbViewType: TLabel
|
||||||
Left = 1186
|
Left = 1168
|
||||||
Top = 25
|
Top = 25
|
||||||
Width = 163
|
Width = 163
|
||||||
Height = 16
|
Height = 16
|
||||||
@ -155,7 +158,7 @@ object frm3D: Tfrm3D
|
|||||||
OnClick = sbSaveModelClick
|
OnClick = sbSaveModelClick
|
||||||
end
|
end
|
||||||
object sbApplyScsModel: TSpeedButton
|
object sbApplyScsModel: TSpeedButton
|
||||||
Left = 1091
|
Left = 1073
|
||||||
Top = 13
|
Top = 13
|
||||||
Width = 161
|
Width = 161
|
||||||
Height = 22
|
Height = 22
|
||||||
@ -169,9 +172,10 @@ object frm3D: Tfrm3D
|
|||||||
Font.Style = []
|
Font.Style = []
|
||||||
ParentFont = False
|
ParentFont = False
|
||||||
OnClick = sbApplyScsModelClick
|
OnClick = sbApplyScsModelClick
|
||||||
|
ExplicitLeft = 1091
|
||||||
end
|
end
|
||||||
object SpeedButton4: TSpeedButton
|
object SpeedButton4: TSpeedButton
|
||||||
Left = 1258
|
Left = 1240
|
||||||
Top = 8
|
Top = 8
|
||||||
Width = 94
|
Width = 94
|
||||||
Height = 22
|
Height = 22
|
||||||
@ -210,30 +214,34 @@ object frm3D: Tfrm3D
|
|||||||
object panScene: TPanel
|
object panScene: TPanel
|
||||||
Left = 1
|
Left = 1
|
||||||
Top = 42
|
Top = 42
|
||||||
Width = 1035
|
Width = 1017
|
||||||
Height = 662
|
Height = 644
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelInner = bvLowered
|
BevelInner = bvLowered
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
|
ExplicitWidth = 1035
|
||||||
|
ExplicitHeight = 662
|
||||||
object Panel3: TPanel
|
object Panel3: TPanel
|
||||||
Left = 2
|
Left = 2
|
||||||
Top = 2
|
Top = 2
|
||||||
Width = 1031
|
Width = 1013
|
||||||
Height = 658
|
Height = 640
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
Ctl3D = False
|
Ctl3D = False
|
||||||
ParentCtl3D = False
|
ParentCtl3D = False
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
|
ExplicitWidth = 1031
|
||||||
|
ExplicitHeight = 658
|
||||||
object GLSceneViewer: TGLSceneViewer
|
object GLSceneViewer: TGLSceneViewer
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 1031
|
Width = 1013
|
||||||
Height = 613
|
Height = 595
|
||||||
Camera = GLCamera
|
Camera = GLCamera
|
||||||
Buffer.BackgroundColor = 15987957
|
Buffer.BackgroundColor = 15987957
|
||||||
Buffer.AntiAliasing = aa2x
|
Buffer.AntiAliasing = aa2x
|
||||||
FieldOfView = 124.868827819824200000
|
FieldOfView = 123.455924987793000000
|
||||||
Align = alClient
|
Align = alClient
|
||||||
OnClick = GLSceneViewerClick
|
OnClick = GLSceneViewerClick
|
||||||
OnDblClick = GLSceneViewerDblClick
|
OnDblClick = GLSceneViewerDblClick
|
||||||
@ -241,11 +249,13 @@ object frm3D: Tfrm3D
|
|||||||
OnMouseMove = GLSceneViewerMouseMove
|
OnMouseMove = GLSceneViewerMouseMove
|
||||||
OnMouseUp = GLSceneViewerMouseUp
|
OnMouseUp = GLSceneViewerMouseUp
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
|
ExplicitWidth = 1031
|
||||||
|
ExplicitHeight = 613
|
||||||
end
|
end
|
||||||
object StatusBar1: TStatusBar
|
object StatusBar1: TStatusBar
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 633
|
Top = 615
|
||||||
Width = 1031
|
Width = 1013
|
||||||
Height = 25
|
Height = 25
|
||||||
Panels = <
|
Panels = <
|
||||||
item
|
item
|
||||||
@ -253,51 +263,59 @@ object frm3D: Tfrm3D
|
|||||||
Width = 50
|
Width = 50
|
||||||
end>
|
end>
|
||||||
OnDrawPanel = StatusBar1DrawPanel
|
OnDrawPanel = StatusBar1DrawPanel
|
||||||
|
ExplicitTop = 633
|
||||||
|
ExplicitWidth = 1031
|
||||||
end
|
end
|
||||||
object sbView: TPanel
|
object sbView: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 613
|
Top = 595
|
||||||
Width = 1031
|
Width = 1013
|
||||||
Height = 20
|
Height = 20
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
Alignment = taLeftJustify
|
Alignment = taLeftJustify
|
||||||
BevelInner = bvLowered
|
BevelInner = bvLowered
|
||||||
Locked = True
|
Locked = True
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
|
ExplicitTop = 613
|
||||||
|
ExplicitWidth = 1031
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
object RzSizePanel1: TRzSizePanel
|
object RzSizePanel1: TRzSizePanel
|
||||||
Left = 1036
|
Left = 1018
|
||||||
Top = 42
|
Top = 42
|
||||||
Width = 320
|
Width = 320
|
||||||
Height = 662
|
Height = 644
|
||||||
Align = alRight
|
Align = alRight
|
||||||
BorderWidth = 1
|
BorderWidth = 1
|
||||||
HotSpotVisible = True
|
HotSpotVisible = True
|
||||||
SizeBarWidth = 7
|
SizeBarWidth = 7
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
VisualStyle = vsClassic
|
VisualStyle = vsClassic
|
||||||
|
ExplicitLeft = 1036
|
||||||
|
ExplicitHeight = 662
|
||||||
object RzPageControl1: TRzPageControl
|
object RzPageControl1: TRzPageControl
|
||||||
AlignWithMargins = True
|
AlignWithMargins = True
|
||||||
Left = 16
|
Left = 16
|
||||||
Top = 4
|
Top = 4
|
||||||
Width = 300
|
Width = 300
|
||||||
Height = 654
|
Height = 636
|
||||||
ActivePage = TabSheet1
|
ActivePage = TabSheet1
|
||||||
ActivePageDefault = TabSheet1
|
ActivePageDefault = TabSheet1
|
||||||
Align = alRight
|
Align = alRight
|
||||||
TabIndex = 0
|
TabIndex = 0
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
TabStyle = tsSquareCorners
|
TabStyle = tsSquareCorners
|
||||||
|
ExplicitHeight = 654
|
||||||
FixedDimension = 19
|
FixedDimension = 19
|
||||||
object TabSheet1: TRzTabSheet
|
object TabSheet1: TRzTabSheet
|
||||||
Caption = #1052#1086#1076#1077#1083#1100
|
Caption = #1052#1086#1076#1077#1083#1100
|
||||||
|
ExplicitHeight = 628
|
||||||
object panObjects: TPanel
|
object panObjects: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 296
|
Width = 296
|
||||||
Height = 628
|
Height = 610
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelInner = bvLowered
|
BevelInner = bvLowered
|
||||||
Font.Charset = RUSSIAN_CHARSET
|
Font.Charset = RUSSIAN_CHARSET
|
||||||
@ -307,9 +325,10 @@ object frm3D: Tfrm3D
|
|||||||
Font.Style = []
|
Font.Style = []
|
||||||
ParentFont = False
|
ParentFont = False
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
|
ExplicitHeight = 628
|
||||||
object Splitter2: TSplitter
|
object Splitter2: TSplitter
|
||||||
Left = 2
|
Left = 2
|
||||||
Top = 173
|
Top = 155
|
||||||
Width = 292
|
Width = 292
|
||||||
Height = 3
|
Height = 3
|
||||||
Cursor = crVSplit
|
Cursor = crVSplit
|
||||||
@ -323,20 +342,18 @@ object frm3D: Tfrm3D
|
|||||||
Left = 2
|
Left = 2
|
||||||
Top = 2
|
Top = 2
|
||||||
Width = 292
|
Width = 292
|
||||||
Height = 171
|
Height = 153
|
||||||
ActivePage = TabScsModel
|
ActivePage = TabScsModel
|
||||||
Align = alClient
|
Align = alClient
|
||||||
TabIndex = 1
|
TabIndex = 1
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
TabStyle = tsRoundCorners
|
TabStyle = tsRoundCorners
|
||||||
OnTabClick = pcTreeTabClick
|
OnTabClick = pcTreeTabClick
|
||||||
|
ExplicitHeight = 171
|
||||||
FixedDimension = 19
|
FixedDimension = 19
|
||||||
object TabArchModel: TRzTabSheet
|
object TabArchModel: TRzTabSheet
|
||||||
Caption = #1040#1088#1093'. '#1084#1086#1076#1077#1083#1100
|
Caption = #1040#1088#1093'. '#1084#1086#1076#1077#1083#1100
|
||||||
ExplicitLeft = 0
|
ExplicitHeight = 145
|
||||||
ExplicitTop = 0
|
|
||||||
ExplicitWidth = 0
|
|
||||||
ExplicitHeight = 0
|
|
||||||
object cxGroupBox1: TcxGroupBox
|
object cxGroupBox1: TcxGroupBox
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
@ -391,7 +408,7 @@ object frm3D: Tfrm3D
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 47
|
Top = 47
|
||||||
Width = 288
|
Width = 288
|
||||||
Height = 98
|
Height = 80
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
BorderStyle = bsNone
|
BorderStyle = bsNone
|
||||||
@ -418,10 +435,12 @@ object frm3D: Tfrm3D
|
|||||||
000000000000000000000001067200650072006500720065002C000000000000
|
000000000000000000000001067200650072006500720065002C000000000000
|
||||||
0000000000FFFFFFFFFFFFFFFF00000000000000000000000001077200650072
|
0000000000FFFFFFFFFFFFFFFF00000000000000000000000001077200650072
|
||||||
007200650072006500}
|
007200650072006500}
|
||||||
|
ExplicitHeight = 98
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
object TabScsModel: TRzTabSheet
|
object TabScsModel: TRzTabSheet
|
||||||
Caption = #1057#1050#1057' '#1084#1086#1076#1077#1083#1100
|
Caption = #1057#1050#1057' '#1084#1086#1076#1077#1083#1100
|
||||||
|
ExplicitHeight = 145
|
||||||
object cxGroupBox2: TcxGroupBox
|
object cxGroupBox2: TcxGroupBox
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
@ -476,7 +495,7 @@ object frm3D: Tfrm3D
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 47
|
Top = 47
|
||||||
Width = 288
|
Width = 288
|
||||||
Height = 98
|
Height = 80
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
BorderStyle = bsNone
|
BorderStyle = bsNone
|
||||||
@ -503,6 +522,7 @@ object frm3D: Tfrm3D
|
|||||||
000000000000000000000001067200650072006500720065002C000000000000
|
000000000000000000000001067200650072006500720065002C000000000000
|
||||||
0000000000FFFFFFFFFFFFFFFF00000000000000000000000001077200650072
|
0000000000FFFFFFFFFFFFFFFF00000000000000000000000001077200650072
|
||||||
007200650072006500}
|
007200650072006500}
|
||||||
|
ExplicitHeight = 98
|
||||||
end
|
end
|
||||||
object DuplicateNodeTree: TTreeView
|
object DuplicateNodeTree: TTreeView
|
||||||
Left = 160
|
Left = 160
|
||||||
@ -516,7 +536,7 @@ object frm3D: Tfrm3D
|
|||||||
end
|
end
|
||||||
object pcProps: TRzPageControl
|
object pcProps: TRzPageControl
|
||||||
Left = 2
|
Left = 2
|
||||||
Top = 176
|
Top = 158
|
||||||
Width = 292
|
Width = 292
|
||||||
Height = 450
|
Height = 450
|
||||||
ActivePage = TabScsProps
|
ActivePage = TabScsProps
|
||||||
@ -524,13 +544,10 @@ object frm3D: Tfrm3D
|
|||||||
TabIndex = 1
|
TabIndex = 1
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
TabStyle = tsRoundCorners
|
TabStyle = tsRoundCorners
|
||||||
|
ExplicitTop = 176
|
||||||
FixedDimension = 19
|
FixedDimension = 19
|
||||||
object TabArchProps: TRzTabSheet
|
object TabArchProps: TRzTabSheet
|
||||||
Caption = #1040#1088#1093'. '#1089#1074#1086#1081#1089#1090#1074#1072
|
Caption = #1040#1088#1093'. '#1089#1074#1086#1081#1089#1090#1074#1072
|
||||||
ExplicitLeft = 0
|
|
||||||
ExplicitTop = 0
|
|
||||||
ExplicitWidth = 0
|
|
||||||
ExplicitHeight = 0
|
|
||||||
object Panel1: TPanel
|
object Panel1: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
@ -2141,10 +2158,7 @@ object frm3D: Tfrm3D
|
|||||||
end
|
end
|
||||||
object TabSheet2: TRzTabSheet
|
object TabSheet2: TRzTabSheet
|
||||||
Caption = #1053#1072#1089#1090#1088#1086#1081#1082#1080
|
Caption = #1053#1072#1089#1090#1088#1086#1081#1082#1080
|
||||||
ExplicitLeft = 0
|
ExplicitHeight = 628
|
||||||
ExplicitTop = 0
|
|
||||||
ExplicitWidth = 0
|
|
||||||
ExplicitHeight = 0
|
|
||||||
object Label10: TLabel
|
object Label10: TLabel
|
||||||
Left = 5
|
Left = 5
|
||||||
Top = 71
|
Top = 71
|
||||||
@ -3404,7 +3418,7 @@ object frm3D: Tfrm3D
|
|||||||
Left = 100
|
Left = 100
|
||||||
Top = 57
|
Top = 57
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01013A00B000E40210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01013A00B000000310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
000000000000360000002800000040000000F0000000010020000000000000F0
|
000000000000360000002800000040000000F0000000010020000000000000F0
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
|||||||
@ -530,9 +530,14 @@ type
|
|||||||
|
|
||||||
FxObjects: TList;
|
FxObjects: TList;
|
||||||
FNodes: TList;
|
FNodes: TList;
|
||||||
|
FCadList: TList; // Tolik 23/07/2025 -- ñïèñîê ëèñòîâ ïðîåêòà
|
||||||
|
FFloorsHeightArray: Array of double; // ìàññèâ âûñîò ýòàæåé
|
||||||
|
|
||||||
//Tolik 22/06/2025 --
|
//Tolik 22/06/2025 --
|
||||||
//Procedure UpdateFaces(Faces: TList; Yh: Double = 0);
|
//Procedure UpdateFaces(Faces: TList; Yh: Double = 0);
|
||||||
Procedure UpdateFaces(Faces: TList; Yh: Double = 0; aFirstLoad: boolean = true);
|
//Procedure UpdateFaces(Faces: TList; Yh: Double = 0; aFirstLoad: boolean = true);
|
||||||
|
function getZOrder(aCad:TF_Cad): Double;
|
||||||
|
Procedure UpdateFaces(Faces: TList; Yh: Double = 0; aFirstLoad: boolean = true; aZOrder: double = -1000);
|
||||||
//
|
//
|
||||||
procedure UpdateModelTree;
|
procedure UpdateModelTree;
|
||||||
procedure UpdateScsModelTree;
|
procedure UpdateScsModelTree;
|
||||||
@ -2007,8 +2012,25 @@ begin
|
|||||||
my := y;
|
my := y;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
function Tfrm3D.getZOrder(aCad:TF_Cad): Double;
|
||||||
|
var i: integer;
|
||||||
|
begin
|
||||||
|
Result := 0;
|
||||||
|
if FCadList.Count > 1 then
|
||||||
|
begin
|
||||||
|
for i := 0 to FCadList.Count - 1 do
|
||||||
|
begin
|
||||||
|
if TF_Cad(FCadList[i]) = aCad then
|
||||||
|
begin
|
||||||
|
result := FFloorsHeightArray[i];
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
//procedure Tfrm3D.UpdateFaces(Faces: TList; Yh: Double = 0);
|
//procedure Tfrm3D.UpdateFaces(Faces: TList; Yh: Double = 0);
|
||||||
Procedure Tfrm3D.UpdateFaces(Faces: TList; Yh: Double = 0; aFirstLoad: boolean = true);
|
//Procedure Tfrm3D.UpdateFaces(Faces: TList; Yh: Double = 0; aFirstLoad: boolean = true);
|
||||||
|
Procedure Tfrm3D.UpdateFaces(Faces: TList; Yh: Double = 0; aFirstLoad: boolean = true; aZOrder: Double = -1000);
|
||||||
//const
|
//const
|
||||||
// clrBlack : TVector = (0, 0, 0, 1);
|
// clrBlack : TVector = (0, 0, 0, 1);
|
||||||
var
|
var
|
||||||
@ -3949,17 +3971,28 @@ var
|
|||||||
p2 := GetPoint(aLine, 2, HalfWidth);
|
p2 := GetPoint(aLine, 2, HalfWidth);
|
||||||
//êîíòóð ïîääîíà ëîòêà Tolik 15/05/2025 --
|
//êîíòóð ïîääîíà ëîòêà Tolik 15/05/2025 --
|
||||||
cp1 := RotatePoint(aLine.ap1, p1^, -PI/2);
|
cp1 := RotatePoint(aLine.ap1, p1^, -PI/2);
|
||||||
cp1.z := p1.z;
|
//cp1.z := p1.z;
|
||||||
|
cp1.z := aLine.actualZOrder[1];
|
||||||
|
|
||||||
cp2 := aLine.ap1;
|
cp2 := aLine.ap1;
|
||||||
cp2.z := p1.z;
|
//cp2.z := p1.z;
|
||||||
|
cp2.z := aLine.actualZOrder[1];
|
||||||
|
|
||||||
cp3 := RotatePoint(aLine.ap1, p1^, PI/2);
|
cp3 := RotatePoint(aLine.ap1, p1^, PI/2);
|
||||||
cp3.z := p1.z;
|
//cp3.z := p1.z;
|
||||||
|
cp3.z := aLine.actualZOrder[1];
|
||||||
|
|
||||||
cp4 := RotatePoint(aLine.ap2, p2^, -PI/2);
|
cp4 := RotatePoint(aLine.ap2, p2^, -PI/2);
|
||||||
cp4.z := p2.z;
|
//cp4.z := p2.z;
|
||||||
|
cp4.z := aLine.actualZOrder[2];
|
||||||
|
|
||||||
cp5 := aLine.ap2;
|
cp5 := aLine.ap2;
|
||||||
cp5.z := p2.z;
|
//cp5.z := p2.z;
|
||||||
|
cp5.z := aLine.actualZOrder[2];
|
||||||
|
|
||||||
cp6 := RotatePoint(aLine.ap2, p2^, PI/2);
|
cp6 := RotatePoint(aLine.ap2, p2^, PI/2);
|
||||||
cp6.z := p2.z;
|
//cp6.z := p2.z;
|
||||||
|
cp6.z := aLine.actualZOrder[2];
|
||||||
{
|
{
|
||||||
ap1 := RotatePoint(aLine.ap1, p1^, -PI/2);
|
ap1 := RotatePoint(aLine.ap1, p1^, -PI/2);
|
||||||
ap2 := RotatePoint(aLine.ap1, p1^, PI/2);
|
ap2 := RotatePoint(aLine.ap1, p1^, PI/2);
|
||||||
@ -4766,9 +4799,11 @@ begin
|
|||||||
end;
|
end;
|
||||||
begin
|
begin
|
||||||
try
|
try
|
||||||
|
if aFirstLoad then //24/07/2025--
|
||||||
|
begin
|
||||||
bb := TBitmap.Create;
|
bb := TBitmap.Create;
|
||||||
bb.LoadFromFile(ExeDir + '\3DTextures\inner_wall_PE.bmp');
|
bb.LoadFromFile(ExeDir + '\3DTextures\inner_wall_PE.bmp');
|
||||||
TubeList := TList.create;
|
//TubeList := TList.create;
|
||||||
//bb_jpg := TJPEGImage.Create;
|
//bb_jpg := TJPEGImage.Create;
|
||||||
//bb_jpg.LoadFromFile(ExeDir + '\3DTextures\inner_wall_PE.jpg');
|
//bb_jpg.LoadFromFile(ExeDir + '\3DTextures\inner_wall_PE.jpg');
|
||||||
|
|
||||||
@ -4813,9 +4848,9 @@ try
|
|||||||
CreatedMaterial.Material.MaterialOptions := [moNoLighting];
|
CreatedMaterial.Material.MaterialOptions := [moNoLighting];
|
||||||
CreatedMaterial.Material.Texture.TextureMode := tmDecal;
|
CreatedMaterial.Material.Texture.TextureMode := tmDecal;
|
||||||
end;
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
TubeList := TList.create;
|
||||||
|
|
||||||
TimerOnSelectNodes.OnTimer := nil;
|
TimerOnSelectNodes.OnTimer := nil;
|
||||||
FaceList := Faces;
|
FaceList := Faces;
|
||||||
IsRoof := false;
|
IsRoof := false;
|
||||||
@ -5126,10 +5161,21 @@ try
|
|||||||
for k := 0 to pCnt - 1 do
|
for k := 0 to pCnt - 1 do
|
||||||
begin
|
begin
|
||||||
p := Face.Points[k];
|
p := Face.Points[k];
|
||||||
|
//Tolik 24/7/2025 --
|
||||||
|
if AFirstLoad then
|
||||||
|
begin
|
||||||
if Face.RecType <> ftNet3DSObject then
|
if Face.RecType <> ftNet3DSObject then
|
||||||
Face.Points[k] := DoublePoint(p.x, p.y, p.z + FZOrder * UOMToMetre(1000 / FCAD.PCad.MapScale))
|
Face.Points[k] := DoublePoint(p.x, p.y, p.z + FZOrder * UOMToMetre(1000 / FCAD.PCad.MapScale))
|
||||||
else
|
else
|
||||||
Face.Points[k] := DoublePoint(p.x, p.y + FZOrder * UOMToMetre(1000 / FCAD.PCad.MapScale) * Factor, p.z);
|
Face.Points[k] := DoublePoint(p.x, p.y + FZOrder * UOMToMetre(1000 / FCAD.PCad.MapScale) * Factor, p.z);
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
if Face.RecType <> ftNet3DSObject then
|
||||||
|
Face.Points[k] := DoublePoint(p.x, p.y, p.z + aZOrder * UOMToMetre(1000 / FCAD.PCad.MapScale))
|
||||||
|
else
|
||||||
|
Face.Points[k] := DoublePoint(p.x, p.y + aZOrder * UOMToMetre(1000 / FCAD.PCad.MapScale) * Factor, p.z);
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
//glCompon.AddNode(x,y,z) - äîáàâëåíèå êîîðäèíàò êîìïîíåíòó,êîòîðûé íàõîäèòüñÿ â DummyCube,
|
//glCompon.AddNode(x,y,z) - äîáàâëåíèå êîîðäèíàò êîìïîíåíòó,êîòîðûé íàõîäèòüñÿ â DummyCube,
|
||||||
@ -9469,6 +9515,9 @@ var
|
|||||||
//
|
//
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
FCadList := TList.Create; // Tolik 23/07/2025 -- ñïèñîê ëèñòîâ ïðîåêòà
|
||||||
|
SetLength(FFloorsHeightArray, 0); // ìàññèâ âûñîò ýòàæåé
|
||||||
|
//
|
||||||
//Tolik 27/05/2025 --
|
//Tolik 27/05/2025 --
|
||||||
// Ñîçäàåì HUD-Dummy, êîòîðûé âñåãäà áóäåò â îäíîì ìåñòå
|
// Ñîçäàåì HUD-Dummy, êîòîðûé âñåãäà áóäåò â îäíîì ìåñòå
|
||||||
dummy := TGLDummyCube.Create(GLScene.Objects);
|
dummy := TGLDummyCube.Create(GLScene.Objects);
|
||||||
@ -11020,6 +11069,8 @@ end;
|
|||||||
procedure Tfrm3D.FormDestroy(Sender: TObject);
|
procedure Tfrm3D.FormDestroy(Sender: TObject);
|
||||||
var i: integer;
|
var i: integer;
|
||||||
begin
|
begin
|
||||||
|
FCadList.Free; // Tolik 23/07/2025 -- ñïèñîê ëèñòîâ ïðîåêòà
|
||||||
|
SetLength(FFloorsHeightArray, 0); // ìàññèâ âûñîò ýòàæåé
|
||||||
|
|
||||||
ObjMatList.Free; // Tolik 02/10/2019 --
|
ObjMatList.Free; // Tolik 02/10/2019 --
|
||||||
if FSelection <> nil then
|
if FSelection <> nil then
|
||||||
@ -12383,6 +12434,8 @@ var
|
|||||||
dp1: T3dPoint;
|
dp1: T3dPoint;
|
||||||
LineToMove: T3dLine; // Tolik 19/06/2025 --
|
LineToMove: T3dLine; // Tolik 19/06/2025 --
|
||||||
LastConnID: integer;//
|
LastConnID: integer;//
|
||||||
|
cadheight: double;
|
||||||
|
SelList: TList; // Tolik 30/07/2025 --
|
||||||
|
|
||||||
function GetParentConnector(aNode: TTreeNode): T3DConnector;
|
function GetParentConnector(aNode: TTreeNode): T3DConnector;
|
||||||
begin
|
begin
|
||||||
@ -12603,6 +12656,7 @@ var
|
|||||||
if aLine.FSCSObject <> nil then
|
if aLine.FSCSObject <> nil then
|
||||||
SCSLine := aLine.FSCSObject; // ñàìà òðàññà íà êàäå
|
SCSLine := aLine.FSCSObject; // ñàìà òðàññà íà êàäå
|
||||||
//Tolik 18/07/2025 -- Undo êàäà(åñëè íå áûëî)
|
//Tolik 18/07/2025 -- Undo êàäà(åñëè íå áûëî)
|
||||||
|
{
|
||||||
if G3dUndoList.IndexOf(TF_CAD(TPowerCad(SCSLine.Owner).Owner)) = -1 then
|
if G3dUndoList.IndexOf(TF_CAD(TPowerCad(SCSLine.Owner).Owner)) = -1 then
|
||||||
begin
|
begin
|
||||||
UndoAct := TF_CAD(TPowerCad(SCSLine.Owner).Owner).SaveForUndo(uat_None, true, false, 0, false, true);
|
UndoAct := TF_CAD(TPowerCad(SCSLine.Owner).Owner).SaveForUndo(uat_None, true, false, 0, false, true);
|
||||||
@ -12610,6 +12664,7 @@ var
|
|||||||
if UndoAct <> nil then
|
if UndoAct <> nil then
|
||||||
G3dUndoActList.Add(UndoAct);
|
G3dUndoActList.Add(UndoAct);
|
||||||
end;
|
end;
|
||||||
|
}
|
||||||
//
|
//
|
||||||
FaceList := TList.Create;
|
FaceList := TList.Create;
|
||||||
ObjList := TList.Create;
|
ObjList := TList.Create;
|
||||||
@ -12840,7 +12895,9 @@ var
|
|||||||
begin
|
begin
|
||||||
for i := 0 to LineCatalog.ComponentReferences.Count - 1 do
|
for i := 0 to LineCatalog.ComponentReferences.Count - 1 do
|
||||||
begin
|
begin
|
||||||
if LineCatalog.ComponentReferences[i].ComponentType.SysName = ctsntube then
|
//if LineCatalog.ComponentReferences[i].ComponentType.SysName = ctsntube then
|
||||||
|
if ((LineCatalog.ComponentReferences[i].ComponentType.SysName = ctsntube) or
|
||||||
|
(LineCatalog.ComponentReferences[i].ComponentType.SysName = ctsnwiretray)) then
|
||||||
begin
|
begin
|
||||||
TubeCompon := LineCatalog.ComponentReferences[i];
|
TubeCompon := LineCatalog.ComponentReferences[i];
|
||||||
break;
|
break;
|
||||||
@ -12870,7 +12927,7 @@ var
|
|||||||
NewTraceNode := F_ProjMan.FindComponOrDirInTreeByList(SCSList.Id, JoinedLine.ID, False); //
|
NewTraceNode := F_ProjMan.FindComponOrDirInTreeByList(SCSList.Id, JoinedLine.ID, False); //
|
||||||
if NewTraceNode <> nil then
|
if NewTraceNode <> nil then
|
||||||
begin
|
begin
|
||||||
//Ñêîïèðîâàòü òðóáó
|
//Ñêîïèðîâàòü òðóáó (ëîòîê)
|
||||||
F_ProjMan.RollBackCut;
|
F_ProjMan.RollBackCut;
|
||||||
F_ProjMan.GSDat.ObjectID := PObjectData(ComponNode.Data).ObjectID;
|
F_ProjMan.GSDat.ObjectID := PObjectData(ComponNode.Data).ObjectID;
|
||||||
F_ProjMan.GSDat.ItemType := PObjectData(ComponNode.Data).ItemType;
|
F_ProjMan.GSDat.ItemType := PObjectData(ComponNode.Data).ItemType;
|
||||||
@ -12900,7 +12957,7 @@ var
|
|||||||
NewTraceNode := F_ProjMan.FindComponOrDirInTreeByList(SCSList.Id, JoinedLine.ID, False); //
|
NewTraceNode := F_ProjMan.FindComponOrDirInTreeByList(SCSList.Id, JoinedLine.ID, False); //
|
||||||
if NewTraceNode <> nil then
|
if NewTraceNode <> nil then
|
||||||
begin
|
begin
|
||||||
//Ñêîïèðîâàòü òðóáó
|
//Ñêîïèðîâàòü òðóáó (ëîòîê)
|
||||||
F_ProjMan.RollBackCut;
|
F_ProjMan.RollBackCut;
|
||||||
F_ProjMan.GSDat.ObjectID := PObjectData(ComponNode.Data).ObjectID;
|
F_ProjMan.GSDat.ObjectID := PObjectData(ComponNode.Data).ObjectID;
|
||||||
F_ProjMan.GSDat.ItemType := PObjectData(ComponNode.Data).ItemType;
|
F_ProjMan.GSDat.ItemType := PObjectData(ComponNode.Data).ItemType;
|
||||||
@ -13080,7 +13137,8 @@ var
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
//3D
|
//3D
|
||||||
UpdateFaces(FaceList);
|
cadheight := getZOrder(TF_CAD(TPowerCad(SCSLine.Owner).Owner));
|
||||||
|
UpdateFaces(FaceList, 0, false, cadheight);
|
||||||
//restore selection
|
//restore selection
|
||||||
SelList := TList.Create;
|
SelList := TList.Create;
|
||||||
for i := 0 to SCSModelTree.Items.Count - 1 do
|
for i := 0 to SCSModelTree.Items.Count - 1 do
|
||||||
@ -13123,6 +13181,51 @@ var
|
|||||||
GisChangeFrom3D := True; // 11/07/2025 -- âûñòàâèòü ôëàã, ÷òîá áûëè èçìåíåíèÿ â ïðîåêòå èç 3Ä ...
|
GisChangeFrom3D := True; // 11/07/2025 -- âûñòàâèòü ôëàã, ÷òîá áûëè èçìåíåíèÿ â ïðîåêòå èç 3Ä ...
|
||||||
end;
|
end;
|
||||||
//
|
//
|
||||||
|
function GetSelList: TList;
|
||||||
|
var i: integer;
|
||||||
|
begin
|
||||||
|
Result := TList.Create;
|
||||||
|
for i := 0 to FSelection.Count - 1 do
|
||||||
|
begin
|
||||||
|
if TglBaseSceneObject(FSelection[i]).TagObject <> nil then
|
||||||
|
begin
|
||||||
|
currNode := TTreeNode(TglBaseSceneObject(FSelection[i]).TagObject);
|
||||||
|
ParentNode := GetParentNode(currNode);
|
||||||
|
//Åñëè âûáðàí ëèíåéíûé îáúåêò, ïîëó÷àåì òðàññó, è äâèãàåì åå êîííåêòîðû
|
||||||
|
if TObject(ParentNode.Data).ClassName = 'T3DLine' then
|
||||||
|
begin
|
||||||
|
if T3DLine(ParentNode.Data).FGLObject <> nil then
|
||||||
|
begin
|
||||||
|
if Result.IndexOf(T3DConnector(T3DLine(ParentNode.Data).FJoinConnector1)) = -1 then
|
||||||
|
Result.Add(T3DConnector(T3DLine(ParentNode.Data).FJoinConnector1));
|
||||||
|
if Result.IndexOf(T3DConnector(T3DLine(ParentNode.Data).FJoinConnector2)) = -1 then
|
||||||
|
Result.Add(T3DConnector(T3DLine(ParentNode.Data).FJoinConnector2));
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
if TObject(ParentNode.Data).ClassName = 'T3DConnector' then
|
||||||
|
begin
|
||||||
|
if T3DConnector(ParentNode.Data).FGLObject <> nil then
|
||||||
|
begin
|
||||||
|
if Result.IndexOf(T3DConnector(ParentNode.Data)) = -1 then
|
||||||
|
Result.Add(T3DConnector(ParentNode.Data));
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
Procedure MoveSelected(aList: TList);
|
||||||
|
var i: integer;
|
||||||
|
begin
|
||||||
|
for i := 0 to aList.Count - 1 do
|
||||||
|
begin
|
||||||
|
Move3DConnector(T3DConnector(aList[i]), dp);
|
||||||
|
FMovedObjectsList.Remove(T3DConnector(aList[i]));
|
||||||
|
end;
|
||||||
|
end;
|
||||||
begin
|
begin
|
||||||
//if not GLSceneViewer.Focused then
|
//if not GLSceneViewer.Focused then
|
||||||
//begin
|
//begin
|
||||||
@ -13548,6 +13651,15 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
//
|
//
|
||||||
|
if FSelection.Count > 0 then // òóò ïîïðîáóåì ñäåëàòü ìíîæåñòâåííûé ñäâèã
|
||||||
|
begin
|
||||||
|
SelList := GetSelList;
|
||||||
|
MoveSelected(SelList);
|
||||||
|
SelList.Free;
|
||||||
|
exit;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
if TglBaseSceneObject(FSelection[0]).TagObject <> nil then
|
if TglBaseSceneObject(FSelection[0]).TagObject <> nil then
|
||||||
begin
|
begin
|
||||||
currNode := TTreeNode(TglBaseSceneObject(FSelection[0]).TagObject);
|
currNode := TTreeNode(TglBaseSceneObject(FSelection[0]).TagObject);
|
||||||
@ -13632,6 +13744,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
end;
|
||||||
end
|
end
|
||||||
else //Tolik 26/05/2025 -- ýòî åñëè âûáðàííîãî îáúåêòà íåò (òîãäà ïðîñòî åäåò êàìåðà)
|
else //Tolik 26/05/2025 -- ýòî åñëè âûáðàííîãî îáúåêòà íåò (òîãäà ïðîñòî åäåò êàìåðà)
|
||||||
begin
|
begin
|
||||||
@ -23076,6 +23189,338 @@ var
|
|||||||
NextSideConnsList.Free;
|
NextSideConnsList.Free;
|
||||||
SCSLineList.Free;
|
SCSLineList.Free;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Procedure CheckRecreateWireTrays;
|
||||||
|
var SavedGCadForm: TF_Cad;
|
||||||
|
SCSLine, JoinedLine: TOrthoLine;
|
||||||
|
i, j: integer;
|
||||||
|
FaceList, ObjList, Obj3dList: TList;//ñîáðàòü è óäàëèòü âñå îáúåêòû è ñâÿçàííûå ñíèìè óçëû äåðåâüåâ à òàêæå ôåéñû
|
||||||
|
// ò.ê. èõ íåîáõîäèìî áóäåò ïåðåñîçäàòü
|
||||||
|
TubeCompon: TSCSComponent;
|
||||||
|
SCSList: TSCSList;
|
||||||
|
LineCatalog: TSCSCatalog;
|
||||||
|
|
||||||
|
ComponNode, NewTraceNode, CadListNode, xScsNode: TTreeNode;
|
||||||
|
LineToMove, xLine: T3dLine;
|
||||||
|
SCSObjList: TList; // ñïèñîê îáúåêòîâ, êîòîðûå íóæíî áóäåò ïåðåïàðñèòü
|
||||||
|
SelObjClassNAme: string; // save selection
|
||||||
|
IstubeSel: Boolean; // if is tube select on trace
|
||||||
|
SelID: integer;
|
||||||
|
SelList: TList;
|
||||||
|
selCatalog: TSCSCatalog;
|
||||||
|
CameraPos: T3DPoint;
|
||||||
|
UndoAct: TListUndoAction;
|
||||||
|
SCSConn: TConnectorObject;
|
||||||
|
LineList, ComponList: TList;
|
||||||
|
LastConnID: integer;
|
||||||
|
cadheight: Double;
|
||||||
|
|
||||||
|
begin
|
||||||
|
//XConn.FJoinedLinesList
|
||||||
|
SCSConn := XConn.FSCSObject;
|
||||||
|
SCSList := F_ProjMan.GSCSBase.CurrProject.GetListByID(TF_CAD(TPowerCad(SCSConn.Owner).Owner).FCADListID);
|
||||||
|
//ñîáðàòü äîêó÷è âñå, ÷òî øëåïíåì
|
||||||
|
if SCSList <> nil then
|
||||||
|
begin
|
||||||
|
LineList := TList.Create;
|
||||||
|
ComponList := TList.Create;
|
||||||
|
for i := 0 to SCSConn.JoinedOrtholinesList.Count - 1 do
|
||||||
|
begin
|
||||||
|
SCSLine := TOrthoLine(SCSConn.JoinedOrtholinesList[i]);
|
||||||
|
LineCatalog := SCSList.GetCatalogFromReferencesBySCSID(SCSLine.ID);
|
||||||
|
for j := 0 to LineCatalog.ComponentReferences.Count - 1 do
|
||||||
|
begin
|
||||||
|
if LineCatalog.ComponentReferences[j].ComponentType.SysName = ctsnWireTray then
|
||||||
|
begin
|
||||||
|
if LineList.IndexOf(SCSLine) = -1 then
|
||||||
|
LineList.Add(SCSLine);
|
||||||
|
if ComponList.IndexOf(LineCatalog.ComponentReferences[j]) = -1 then
|
||||||
|
ComponList.Add(LineCatalog.ComponentReferences[j]);
|
||||||
|
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
//26/06/2025 -- save selection
|
||||||
|
IstubeSel := False;
|
||||||
|
SelId := -1;
|
||||||
|
CameraPos.x := GLSceneViewer.Camera.Position.X;
|
||||||
|
CameraPos.y := GLSceneViewer.Camera.Position.Y;
|
||||||
|
CameraPos.z := GLSceneViewer.Camera.Position.Z;
|
||||||
|
|
||||||
|
|
||||||
|
if FSelection.Count > 0 then
|
||||||
|
SelObjClassNAme := TObject(TTreeNode(TGLBaseSceneObject(FSelection[0]).TagObject).Data).ClassName;
|
||||||
|
|
||||||
|
if TGLBaseSceneObject(FSelection[0]).TagObject <> nil then
|
||||||
|
begin
|
||||||
|
if SelObjClassNAme = 'T3DLineComponent' then
|
||||||
|
begin
|
||||||
|
if T3DLineComponent(TTreeNode(TGLBaseSceneObject(FSelection[0]).TagObject).Data).FSCSCompon <> nil then
|
||||||
|
SelID := T3DLineComponent(TTreeNode(TGLBaseSceneObject(FSelection[0]).TagObject).Data).FSCSCompon.ID;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
if SelObjClassNAme = 'T3DLine' then
|
||||||
|
begin
|
||||||
|
if T3DLineComponent(TTreeNode(TGLBaseSceneObject(FSelection[0]).TagObject).Data).FSCSObject <> nil then
|
||||||
|
SelID := T3DLineComponent(TTreeNode(TGLBaseSceneObject(FSelection[0]).TagObject).Data).FSCSObject.ID;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
DeselectGLObjectsT; // drop selection
|
||||||
|
|
||||||
|
FaceList := TList.Create;
|
||||||
|
ObjList := TList.Create;
|
||||||
|
Obj3dList := TList.Create;
|
||||||
|
//ñîáèðàåì îáúåêòû(êîòîðûå ïîòîì øëåïíåì)
|
||||||
|
// ñ òðàññû
|
||||||
|
|
||||||
|
for i := 0 to xConn.FJoinedLinesList.Count - 1 do
|
||||||
|
begin
|
||||||
|
ObjList.Add(T3dLine(xConn.FJoinedLinesList[i]).FGLObject);
|
||||||
|
FaceList.Add(T3dLine(xConn.FJoinedLinesList[i]).FFace);
|
||||||
|
Obj3dList.Add(T3dLine(xConn.FJoinedLinesList[i]));
|
||||||
|
end;
|
||||||
|
|
||||||
|
//ñáðîñ èç îñí. äåðåâà (âñå âìåñòå â îäíîì öèêëå íèççÿ, ò.ê. ïðè óäàëåíèè òðàññû óäàëèòñÿ íå îäèí óçåë à íåñê.,
|
||||||
|
//ó÷èòûâàÿ äî÷åðíèå è íàåáíåòñÿ ñ÷åò÷èê öèêëà)
|
||||||
|
SCSModelTree.Items.BeginUpdate;
|
||||||
|
for i := SCSModelTree.Items.Count - 1 downto 0 do
|
||||||
|
begin
|
||||||
|
if TObject(SCSModelTree.Items[i].data).ClassName = 'T3DLine' then
|
||||||
|
begin
|
||||||
|
if T3dLine(SCSModelTree.Items[i].data).FSCSObject <> nil then
|
||||||
|
begin
|
||||||
|
for j := 0 to xConn.FJoinedLinesList.Count - 1 do
|
||||||
|
begin
|
||||||
|
if T3DLine(SCSModelTree.Items[i].data) = T3DLine(xConn.FJoinedLinesList[j]) then
|
||||||
|
begin
|
||||||
|
ComponNode := SCSModelTree.Items[i].getFirstChild;
|
||||||
|
while ComponNode <> nil do
|
||||||
|
begin
|
||||||
|
if TObject(ComponNode.data).ClassName = 'T3DLineComponent' then
|
||||||
|
begin
|
||||||
|
if T3DLineComponent(ComponNode.data).FGLObject <> nil then
|
||||||
|
begin
|
||||||
|
if ObjList.IndexOf(T3DLineComponent(ComponNode.data).FGLObject) = -1 then
|
||||||
|
ObjList.Add(T3DLineComponent(ComponNode.data).FGLObject);
|
||||||
|
end;
|
||||||
|
|
||||||
|
if T3DLineComponent(ComponNode.data).FFace <> nil then
|
||||||
|
begin
|
||||||
|
if FaceList.IndexOf(T3DLineComponent(ComponNode.data).FFace) = -1 then
|
||||||
|
FaceList.Add(T3DLineComponent(ComponNode.data).FFace);
|
||||||
|
end;
|
||||||
|
|
||||||
|
if Obj3DList.IndexOf(T3DLineComponent(ComponNode.data)) = -1 then
|
||||||
|
Obj3DList.Add(T3DLineComponent(ComponNode.data));
|
||||||
|
end;
|
||||||
|
ComponNode := SCSModelTree.Items[i].GetNextChild(ComponNode);
|
||||||
|
end;
|
||||||
|
|
||||||
|
SCSModelTree.Items.Delete(SCSModelTree.Items[i]);
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
SCSModelTree.Items.EndUpdate;
|
||||||
|
|
||||||
|
//ñ îáîèõ êîííåêòîðîâ îäíèì öèêëîì
|
||||||
|
DuplicateNodeTree.Items.BeginUpdate;
|
||||||
|
for i := DuplicateNodeTree.Items.Count - 1 downto 0 do
|
||||||
|
begin
|
||||||
|
if TObject(DuplicateNodeTree.Items[i].Data).ClassName = 'T3DLineComponent' then
|
||||||
|
begin
|
||||||
|
for j := 0 to ComponList.Count - 1 do
|
||||||
|
begin
|
||||||
|
if T3DLineComponent(DuplicateNodeTree.Items[i].Data).FSCSComponID = TSCSComponent(ComponList[j]).id then
|
||||||
|
begin
|
||||||
|
if ObjList.IndexOf(T3DLineComponent(DuplicateNodeTree.Items[i].Data).FGLObject) = -1 then
|
||||||
|
ObjList.Add(T3DLineComponent(DuplicateNodeTree.Items[i].Data).FGLObject);
|
||||||
|
|
||||||
|
if Obj3dList.IndexOf(T3DLineComponent(DuplicateNodeTree.Items[i].Data)) = -1 then
|
||||||
|
Obj3dList.Add(T3DLineComponent(DuplicateNodeTree.Items[i].Data));
|
||||||
|
|
||||||
|
if T3DLineComponent(DuplicateNodeTree.Items[i].Data).FFace <> nil then
|
||||||
|
begin
|
||||||
|
if FaceList.IndexOf(T3DConnector(DuplicateNodeTree.Items[i].Data).FFace) = -1 then
|
||||||
|
FaceList.Add(T3DConnector(DuplicateNodeTree.Items[i].Data).FFace);
|
||||||
|
end;
|
||||||
|
|
||||||
|
DuplicateNodeTree.Items.Delete(DuplicateNodeTree.Items[i]);
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
DuplicateNodeTree.Items.EndUpdate;
|
||||||
|
|
||||||
|
//øëåïàåì îáúåêòû
|
||||||
|
for i := 0 to FaceList.Count - 1 do
|
||||||
|
begin
|
||||||
|
TF_CAD(TPowerCad(SCSConn.Owner).Owner).PCad.Faces.Remove(TFaceRecord(FaceList[i]));
|
||||||
|
TfaceRecord(FaceList[i]).Free;
|
||||||
|
end;
|
||||||
|
FaceList.clear;
|
||||||
|
for i := 0 to ObjList.Count - 1 do
|
||||||
|
begin
|
||||||
|
DummyCube.Remove(TGLBaseSceneObject(ObjList[i]), false);
|
||||||
|
TGLBaseSceneObject(ObjList[i]).Free;
|
||||||
|
end;
|
||||||
|
ObjList.Clear;
|
||||||
|
for i := 0 to Obj3dList.Count - 1 do
|
||||||
|
begin
|
||||||
|
if frm3d.F3DModel.FScsObjects.IndexOf(Obj3dList[i]) <> -1 then
|
||||||
|
frm3d.F3DModel.FScsObjects.Remove(Obj3dList[i]);
|
||||||
|
|
||||||
|
TObject(Obj3dList[i]).Free;
|
||||||
|
end;
|
||||||
|
|
||||||
|
//ñîáðàòü ÑÊÑ-îáúåêòû, êîòîðûå çàäåë ñäâèã
|
||||||
|
SCSObjList := TList.Create;
|
||||||
|
SCSObjList.Add(SCSConn);
|
||||||
|
for i := 0 to LineList.Count - 1 do
|
||||||
|
SCSObjList.Add(LineList[i]);
|
||||||
|
|
||||||
|
//ïåðåïàðñèòü
|
||||||
|
j := frm3d.F3DModel.FScsObjects.Count;
|
||||||
|
Frm3D.F3DModel.CollectScsModel(FaceList, SCSObjList);
|
||||||
|
|
||||||
|
//Çàêèíóòü äåðåâî Tolik 22/06/2025 --
|
||||||
|
CadListNode := nil;
|
||||||
|
for i := 0 to SCSModelTree.Items.Count - 1 do
|
||||||
|
begin
|
||||||
|
if TObject(SCSModelTree.Items[i].Data).ClassNAme = 'TF_CAD' then
|
||||||
|
begin
|
||||||
|
if TF_Cad(SCSModelTree.Items[i].Data).FCADListID = TF_CAD(TPowercad(SCSConn.Owner).Owner).FCADListID then
|
||||||
|
begin
|
||||||
|
CadListNode := SCSModelTree.Items[i];
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
if CadListNode <> nil then
|
||||||
|
begin
|
||||||
|
LastConnID := -1;
|
||||||
|
for i := frm3d.F3DModel.FScsObjects.Count - 1 downto j do
|
||||||
|
begin
|
||||||
|
if TObject(frm3d.F3DModel.FScsObjects[i]) is T3DConnector then
|
||||||
|
begin
|
||||||
|
xConn := T3DConnector(frm3d.F3DModel.FScsObjects[i]);
|
||||||
|
if (xConn.FListID <> GCadForm.FCADListID) then
|
||||||
|
Continue;
|
||||||
|
if (xConn.FConnType = ct_Empty) then
|
||||||
|
begin
|
||||||
|
// Tolik 24/09/2018 - -
|
||||||
|
//xConn.FFace.F3DObject := xConn;
|
||||||
|
//Continue;
|
||||||
|
if not xConn.FisPipeElement then
|
||||||
|
begin
|
||||||
|
xConn.FFace.F3DObject := xConn;
|
||||||
|
Continue;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
//Tolik 07/05/2025 --
|
||||||
|
if ((xConn.FSCSComponID <> -1) and (xConn.FSCSComponID = LastConnID)) then
|
||||||
|
begin
|
||||||
|
xScsNode := DuplicateNodeTree.Items.AddChild(nil, xConn.FName);;
|
||||||
|
xScsNode.Data := xConn;
|
||||||
|
xScsNode.ImageIndex := 3;
|
||||||
|
xScsNode.SelectedIndex := xScsNode.ImageIndex;
|
||||||
|
xConn.FFace.FTreeNode := xScsNode;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
LastConnID := xConn.FSCSComponID;
|
||||||
|
xScsNode := ScsModelTree.Items.AddChild(CadListNode, xConn.FName);
|
||||||
|
xScsNode.Data := xConn;
|
||||||
|
xScsNode.ImageIndex := 3;
|
||||||
|
xScsNode.SelectedIndex := xScsNode.ImageIndex;
|
||||||
|
xConn.FFace.FTreeNode := xScsNode;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
xScsNode := ScsModelTree.Items.AddChild(CadListNode, xConn.FName);
|
||||||
|
xScsNode.Data := xConn;
|
||||||
|
xScsNode.ImageIndex := 3;
|
||||||
|
xScsNode.SelectedIndex := xScsNode.ImageIndex;
|
||||||
|
xConn.FFace.FTreeNode := xScsNode;
|
||||||
|
//Tolik 15/10/2018 --
|
||||||
|
// if xConn.F3dModelFileName <> '' then
|
||||||
|
xConn.FFace.F3DObject := xConn;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
if TObject(frm3d.F3DModel.FScsObjects[i]) is T3DLine then
|
||||||
|
begin
|
||||||
|
xLine := T3DLine(frm3d.F3DModel.FScsObjects[i]);
|
||||||
|
if (xLine.FListID <> FCAD.FCADListID) then
|
||||||
|
Continue;
|
||||||
|
xScsNode:= ScsModelTree.Items.AddChild(CadListNode, xLine.FName);
|
||||||
|
xScsNode.Data := xLine;
|
||||||
|
xScsNode.ImageIndex := 2;
|
||||||
|
xScsNode.SelectedIndex := xScsNode.ImageIndex;
|
||||||
|
xLine.FFace.FTreeNode := xScsNode;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
//3D
|
||||||
|
cadheight := getZOrder(TF_CAD(TPowerCad(SCSLine.Owner).Owner));
|
||||||
|
UpdateFaces(FaceList, 0, false, cadheight);
|
||||||
|
//restore selection
|
||||||
|
SelList := TList.Create;
|
||||||
|
for i := 0 to SCSModelTree.Items.Count - 1 do
|
||||||
|
begin
|
||||||
|
if TObject(TTreeNode(SCSModelTree.Items[i]).data).classname = SelObjClassNAme then
|
||||||
|
begin
|
||||||
|
if SelObjClassNAme = 'T3DLineComponent' then
|
||||||
|
begin
|
||||||
|
if T3DLineComponent(TTreeNode(SCSModelTree.Items[i]).Data).FSCSCompon.ID = SelID then
|
||||||
|
begin
|
||||||
|
SelList.Add(T3DLineComponent(TTreeNode(SCSModelTree.Items[i]).Data).FGLObject);
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
if SelObjClassNAme = 'T3DLine' then
|
||||||
|
begin
|
||||||
|
if T3DLineComponent(TTreeNode(SCSModelTree.Items[i]).Data).FSCSObject.ID = SelID then
|
||||||
|
begin
|
||||||
|
SelList.Add(T3DLine(TTreeNode(SCSModelTree.Items[i]).Data).FGLObject);
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
if SelList.Count > 0 then
|
||||||
|
SelectGLObjects(SelList);
|
||||||
|
|
||||||
|
FaceList.Free;
|
||||||
|
ObjList.Free;
|
||||||
|
Obj3dList.Free;
|
||||||
|
SelList.Free;
|
||||||
|
SCSObjList.Free;
|
||||||
|
|
||||||
|
LineList.Free;
|
||||||
|
ComponList.Free;
|
||||||
|
//Tolik 01/07/2025 -- êàìåðó íà ìåñòî
|
||||||
|
GLSceneViewer.Camera.Position.X := CameraPos.x;
|
||||||
|
GLSceneViewer.Camera.Position.y := CameraPos.y;
|
||||||
|
GLSceneViewer.Camera.Position.z := CameraPos.z;
|
||||||
|
|
||||||
|
GCadForm := SavedGCadForm;
|
||||||
|
GisChangeFrom3D := True; // 11/07/2025 -- âûñòàâèòü ôëàã, ÷òîá áûëè èçìåíåíèÿ â ïðîåêòå èç 3Ä ...
|
||||||
|
end;
|
||||||
|
(*
|
||||||
//
|
//
|
||||||
//Tolik 21/05/2025--
|
//Tolik 21/05/2025--
|
||||||
Procedure CheckRecreateWireTrays; //åñëè íà òðàññàõ áóäóò ïðîâîëî÷íûå ëîòêè, òî èõ âñå íóæíî ïåðåñîçäàòü äëÿ ïåðåñ÷åòà
|
Procedure CheckRecreateWireTrays; //åñëè íà òðàññàõ áóäóò ïðîâîëî÷íûå ëîòêè, òî èõ âñå íóæíî ïåðåñîçäàòü äëÿ ïåðåñ÷åòà
|
||||||
@ -23666,6 +24111,7 @@ var
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
*)
|
||||||
//Tolik 05/06/2025-- ïðè ïîïûòêå ñòâèãà êîííåêòîðà íå äàòü íàåõàòü êîííåêòîðó íà âòîðîé êîííåêòîëð òðàññû
|
//Tolik 05/06/2025-- ïðè ïîïûòêå ñòâèãà êîííåêòîðà íå äàòü íàåõàòü êîííåêòîðó íà âòîðîé êîííåêòîëð òðàññû
|
||||||
// è ñúåõàòü âûøå èëè íèæå òåêóùåãî ýòàæà
|
// è ñúåõàòü âûøå èëè íèæå òåêóùåãî ýòàæà
|
||||||
|
|
||||||
@ -23809,8 +24255,12 @@ begin
|
|||||||
if not CheckCanMoveConnector(xConn, dp) then
|
if not CheckCanMoveConnector(xConn, dp) then
|
||||||
exit;
|
exit;
|
||||||
//
|
//
|
||||||
|
//16/08/2025 -- òóò ïðîâåðèòü, èíà÷å ïîëîìàåòñÿ ñäâèã ïóñòîãî êîííåêòîðà (ïðîñòî êîíöåâèêà òðàññû -- íå ñðàáîòàåò)
|
||||||
|
if xConn.FisPipeElement then
|
||||||
|
begin
|
||||||
if not CheckCanMoveConn(aObj) then
|
if not CheckCanMoveConn(aObj) then
|
||||||
exit;
|
exit;
|
||||||
|
end;
|
||||||
// Tolik 26/04/2018 --
|
// Tolik 26/04/2018 --
|
||||||
{
|
{
|
||||||
if dp.y <> 0 then
|
if dp.y <> 0 then
|
||||||
@ -24381,7 +24831,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
AlignPipeObjects;
|
AlignPipeObjects;
|
||||||
AlignRelatedConns;
|
AlignRelatedConns;
|
||||||
CheckRecreateWireTrays;//ëîòîê ïðîâîëî÷íûé
|
//CheckRecreateWireTrays;//ëîòîê ïðîâîëî÷íûé
|
||||||
MovedLineList.free;
|
MovedLineList.free;
|
||||||
OtherSideConnList.free;
|
OtherSideConnList.free;
|
||||||
RelatedPipeConns.free;
|
RelatedPipeConns.free;
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
object FSCS_Main: TFSCS_Main
|
object FSCS_Main: TFSCS_Main
|
||||||
Left = -8
|
Left = 1
|
||||||
Top = -8
|
Top = 1
|
||||||
Width = 1380
|
Width = 1358
|
||||||
Height = 744
|
Height = 726
|
||||||
HorzScrollBar.Color = clBtnFace
|
HorzScrollBar.Color = clBtnFace
|
||||||
HorzScrollBar.ParentColor = False
|
HorzScrollBar.ParentColor = False
|
||||||
VertScrollBar.Color = clBtnFace
|
VertScrollBar.Color = clBtnFace
|
||||||
@ -33,7 +33,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
object sDiv1: TSplitter
|
object sDiv1: TSplitter
|
||||||
Left = 5
|
Left = 5
|
||||||
Top = 188
|
Top = 188
|
||||||
Height = 474
|
Height = 456
|
||||||
AutoSnap = False
|
AutoSnap = False
|
||||||
Color = clBtnFace
|
Color = clBtnFace
|
||||||
MinSize = 1
|
MinSize = 1
|
||||||
@ -46,9 +46,9 @@ object FSCS_Main: TFSCS_Main
|
|||||||
ExplicitHeight = 641
|
ExplicitHeight = 641
|
||||||
end
|
end
|
||||||
object sDiv2: TSplitter
|
object sDiv2: TSplitter
|
||||||
Left = 1356
|
Left = 1334
|
||||||
Top = 188
|
Top = 188
|
||||||
Height = 474
|
Height = 456
|
||||||
Align = alRight
|
Align = alRight
|
||||||
AutoSnap = False
|
AutoSnap = False
|
||||||
Color = clBtnFace
|
Color = clBtnFace
|
||||||
@ -66,7 +66,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 188
|
Top = 188
|
||||||
Width = 5
|
Width = 5
|
||||||
Height = 474
|
Height = 456
|
||||||
Align = alLeft
|
Align = alLeft
|
||||||
Alignment = taLeftJustify
|
Alignment = taLeftJustify
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
@ -80,12 +80,13 @@ object FSCS_Main: TFSCS_Main
|
|||||||
OnDockOver = PDock1DockOver
|
OnDockOver = PDock1DockOver
|
||||||
OnResize = PDock1Resize
|
OnResize = PDock1Resize
|
||||||
OnUnDock = PDock1UnDock
|
OnUnDock = PDock1UnDock
|
||||||
|
ExplicitHeight = 474
|
||||||
end
|
end
|
||||||
object pDock2: TPanel
|
object pDock2: TPanel
|
||||||
Left = 1359
|
Left = 1337
|
||||||
Top = 188
|
Top = 188
|
||||||
Width = 5
|
Width = 5
|
||||||
Height = 474
|
Height = 456
|
||||||
Align = alRight
|
Align = alRight
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
@ -98,20 +99,24 @@ object FSCS_Main: TFSCS_Main
|
|||||||
OnDockDrop = PDock1DockDrop
|
OnDockDrop = PDock1DockDrop
|
||||||
OnDockOver = PDock1DockOver
|
OnDockOver = PDock1DockOver
|
||||||
OnUnDock = PDock1UnDock
|
OnUnDock = PDock1UnDock
|
||||||
|
ExplicitLeft = 1359
|
||||||
|
ExplicitHeight = 474
|
||||||
end
|
end
|
||||||
object pCADList: TPanel
|
object pCADList: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 662
|
Top = 644
|
||||||
Width = 1364
|
Width = 1342
|
||||||
Height = 23
|
Height = 23
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
BorderStyle = bsSingle
|
BorderStyle = bsSingle
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
|
ExplicitTop = 662
|
||||||
|
ExplicitWidth = 1364
|
||||||
object pageCADList: TPageControl
|
object pageCADList: TPageControl
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 1362
|
Width = 1340
|
||||||
Height = 21
|
Height = 21
|
||||||
Align = alClient
|
Align = alClient
|
||||||
Font.Charset = RUSSIAN_CHARSET
|
Font.Charset = RUSSIAN_CHARSET
|
||||||
@ -123,13 +128,14 @@ object FSCS_Main: TFSCS_Main
|
|||||||
Style = tsFlatButtons
|
Style = tsFlatButtons
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
OnChange = pageCADListChange
|
OnChange = pageCADListChange
|
||||||
|
ExplicitWidth = 1362
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
object cbMainPanel: TControlBar
|
object cbMainPanel: TControlBar
|
||||||
AlignWithMargins = True
|
AlignWithMargins = True
|
||||||
Left = 3
|
Left = 3
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 1358
|
Width = 1336
|
||||||
Height = 136
|
Height = 136
|
||||||
HelpContext = 76000
|
HelpContext = 76000
|
||||||
Margins.Top = 0
|
Margins.Top = 0
|
||||||
@ -153,6 +159,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
OnBandPaint = cbMainPanelBandPaint
|
OnBandPaint = cbMainPanelBandPaint
|
||||||
OnDockOver = cbMainPanelDockOver
|
OnDockOver = cbMainPanelDockOver
|
||||||
OnMouseDown = cbMainPanelMouseDown
|
OnMouseDown = cbMainPanelMouseDown
|
||||||
|
ExplicitWidth = 1358
|
||||||
object tbFile: TToolBar
|
object tbFile: TToolBar
|
||||||
Left = 11
|
Left = 11
|
||||||
Top = 2
|
Top = 2
|
||||||
@ -1214,7 +1221,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
object pnHintBar: TRzSizePanel
|
object pnHintBar: TRzSizePanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 136
|
Top = 136
|
||||||
Width = 1364
|
Width = 1342
|
||||||
Height = 52
|
Height = 52
|
||||||
Align = alTop
|
Align = alTop
|
||||||
BorderHighlight = clBtnFace
|
BorderHighlight = clBtnFace
|
||||||
@ -1224,6 +1231,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
TabOrder = 4
|
TabOrder = 4
|
||||||
VisualStyle = vsClassic
|
VisualStyle = vsClassic
|
||||||
OnHotSpotClick = pnHintBarHotSpotClick
|
OnHotSpotClick = pnHintBarHotSpotClick
|
||||||
|
ExplicitWidth = 1364
|
||||||
end
|
end
|
||||||
object ActionManager: TActionManager
|
object ActionManager: TActionManager
|
||||||
ActionBars.SessionCount = 1080
|
ActionBars.SessionCount = 1080
|
||||||
@ -5860,7 +5868,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
Left = 496
|
Left = 496
|
||||||
Top = 232
|
Top = 232
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C0101D2008C01A80310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101D2008C01B80310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000005003000001002000000000000050
|
0000000000003600000028000000400000005003000001002000000000000050
|
||||||
0300000000000000000000000000000000000000000000000000000000000000
|
0300000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -12870,7 +12878,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
Left = 248
|
Left = 248
|
||||||
Top = 280
|
Top = 280
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010123008C01C00320001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010123008C01D00320001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000800000009000000001002000000000000020
|
0000000000003600000028000000800000009000000001002000000000000020
|
||||||
0100000000000000000000000000000000000000000000000000000000000000
|
0100000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -15442,7 +15450,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
Left = 240
|
Left = 240
|
||||||
Top = 408
|
Top = 408
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010112008C01B4030E000E00FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010112008C01C4030E000E00FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
000000000000360000002800000038000000460000000100200000000000403D
|
000000000000360000002800000038000000460000000100200000000000403D
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -19945,7 +19953,7 @@ object FSCS_Main: TFSCS_Main
|
|||||||
Left = 240
|
Left = 240
|
||||||
Top = 344
|
Top = 344
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C0101DE008C019C0618001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101DE008C01AC0618001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
00000000000036000000280000006000000040050000010020000000000000E0
|
00000000000036000000280000006000000040050000010020000000000000E0
|
||||||
070000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF
|
070000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009D9188003D2413003D241300FFFF
|
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009D9188003D2413003D241300FFFF
|
||||||
|
|||||||
@ -20090,8 +20090,9 @@ begin
|
|||||||
frm3d.ShowModal;
|
frm3d.ShowModal;
|
||||||
FreeAndNil(frm3D);
|
FreeAndNil(frm3D);
|
||||||
//Tolik 11/07/2025 -- âîññòàíîâèòü ïðîåêò, åñëè áûëè èçìåíåíèÿ ÷åðåç 3Ä...
|
//Tolik 11/07/2025 -- âîññòàíîâèòü ïðîåêò, åñëè áûëè èçìåíåíèÿ ÷åðåç 3Ä...
|
||||||
if GisChangeFrom3D then
|
{if GisChangeFrom3D then
|
||||||
UndoListInPM(-1, GetPathToSCSUndoUniqDir(true), true, 0, 0);
|
UndoListInPM(-1, GetPathToSCSUndoUniqDir(true), true, 0, 0);
|
||||||
|
}
|
||||||
//
|
//
|
||||||
// Tolik 23/07/2018 --
|
// Tolik 23/07/2018 --
|
||||||
GCadForm.PCad.Refresh;
|
GCadForm.PCad.Refresh;
|
||||||
@ -21471,6 +21472,7 @@ var
|
|||||||
//tmpCad: TF_Cad;
|
//tmpCad: TF_Cad;
|
||||||
Dir3dUndoName: string;
|
Dir3dUndoName: string;
|
||||||
UndoAct: TListUndoAction;
|
UndoAct: TListUndoAction;
|
||||||
|
cadheight: Double;
|
||||||
{
|
{
|
||||||
procedure InsertIntoHList(Cad: TF_CAD);
|
procedure InsertIntoHList(Cad: TF_CAD);
|
||||||
var
|
var
|
||||||
@ -21782,6 +21784,38 @@ begin
|
|||||||
GetSortModelLists;
|
GetSortModelLists;
|
||||||
// Tolik 26/04/2018 --
|
// Tolik 26/04/2018 --
|
||||||
ListOfCadsFor3DModel := TList.Create;
|
ListOfCadsFor3DModel := TList.Create;
|
||||||
|
|
||||||
|
//Tolik 24/7/2025 --
|
||||||
|
cadHeight := 0;
|
||||||
|
frm3d.FCadList.Add(SavedGCadForm);
|
||||||
|
SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
frm3d.FFloorsHeightArray[0] := 0;
|
||||||
|
|
||||||
|
if HLists.Count > 0 then
|
||||||
|
begin
|
||||||
|
for i := 1 to HLists.Count -1 do
|
||||||
|
begin
|
||||||
|
frm3d.FCadList.Add(HLists[i]);
|
||||||
|
SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
CadHeight := CadHeight + MetreToUOM(TF_CAD(HLists[i -1]).FListSettings.HeightRoom) + 0.01;
|
||||||
|
frm3d.FFloorsHeightArray[Length(frm3d.FFloorsHeightArray) - 1] := CadHeight;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
if LLists.Count > 0 then
|
||||||
|
begin
|
||||||
|
cadHeight := 0;
|
||||||
|
for i := 0 to LLists.Count - 1 do
|
||||||
|
begin
|
||||||
|
frm3d.FCadList.Add(LLists[i]);
|
||||||
|
SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
CadHeight := CadHeight - MetreToUOM(TF_CAD(LLists[i]).FListSettings.HeightRoom) - 0.01;
|
||||||
|
frm3d.FFloorsHeightArray[Length(frm3d.FFloorsHeightArray) - 1] := CadHeight;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
//SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
//frm3d.FFloorsHeightArray[Length(frm3d.FFloorsHeightArray) - 1] := frm3D.FZOrder + MetreToUOM(ListParams.Settings.HeightRoom + 0.01);
|
||||||
|
//
|
||||||
if HLists.Count > 0 then
|
if HLists.Count > 0 then
|
||||||
begin
|
begin
|
||||||
HListOfCadsFor3DModel := TList.Create;
|
HListOfCadsFor3DModel := TList.Create;
|
||||||
@ -21799,6 +21833,9 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
{ frm3d.FCadList.Add(SavedGCadForm);
|
||||||
|
SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
frm3d.FFloorsHeightArray[Length(frm3d.FFloorsHeightArray) - 1] := 0;}
|
||||||
//
|
//
|
||||||
// Ýòàæè âûøå óðîâíÿ çåìëè
|
// Ýòàæè âûøå óðîâíÿ çåìëè
|
||||||
frm3D.FZOrder := 0;
|
frm3D.FZOrder := 0;
|
||||||
@ -21857,6 +21894,11 @@ begin
|
|||||||
begin
|
begin
|
||||||
ListParams := GetListParams(GCadForm.FCADListID);
|
ListParams := GetListParams(GCadForm.FCADListID);
|
||||||
frm3D.FZOrder := frm3D.FZOrder + MetreToUOM(ListParams.Settings.HeightRoom + 0.01);
|
frm3D.FZOrder := frm3D.FZOrder + MetreToUOM(ListParams.Settings.HeightRoom + 0.01);
|
||||||
|
//Tolik 24/7/2025 --
|
||||||
|
//frm3d.FCadList.Add(GCadForm);
|
||||||
|
//SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
//frm3d.FFloorsHeightArray[Length(frm3d.FFloorsHeightArray) - 1] := frm3D.FZOrder + MetreToUOM(ListParams.Settings.HeightRoom + 0.01);
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@ -21876,7 +21918,10 @@ begin
|
|||||||
//Tolik 29/09/2021 --
|
//Tolik 29/09/2021 --
|
||||||
//frm3D.FZOrder := frm3D.FZOrder - ListParams.Settings.HeightRoom - 0.01;
|
//frm3D.FZOrder := frm3D.FZOrder - ListParams.Settings.HeightRoom - 0.01;
|
||||||
frm3D.FZOrder := frm3D.FZOrder - MetreToUOM(ListParams.Settings.HeightRoom - 0.01);
|
frm3D.FZOrder := frm3D.FZOrder - MetreToUOM(ListParams.Settings.HeightRoom - 0.01);
|
||||||
//
|
//Tolik 24/07/2025--
|
||||||
|
//frm3d.FCadList.Add(GCadForm);
|
||||||
|
//SetLength(frm3d.FFloorsHeightArray, Length(frm3d.FFloorsHeightArray) + 1);
|
||||||
|
//frm3d.FFloorsHeightArray[Length(frm3d.FFloorsHeightArray) - 1] := frm3D.FZOrder - MetreToUOM(ListParams.Settings.HeightRoom + 0.01);
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
|
|||||||
@ -12555,7 +12555,6 @@ begin
|
|||||||
if aConnector.ID = ASnapConnector.ID then
|
if aConnector.ID = ASnapConnector.ID then
|
||||||
exit;
|
exit;
|
||||||
//
|
//
|
||||||
|
|
||||||
SwapConnectors := False;
|
SwapConnectors := False;
|
||||||
|
|
||||||
if CheckIsRaise(ASnapConnector) then
|
if CheckIsRaise(ASnapConnector) then
|
||||||
@ -24478,6 +24477,15 @@ var
|
|||||||
begin
|
begin
|
||||||
RaiseLine := Nil;
|
RaiseLine := Nil;
|
||||||
SnapConn := Nil;
|
SnapConn := Nil;
|
||||||
|
//Tolik 06/08/2025 -- тут дядим возможность создать наклонную трассу
|
||||||
|
if GCadForm.FAutoPosTraceBetweenRM then // если разрешены наклонные трассы
|
||||||
|
begin
|
||||||
|
Result := True;
|
||||||
|
SnapConn := ASnapConnector;
|
||||||
|
Snap_Type := 1; // просто коннектор на коннектор -- как есть
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
//
|
||||||
if compareValue(AConnector.ActualZOrder[1], ASnapConnector.ActualZOrder[1]) <> 0 then
|
if compareValue(AConnector.ActualZOrder[1], ASnapConnector.ActualZOrder[1]) <> 0 then
|
||||||
begin
|
begin
|
||||||
CreateRaiseOnConnector(AConnector, ASnapConnector.ActualZOrder[1]); // ńîçäŕňü đŕéç íŕ ęîííĺęňîđĺ
|
CreateRaiseOnConnector(AConnector, ASnapConnector.ActualZOrder[1]); // ńîçäŕňü đŕéç íŕ ęîííĺęňîđĺ
|
||||||
|
|||||||
@ -2,7 +2,7 @@ object DMCommon: TDMCommon
|
|||||||
OldCreateOrder = False
|
OldCreateOrder = False
|
||||||
OnCreate = DataModuleCreate
|
OnCreate = DataModuleCreate
|
||||||
Left = 57
|
Left = 57
|
||||||
Top = 240
|
Top = 144
|
||||||
Height = 584
|
Height = 584
|
||||||
Width = 956
|
Width = 956
|
||||||
object mtConnectionRelType: TkbmMemTable
|
object mtConnectionRelType: TkbmMemTable
|
||||||
@ -286,7 +286,7 @@ object DMCommon: TDMCommon
|
|||||||
Left = 394
|
Left = 394
|
||||||
Top = 25
|
Top = 25
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01013B004802300110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01013B004802340110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
000000000000360000002800000040000000F0000000010020000000000000F0
|
000000000000360000002800000040000000F0000000010020000000000000F0
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -2278,7 +2278,7 @@ object DMCommon: TDMCommon
|
|||||||
Left = 594
|
Left = 594
|
||||||
Top = 33
|
Top = 33
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010139003B00C40010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010139003B00C80010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
000000000000360000002800000040000000F0000000010020000000000000F0
|
000000000000360000002800000040000000F0000000010020000000000000F0
|
||||||
00000000000000000000000000000000000000000000BDBDBD00A5A5A5009C9C
|
00000000000000000000000000000000000000000000BDBDBD00A5A5A5009C9C
|
||||||
9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C
|
9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C9C009C9C
|
||||||
|
|||||||
@ -9,7 +9,7 @@ object F_MAIN: TF_MAIN
|
|||||||
BorderIcons = [biSystemMenu]
|
BorderIcons = [biSystemMenu]
|
||||||
BorderStyle = bsNone
|
BorderStyle = bsNone
|
||||||
Caption = #1053#1086#1088#1084#1072#1090#1080#1074#1085#1072#1103' '#1073#1072#1079#1072' '#1057#1050#1057' '#1082#1086#1084#1087#1086#1085#1077#1085#1090#1086#1074
|
Caption = #1053#1086#1088#1084#1072#1090#1080#1074#1085#1072#1103' '#1073#1072#1079#1072' '#1057#1050#1057' '#1082#1086#1084#1087#1086#1085#1077#1085#1090#1086#1074
|
||||||
ClientHeight = 696
|
ClientHeight = 689
|
||||||
ClientWidth = 357
|
ClientWidth = 357
|
||||||
Color = clWindow
|
Color = clWindow
|
||||||
Constraints.MinWidth = 160
|
Constraints.MinWidth = 160
|
||||||
@ -39,7 +39,7 @@ object F_MAIN: TF_MAIN
|
|||||||
TextHeight = 13
|
TextHeight = 13
|
||||||
object Panel_OKCancel: TPanel
|
object Panel_OKCancel: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 635
|
Top = 628
|
||||||
Width = 357
|
Width = 357
|
||||||
Height = 61
|
Height = 61
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
@ -52,6 +52,7 @@ object F_MAIN: TF_MAIN
|
|||||||
ParentFont = False
|
ParentFont = False
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
Visible = False
|
Visible = False
|
||||||
|
ExplicitTop = 635
|
||||||
object Label_Kolvo: TLabel
|
object Label_Kolvo: TLabel
|
||||||
Left = 16
|
Left = 16
|
||||||
Top = 8
|
Top = 8
|
||||||
@ -99,7 +100,7 @@ object F_MAIN: TF_MAIN
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 357
|
Width = 357
|
||||||
Height = 635
|
Height = 628
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
DockSite = True
|
DockSite = True
|
||||||
@ -110,9 +111,10 @@ object F_MAIN: TF_MAIN
|
|||||||
OnDblClick = Panel_Main1Click
|
OnDblClick = Panel_Main1Click
|
||||||
OnResize = Panel_MainResize
|
OnResize = Panel_MainResize
|
||||||
OnUnDock = Panel_MainUnDock
|
OnUnDock = Panel_MainUnDock
|
||||||
|
ExplicitHeight = 635
|
||||||
object Panel_Addition: TRzSizePanel
|
object Panel_Addition: TRzSizePanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 434
|
Top = 427
|
||||||
Width = 357
|
Width = 357
|
||||||
Height = 201
|
Height = 201
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
@ -123,6 +125,7 @@ object F_MAIN: TF_MAIN
|
|||||||
SizeBarWidth = 7
|
SizeBarWidth = 7
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
VisualStyle = vsClassic
|
VisualStyle = vsClassic
|
||||||
|
ExplicitTop = 434
|
||||||
object ToolBar_CompData: TToolBar
|
object ToolBar_CompData: TToolBar
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 47
|
Top = 47
|
||||||
@ -1294,7 +1297,7 @@ object F_MAIN: TF_MAIN
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 357
|
Width = 357
|
||||||
Height = 434
|
Height = 427
|
||||||
ActivePage = tsComponents
|
ActivePage = tsComponents
|
||||||
SaveResources = True
|
SaveResources = True
|
||||||
Align = alClient
|
Align = alClient
|
||||||
@ -1321,11 +1324,13 @@ object F_MAIN: TF_MAIN
|
|||||||
TabStyle = tsSquareCorners
|
TabStyle = tsSquareCorners
|
||||||
OnChange = pcObjectsChange
|
OnChange = pcObjectsChange
|
||||||
OnMouseMove = pcObjectsMouseMove
|
OnMouseMove = pcObjectsMouseMove
|
||||||
|
ExplicitHeight = 434
|
||||||
FixedDimension = 22
|
FixedDimension = 22
|
||||||
object tsTemplates: TRzTabSheet
|
object tsTemplates: TRzTabSheet
|
||||||
Hint = #1054#1073#1098#1077#1082#1090#1099
|
Hint = #1054#1073#1098#1077#1082#1090#1099
|
||||||
ImageIndex = 1
|
ImageIndex = 1
|
||||||
Caption = #1054#1073#1098#1077#1082#1090#1099
|
Caption = #1054#1073#1098#1077#1082#1090#1099
|
||||||
|
ExplicitHeight = 434
|
||||||
object lvTemplates: TRzListView
|
object lvTemplates: TRzListView
|
||||||
Left = 160
|
Left = 160
|
||||||
Top = 30
|
Top = 30
|
||||||
@ -1454,11 +1459,12 @@ object F_MAIN: TF_MAIN
|
|||||||
ImageIndex = 2
|
ImageIndex = 2
|
||||||
Caption = #1050#1086#1084#1087#1086#1085#1077#1085#1090#1099
|
Caption = #1050#1086#1084#1087#1086#1085#1077#1085#1090#1099
|
||||||
OnResize = tsComponentsResize
|
OnResize = tsComponentsResize
|
||||||
|
ExplicitHeight = 434
|
||||||
object Panel_Tree: TPanel
|
object Panel_Tree: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 332
|
Width = 332
|
||||||
Height = 434
|
Height = 427
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
Caption = #1055#1072#1087#1082#1080
|
Caption = #1055#1072#1087#1082#1080
|
||||||
@ -1476,6 +1482,7 @@ object F_MAIN: TF_MAIN
|
|||||||
OnEndDock = Panel_TreeEndDock
|
OnEndDock = Panel_TreeEndDock
|
||||||
OnMouseMove = Panel_TreeMouseMove
|
OnMouseMove = Panel_TreeMouseMove
|
||||||
OnStartDock = Panel_TreeStartDock
|
OnStartDock = Panel_TreeStartDock
|
||||||
|
ExplicitHeight = 434
|
||||||
object splFindInTree: TSplitter
|
object splFindInTree: TSplitter
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 201
|
Top = 201
|
||||||
@ -1580,7 +1587,7 @@ object F_MAIN: TF_MAIN
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 204
|
Top = 204
|
||||||
Width = 332
|
Width = 332
|
||||||
Height = 211
|
Height = 204
|
||||||
Align = alClient
|
Align = alClient
|
||||||
DoubleBuffered = True
|
DoubleBuffered = True
|
||||||
DragMode = dmAutomatic
|
DragMode = dmAutomatic
|
||||||
@ -1619,6 +1626,7 @@ object F_MAIN: TF_MAIN
|
|||||||
OnMouseMove = Tree_CatalogMouseMove
|
OnMouseMove = Tree_CatalogMouseMove
|
||||||
OnMouseUp = Tree_CatalogMouseUp
|
OnMouseUp = Tree_CatalogMouseUp
|
||||||
OnStartDrag = Tree_CatalogStartDrag
|
OnStartDrag = Tree_CatalogStartDrag
|
||||||
|
ExplicitHeight = 211
|
||||||
end
|
end
|
||||||
object Panel_New: TPanel
|
object Panel_New: TPanel
|
||||||
Left = -169
|
Left = -169
|
||||||
@ -1710,10 +1718,6 @@ object F_MAIN: TF_MAIN
|
|||||||
FixedDimension = 13
|
FixedDimension = 13
|
||||||
object tsFind: TRzTabSheet
|
object tsFind: TRzTabSheet
|
||||||
Caption = #1055#1086#1080#1089#1082
|
Caption = #1055#1086#1080#1089#1082
|
||||||
ExplicitLeft = 0
|
|
||||||
ExplicitTop = 0
|
|
||||||
ExplicitWidth = 0
|
|
||||||
ExplicitHeight = 0
|
|
||||||
object Panel2: TPanel
|
object Panel2: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
@ -2167,13 +2171,14 @@ object F_MAIN: TF_MAIN
|
|||||||
end
|
end
|
||||||
object pnFilterIsOn: TRzPanel
|
object pnFilterIsOn: TRzPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 415
|
Top = 408
|
||||||
Width = 332
|
Width = 332
|
||||||
Height = 19
|
Height = 19
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
BorderInner = fsFlat
|
BorderInner = fsFlat
|
||||||
BorderOuter = fsNone
|
BorderOuter = fsNone
|
||||||
TabOrder = 4
|
TabOrder = 4
|
||||||
|
ExplicitTop = 415
|
||||||
object lbFilterIsOn: TRzLabel
|
object lbFilterIsOn: TRzLabel
|
||||||
Left = 8
|
Left = 8
|
||||||
Top = 2
|
Top = 2
|
||||||
@ -2216,6 +2221,7 @@ object F_MAIN: TF_MAIN
|
|||||||
Caption = #1043#1088#1091#1087#1087#1099
|
Caption = #1043#1088#1091#1087#1087#1099
|
||||||
ParentShowHint = False
|
ParentShowHint = False
|
||||||
ShowHint = False
|
ShowHint = False
|
||||||
|
ExplicitHeight = 434
|
||||||
object Splitter1: TSplitter
|
object Splitter1: TSplitter
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 105
|
Top = 105
|
||||||
@ -2551,7 +2557,7 @@ object F_MAIN: TF_MAIN
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 108
|
Top = 108
|
||||||
Width = 332
|
Width = 332
|
||||||
Height = 326
|
Height = 319
|
||||||
SmoothExpandCollapse = False
|
SmoothExpandCollapse = False
|
||||||
FitColumnToClientWidth = True
|
FitColumnToClientWidth = True
|
||||||
RightClickSelect = True
|
RightClickSelect = True
|
||||||
@ -8298,7 +8304,7 @@ object F_MAIN: TF_MAIN
|
|||||||
Left = 200
|
Left = 200
|
||||||
Top = 152
|
Top = 152
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010104005001240310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010104005001280310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000002000000001002000000000000020
|
0000000000003600000028000000400000002000000001002000000000000020
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
object F_ResourceReport: TF_ResourceReport
|
object F_ResourceReport: TF_ResourceReport
|
||||||
Left = 251
|
Left = 251
|
||||||
Top = 5
|
Top = 0
|
||||||
HelpContext = 87000
|
HelpContext = 87000
|
||||||
BorderIcons = [biSystemMenu, biMinimize]
|
BorderIcons = [biSystemMenu, biMinimize]
|
||||||
BorderStyle = bsSingle
|
BorderStyle = bsSingle
|
||||||
Caption = #1054#1090#1095#1077#1090#1099
|
Caption = #1054#1090#1095#1077#1090#1099
|
||||||
ClientHeight = 705
|
ClientHeight = 689
|
||||||
ClientWidth = 948
|
ClientWidth = 948
|
||||||
Color = clBtnFace
|
Color = clBtnFace
|
||||||
Font.Charset = DEFAULT_CHARSET
|
Font.Charset = DEFAULT_CHARSET
|
||||||
@ -23,12 +23,13 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
TextHeight = 13
|
TextHeight = 13
|
||||||
object gbViewClose: TRzGroupBox
|
object gbViewClose: TRzGroupBox
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 664
|
Top = 648
|
||||||
Width = 948
|
Width = 948
|
||||||
Height = 41
|
Height = 41
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
OnResize = gbViewCloseResize
|
OnResize = gbViewCloseResize
|
||||||
|
ExplicitTop = 664
|
||||||
object btShowReport: TRzBitBtn
|
object btShowReport: TRzBitBtn
|
||||||
Left = 112
|
Left = 112
|
||||||
Top = 13
|
Top = 13
|
||||||
@ -137,24 +138,26 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 44
|
Top = 44
|
||||||
Width = 948
|
Width = 948
|
||||||
Height = 620
|
Height = 604
|
||||||
Align = alClient
|
Align = alClient
|
||||||
BorderOuter = fsNone
|
BorderOuter = fsNone
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
|
ExplicitHeight = 620
|
||||||
object splitTarget: TSplitter
|
object splitTarget: TSplitter
|
||||||
Left = 209
|
Left = 209
|
||||||
Top = 0
|
Top = 0
|
||||||
Height = 443
|
Height = 427
|
||||||
ExplicitHeight = 449
|
ExplicitHeight = 449
|
||||||
end
|
end
|
||||||
object pnParamsAndModes: TRzPanel
|
object pnParamsAndModes: TRzPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 443
|
Top = 427
|
||||||
Width = 948
|
Width = 948
|
||||||
Height = 177
|
Height = 177
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
BorderOuter = fsNone
|
BorderOuter = fsNone
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
|
ExplicitTop = 443
|
||||||
object RzGroupBox1: TRzGroupBox
|
object RzGroupBox1: TRzGroupBox
|
||||||
Left = 4
|
Left = 4
|
||||||
Top = -1
|
Top = -1
|
||||||
@ -641,6 +644,8 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
object tsMarkPagesParams: TRzTabSheet
|
object tsMarkPagesParams: TRzTabSheet
|
||||||
TabVisible = False
|
TabVisible = False
|
||||||
Caption = 'tsMarkPagesParams'
|
Caption = 'tsMarkPagesParams'
|
||||||
|
ExplicitWidth = 0
|
||||||
|
ExplicitHeight = 0
|
||||||
object lbNoCabinet: TLabel
|
object lbNoCabinet: TLabel
|
||||||
Left = 256
|
Left = 256
|
||||||
Top = 64
|
Top = 64
|
||||||
@ -732,6 +737,8 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
object tsCablePathParams: TRzTabSheet
|
object tsCablePathParams: TRzTabSheet
|
||||||
TabVisible = False
|
TabVisible = False
|
||||||
Caption = 'tsCablePathParams'
|
Caption = 'tsCablePathParams'
|
||||||
|
ExplicitWidth = 0
|
||||||
|
ExplicitHeight = 0
|
||||||
object Label5: TLabel
|
object Label5: TLabel
|
||||||
Left = 8
|
Left = 8
|
||||||
Top = 106
|
Top = 106
|
||||||
@ -867,14 +874,15 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
Left = 212
|
Left = 212
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 736
|
Width = 736
|
||||||
Height = 443
|
Height = 427
|
||||||
Align = alClient
|
Align = alClient
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
|
ExplicitHeight = 443
|
||||||
object tvReports: TFlyTreeViewPro
|
object tvReports: TFlyTreeViewPro
|
||||||
Left = 1
|
Left = 1
|
||||||
Top = 14
|
Top = 14
|
||||||
Width = 734
|
Width = 734
|
||||||
Height = 428
|
Height = 412
|
||||||
SelectedTextColor = clWhite
|
SelectedTextColor = clWhite
|
||||||
Align = alClient
|
Align = alClient
|
||||||
PopupMenu = pmReports
|
PopupMenu = pmReports
|
||||||
@ -899,6 +907,7 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
ShowRoot = False
|
ShowRoot = False
|
||||||
ShowImages = True
|
ShowImages = True
|
||||||
StructureCol = 1
|
StructureCol = 1
|
||||||
|
ExplicitHeight = 428
|
||||||
Data = {
|
Data = {
|
||||||
29010000010000000610540046006C0079004E006F00640065000F0100000612
|
29010000010000000610540046006C0079004E006F00640065000F0100000612
|
||||||
430065006C006C00730054006500780074004200000006280D000A0054006600
|
430065006C006C00730054006500780074004200000006280D000A0054006600
|
||||||
@ -1113,7 +1122,7 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
060E560069007300690062006C006500D004000001060A570069006400740068
|
060E560069007300690062006C006500D004000001060A570069006400740068
|
||||||
00E40400001302000000000000}
|
00E40400001302000000000000}
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01010100DC00700210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01010100DC00740210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000001000000001002000000000000010
|
0000000000003600000028000000400000001000000001002000000000000010
|
||||||
000000000000000000000000000000000000FFFFFF00FF9C0000CE630000CE63
|
000000000000000000000000000000000000FFFFFF00FF9C0000CE630000CE63
|
||||||
0000CE630000CE630000CE630000CE630000CE630000CE630000CE630000FFFF
|
0000CE630000CE630000CE630000CE630000CE630000CE630000CE630000FFFF
|
||||||
@ -1273,10 +1282,11 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 209
|
Width = 209
|
||||||
Height = 443
|
Height = 427
|
||||||
Align = alLeft
|
Align = alLeft
|
||||||
Caption = #1054#1090#1095#1077#1090' '#1076#1083#1103'...'
|
Caption = #1054#1090#1095#1077#1090' '#1076#1083#1103'...'
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
|
ExplicitHeight = 443
|
||||||
object RzLabel1: TRzLabel
|
object RzLabel1: TRzLabel
|
||||||
Left = 3
|
Left = 3
|
||||||
Top = 326
|
Top = 326
|
||||||
@ -1458,7 +1468,7 @@ object F_ResourceReport: TF_ResourceReport
|
|||||||
Left = 16
|
Left = 16
|
||||||
Top = 224
|
Top = 224
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01010C00D400740210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01010C00D400780210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000004000000001002000000000000040
|
0000000000003600000028000000400000004000000001002000000000000040
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
|||||||
@ -3,7 +3,7 @@ object DM: TDM
|
|||||||
OnCreate = DataModuleCreate
|
OnCreate = DataModuleCreate
|
||||||
OnDestroy = DataModuleDestroy
|
OnDestroy = DataModuleDestroy
|
||||||
Left = 131
|
Left = 131
|
||||||
Top = 165
|
Top = 13
|
||||||
Height = 715
|
Height = 715
|
||||||
Width = 1022
|
Width = 1022
|
||||||
object Database_SCS: TpFIBDatabase
|
object Database_SCS: TpFIBDatabase
|
||||||
@ -321,7 +321,7 @@ object DM: TDM
|
|||||||
Left = 426
|
Left = 426
|
||||||
Top = 16
|
Top = 16
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C0101150044005C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010115004400600110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000006000000001002000000000000060
|
0000000000003600000028000000400000006000000001002000000000000060
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -1126,7 +1126,7 @@ object DM: TDM
|
|||||||
Left = 493
|
Left = 493
|
||||||
Top = 2
|
Top = 2
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01010200440014011A001900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01010200440018011A001900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
000000000000360000002800000068000000190000000100200000000000A028
|
000000000000360000002800000068000000190000000100200000000000A028
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -1474,7 +1474,7 @@ object DM: TDM
|
|||||||
Left = 492
|
Left = 492
|
||||||
Top = 41
|
Top = 41
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01013F0044002C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01013F004400300110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000000001000001002000000000000000
|
0000000000003600000028000000400000000001000001002000000000000000
|
||||||
0100000000000000000000000000000000000000000000000000000000000000
|
0100000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -3652,7 +3652,7 @@ object DM: TDM
|
|||||||
object ImageList_InterfType: TImageList
|
object ImageList_InterfType: TImageList
|
||||||
Left = 554
|
Left = 554
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010101004400140110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010101004400180110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000001000000001002000000000000010
|
0000000000003600000028000000400000001000000001002000000000000010
|
||||||
0000000000000000000000000000000000004D4F4F004D4F4F00000000000000
|
0000000000000000000000000000000000004D4F4F004D4F4F00000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -9419,7 +9419,7 @@ object DM: TDM
|
|||||||
Left = 600
|
Left = 600
|
||||||
Top = 16
|
Top = 16
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010105004400080110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101050044000C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000002000000001002000000000000020
|
0000000000003600000028000000400000002000000001002000000000000020
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -9718,7 +9718,7 @@ object DM: TDM
|
|||||||
Left = 480
|
Left = 480
|
||||||
Top = 80
|
Top = 80
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010102004400140110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C010102004400180110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000001000000001002000000000000010
|
0000000000003600000028000000400000001000000001002000000000000010
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -9965,7 +9965,7 @@ object DM: TDM
|
|||||||
Left = 1018
|
Left = 1018
|
||||||
Top = 240
|
Top = 240
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010113004400080110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101130044000C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000005000000001002000000000000050
|
0000000000003600000028000000400000005000000001002000000000000050
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -10638,7 +10638,7 @@ object DM: TDM
|
|||||||
Left = 1109
|
Left = 1109
|
||||||
Top = 234
|
Top = 234
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01010200440008011A001900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101020044000C011A001900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
000000000000360000002800000068000000190000000100200000000000A028
|
000000000000360000002800000068000000190000000100200000000000A028
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -10986,7 +10986,7 @@ object DM: TDM
|
|||||||
Left = 1210
|
Left = 1210
|
||||||
Top = 240
|
Top = 240
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010101004400080110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101010044000C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000001000000001002000000000000010
|
0000000000003600000028000000400000001000000001002000000000000010
|
||||||
0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
|
0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
|
||||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
|
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||||
@ -11129,7 +11129,7 @@ object DM: TDM
|
|||||||
Left = 1100
|
Left = 1100
|
||||||
Top = 289
|
Top = 289
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C01013F004400080110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C01013F0044000C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000000001000001002000000000000000
|
0000000000003600000028000000400000000001000001002000000000000000
|
||||||
0100000000000000000000000000000000000000000000000000000000000000
|
0100000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
@ -13252,7 +13252,7 @@ object DM: TDM
|
|||||||
Left = 1104
|
Left = 1104
|
||||||
Top = 344
|
Top = 344
|
||||||
Bitmap = {
|
Bitmap = {
|
||||||
494C010102004400080110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
494C0101020044000C0110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
|
||||||
0000000000003600000028000000400000001000000001002000000000000010
|
0000000000003600000028000000400000001000000001002000000000000010
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user