update

Author: vananiev

LineTest.plf

@@ -0,0 +1 @@
+2 2 PBase PBase1 128 55 49 12 1 big_system ������� 0 - - (0,0) (0,0) (0,0)  2 (0,0) (515000,0)  PBase PBase2 355 108 77 12 1 consumer ����������� 1 - - (1.4e+08,1.2e+08) (1.4e+08,1.2e+08) (1.4e+08,1.2e+08)  1 PBase1 PBase2 w1 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 300 0.0722 0.0765645 0.0765645 0.0765645 0.53 1e-08 0 1000 0 1.5708 35 35 35 35 0.5 0.6 1090 0.0275 0.011 1490 1000 400 14.5 14.5 3 0.73 1000 2 0 (-12,27.2) (0,27.2) (12,27.2) (-9,32.2) (9,32.2) 0 1 

LineTest.plf.500

@@ -0,0 +1 @@
+2 2 PBase PBase1 128 55 49 12 1 big_system ������� 0 - - (0,0) (0,0) (0,0)  2 (0,0) (515000,0)  PBase PBase2 355 108 77 12 1 consumer ����������� 1 - - (2.13333e+08,1.4e+08) (2.13333e+08,1.4e+08) (2.13333e+08,1.4e+08)  1 PBase1 PBase2 w1 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 200 0.0722 0.0722 0.0722 0.0722 0.53 1e-08 0 500 0 1.5708 20 20 20 20 0.5 0.6 1090 0.0275 0.011 1490 1000 400 14.5 14.5 3 0.73 1000 2 0 (-12,27.2) (0,27.2) (12,27.2) (-9,32.2) (9,32.2) 0 1 

PNGImage/pngimage.dcu

@@ -13,6 +13,7 @@
 #include "line_parameters.h"
 typedef  TfrmProperty  HelpForm;       // êëàññ ôîðìû êîòîðàÿ áóäåò âûçâàíà â êà÷åñòâå ôîðìû ñâîéñòâ
 typedef  TfrmLine_parameters  LineParametersForm;       // êëàññ ôîðìû êîòîðàÿ áóäåò âûçâàíà â êà÷åñòâå ôîðìû ïàðàìåòðîâ ëèíèè
+extern vector<LineParametersForm*> LineParametersForms;
 //---------------------------------------------------------------------------
 static inline void ValidCtrCheck(PBase *)
 {
@@ -312,12 +313,14 @@ PLinkComponent::PLinkComponent(TComponent *owner){
 }
 //---------------------------------------------------------------------------
 PLinkComponent::~PLinkComponent(){
+   /*
    vector<link*>::iterator iter = Links.begin();
     while( iter != Links.end() )
     {
       delete *iter;
       ++iter;
-    }
+    } */
+   Clear();
 }
 //---------------------------------------------------------------------------
 void __fastcall PLinkComponent::MenuItemClick(TObject *Sender){
@@ -346,6 +349,7 @@ void __fastcall PLinkComponent::MenuItemClick(TObject *Sender){
       LineParametersForm *frmP = new LineParametersForm(NULL);
       frmP->Line = Links[menuFor];
       frmP->Show();
+      LineParametersForms.push_back(frmP);
       }
 }
 //---------------------------------------------------------------------------
@@ -471,6 +475,13 @@ void __fastcall PLinkComponent::Paint(){
 }
 //---------------------------------------------------------------------------
 void PLinkComponent::Clear(){
+   // çàêðûâàåì ôîðìû
+   for(int i=0, n=LineParametersForms.size(); i<n; i++){
+      LineParametersForms[i]->Timer->Enabled = false;
+      delete LineParametersForms[i]; 	LineParametersForms[i] = NULL;
+   	}
+   LineParametersForms.clear();
+   // î÷èùàåì îáúåêòû
    vector<link*>::iterator iter = Links.begin();
     while( iter != Links.end() )
     {