diff --git a/Notice d'utilisation des signaux_complexes_GL_V10.54.pdf b/Notice d'utilisation des signaux_complexes_GL_V10.6.pdf similarity index 84% rename from Notice d'utilisation des signaux_complexes_GL_V10.54.pdf rename to Notice d'utilisation des signaux_complexes_GL_V10.6.pdf index db0f607..6b18986 100644 Binary files a/Notice d'utilisation des signaux_complexes_GL_V10.54.pdf and b/Notice d'utilisation des signaux_complexes_GL_V10.6.pdf differ diff --git a/UnitCompteur.pas b/UnitCompteur.pas index 4dfe17f..0afa421 100644 --- a/UnitCompteur.pas +++ b/UnitCompteur.pas @@ -55,10 +55,10 @@ type end; type - typ=(Trien,fen,gb,im); // un compteur peut être de la fenetre 'formCompteur' (fen), des groupBox de la fenetre principale (gb) ou d'une image (onglet compteurs formConfig) + typ=(Trien,fen,gb,im); // indique où se situe le compteur : dans la fenetre 'formCompteur' (fen), un des groupBox de la fenetre principale (gb) ou d'une image (onglet compteurs formConfig) TTcompteur=array[1..1] of record - FcBitMap : Tbitmap; - paramcompt : TparamCompt; + FcBitMap : Tbitmap; + paramcompt : TparamCompt; end; var @@ -293,7 +293,7 @@ begin with param do begin AngleFin:=170; // 170 angle fin des graduations - r:=redx; // réduction + r:=redx; // facteur réduction de la fenetre du compteur rg:=round(AigCX/1.05); // rayon des graduations rayon2:=Rg-round(10*r); // rayon de fin des graduations rayon3:=Rg-round(20*r); @@ -313,8 +313,8 @@ begin font.Name:='Arial';; font.color:=ParamCompteur[2].CoulNum; - font.size:=round(r*20); font.style:=[fsbold]; + font.size:=round(r*15*RedFonte); {$IF CompilerVersion >= 28.0} font.orientation:=0; {$IFEND} @@ -418,7 +418,7 @@ begin brush.color:=clBlack; pen.color:=ParamCompteur[3].coulgrad; font.color:=ParamCompteur[3].CoulNum; - font.size:=round(r*20); + font.size:=round(r*20*RedFonte); // taille de la fonte constante même si changement % affichage windows //Affiche(intToSTR(font.size),clred); font.style:=[]; end; @@ -516,10 +516,10 @@ begin Brush.Style:=bsSolid; Brush.Color:=$1F1A17; font.color:=ParamCompteur[1].CoulNum; - font.size:=round(redx*10); {$IF CompilerVersion >= 28.0} font.orientation:=0; {$IFEND} + font.size:=round(redx*10*RedFonte); TextOut(round(50*redX),round(128*redY),'0'); TextOut(round(36*redX),round(90*redY),'20'); TextOut(round(50*redX),round(54*redY),'40'); @@ -926,6 +926,7 @@ begin Width:=400; canvas.fillrect(rect(0,0,400,30)); end; + LabelTrain.Font.Size:=round(14*RedFonte); end; procedure TFormCompteur.TrackBarCChange(Sender: TObject); diff --git a/UnitConfig.dfm b/UnitConfig.dfm index 09b8497..45afad1 100644 --- a/UnitConfig.dfm +++ b/UnitConfig.dfm @@ -670,7 +670,7 @@ object FormConfig: TFormConfig Top = 8 Width = 633 Height = 505 - ActivePage = TabSheetTrains + ActivePage = TabSheetPN Font.Charset = DEFAULT_CHARSET Font.Color = clBlack Font.Height = -11 @@ -1189,7 +1189,7 @@ object FormConfig: TFormConfig 'S'#233'lection du style d'#39#39'affichage - Le style sera chang'#233' '#224' la ferm' + 'eture de la fen'#234'tre'#39 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 ParentShowHint = False ShowHint = True TabOrder = 0 @@ -2425,7 +2425,7 @@ object FormConfig: TFormConfig Width = 137 Height = 21 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 TabOrder = 1 OnChange = ComboBoxDecChange end @@ -2556,7 +2556,7 @@ object FormConfig: TFormConfig Width = 137 Height = 21 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 TabOrder = 2 OnChange = ComboBoxAspChange end @@ -2864,7 +2864,7 @@ object FormConfig: TFormConfig Top = 56 Width = 193 Height = 21 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 0 OnChange = ComboBoxDecodeurPersoChange end @@ -2883,7 +2883,7 @@ object FormConfig: TFormConfig Width = 145 Height = 21 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 TabOrder = 2 OnChange = ComboBoxNationChange end @@ -2929,7 +2929,7 @@ object FormConfig: TFormConfig Width = 193 Height = 21 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 TabOrder = 6 OnChange = ComboBoxDecCdeChange end @@ -3142,7 +3142,7 @@ object FormConfig: TFormConfig Top = 96 Width = 137 Height = 21 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 2 OnChange = ComboBoxOperateurChange OnDrawItem = ComboBoxOperateurDrawItem @@ -3162,7 +3162,7 @@ object FormConfig: TFormConfig Top = 96 Width = 161 Height = 21 - ItemHeight = 0 + ItemHeight = 13 ParentShowHint = False ShowHint = True TabOrder = 4 @@ -3263,7 +3263,7 @@ object FormConfig: TFormConfig Width = 145 Height = 21 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 TabOrder = 7 OnChange = ComboBoxFLChange end @@ -3645,7 +3645,7 @@ object FormConfig: TFormConfig Font.Style = [fsBold] ParentFont = False end - object GroupBox13: TGroupBox + object GroupBoxGPN: TGroupBox Left = 336 Top = 24 Width = 281 @@ -3807,13 +3807,13 @@ object FormConfig: TFormConfig OnClick = RadioGroupActPNClick end object ComboBoxPNCom: TComboBox - Left = 8 + Left = 16 Top = 152 Width = 145 Height = 21 Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "p'#233'riph'#233'riques COM/USB"' Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 ParentShowHint = False ShowHint = True TabOrder = 10 @@ -4114,10 +4114,23 @@ object FormConfig: TFormConfig end object ImageTrain: TImage Left = 16 - Top = 392 + Top = 384 Width = 257 Height = 49 end + object LabelTitreTrain: TLabel + Left = 16 + Top = 448 + Width = 4 + Height = 19 + Caption = ' ' + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = 'Arial' + Font.Style = [fsBold] + ParentFont = False + end object ButtonNT: TButton Left = 0 Top = 32 @@ -4160,7 +4173,7 @@ object FormConfig: TFormConfig Top = 16 Width = 337 Height = 457 - ActivePage = TabSheetTrGen + ActivePage = TabSheet1 TabOrder = 3 object TabSheetTrGen: TTabSheet Caption = 'G'#233'n'#233'ral' @@ -5524,7 +5537,7 @@ object FormConfig: TFormConfig Width = 153 Height = 21 Style = csDropDownList - ItemHeight = 0 + ItemHeight = 13 TabOrder = 0 OnChange = ComboBoxUSBTrChange end diff --git a/UnitConfig.pas b/UnitConfig.pas index c37f917..498cb2b 100644 --- a/UnitConfig.pas +++ b/UnitConfig.pas @@ -92,7 +92,7 @@ type GroupBox12: TGroupBox; ImageSignal: TImage; LabelAdrSig: TLabel; - GroupBox13: TGroupBox; + GroupBoxGPN: TGroupBox; LabelDec: TLabel; LabelDetAss: TLabel; LabelElSuiv: TLabel; @@ -509,6 +509,7 @@ type LabelV3Cons: TLabel; Label83: TLabel; Label84: TLabel; + LabelTitreTrain: TLabel; procedure ButtonAppliquerEtFermerClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure ListBoxAigMouseDown(Sender: TObject; Button: TMouseButton; @@ -7054,6 +7055,11 @@ procedure champs_pn_act; begin with formConfig do begin + EditAdrFerme.text:=IntToSTR(Tablo_PN[lignecliqueePN+1].AdresseFerme); + EditAdrOuvre.text:=IntToSTR(Tablo_PN[lignecliqueePN+1].AdresseOuvre); + EditCdeFerme.text:=intToSTR(Tablo_PN[lignecliqueePN+1].CommandeFerme); + EditCdeOuvre.text:=intToSTR(Tablo_PN[lignecliqueePN+1].CommandeOuvre); + comboBoxPNCom.Visible:=false; EditCdeOuvre.width:=25; editCdeFerme.Width:=25; @@ -7063,8 +7069,8 @@ begin ButtonTestFerme.Top:=EditAdrFerme.Top; ButtonTestOuvre.Top:=EditAdrOuvre.Top; - editCdeFerme.Left:=168; - editCdeOuvre.Left:=168; + EditCdeFerme.Left:=EditAdrFerme.Left+EditAdrFerme.width+10; + EditCdeOuvre.Left:=EditAdrOuvre.Left+EditAdrOuvre.width+10; EditCdeOuvre.Hint:='Commande d''ouverture (0 à 2)'; EditCdeFerme.Hint:='Commande de fermeture (0 à 2)'; @@ -7076,12 +7082,10 @@ begin EditAdrFerme.Visible:=true; Label22.visible:=true; CheckPnPulse.Visible:=true; - CheckPnPulse.top:=140; + CheckPnPulse.top:=EditCdeOuvre.Top+EditCdeOuvre.Height+10; + Label21.Caption:='Adresse de fermeture'; - EditAdrFerme.text:=IntToSTR(Tablo_PN[lignecliqueePN+1].AdresseFerme); - EditAdrOuvre.text:=IntToSTR(Tablo_PN[lignecliqueePN+1].AdresseOuvre); - EditCdeFerme.text:=intToSTR(Tablo_PN[lignecliqueePN+1].CommandeFerme); - EditCdeOuvre.text:=intToSTR(Tablo_PN[lignecliqueePN+1].CommandeOuvre); + end; end; @@ -7089,27 +7093,36 @@ procedure champs_pn_COMUSBSockets; begin with formConfig do begin + EditCdeFerme.Text:=Tablo_PN[lignecliqueePN+1].CommandeF; + EditCdeOuvre.Text:=Tablo_PN[lignecliqueePN+1].CommandeO; + comboBoxPNCom.Visible:=true; ComboBoxPNCom.Width:=150; - ComboBoxPNCom.Left:=4; - ComboBoxPNCom.top:=120; + ComboBoxPNCom.Left:=8; + EditAdrFerme.visible:=false; editAdrOuvre.Visible:=false; CheckPnPulse.Visible:=false; EditCdeOuvre.width:=50; editCdeFerme.width:=50; - editCdeFerme.top:=120;ButtonTestFerme.Top:=120;ButtonTestFerme.Top:=120; - editCdeOuvre.top:=150;ButtonTestOuvre.Top:=150;ButtonTestOuvre.Top:=150; - editCdeFerme.Left:=160; - editCdeOuvre.Left:=160; + editCdeFerme.top:=Label21.top+Label21.Height+10; + + ButtonTestFerme.Top:=Label21.top+Label21.Height+10; + editCdeOuvre.top:=ButtonTestFerme.top+ButtonTestFerme.Height+10; + ButtonTestOuvre.Top:=ButtonTestFerme.top+ButtonTestFerme.Height+10; + + EditCdeFerme.Left:=EditAdrFerme.Left+EditAdrFerme.width+10; + EditCdeOuvre.Left:=EditAdrOuvre.Left+EditAdrOuvre.width+10; + + ComboBoxPNCom.top:=ButtonTestFerme.Top; + ButtonTestFerme.Hint:='Test de fermeture (par interface COM/USB)'; ButtonTestOuvre.Hint:='Test d''ouverture (par interface COM/USB)'; editcdeFerme.Hint:='Commande ASCII de fermeture'; EditCdeOuvre.Hint:='Commande ASCII d''ouverture'; Label22.visible:=false; Label21.Caption:='Périphérique COM/USB/Socket Commandes'; - EditCdeFerme.Text:=Tablo_PN[lignecliqueePN+1].CommandeF; - EditCdeOuvre.Text:=Tablo_PN[lignecliqueePN+1].CommandeO; + ComboBoxPnCom.ItemIndex:=Tablo_PN[lignecliqueePN+1].AdresseFerme-1; CheckPNPulse.Visible:=false; end; @@ -7319,6 +7332,7 @@ begin ButtonRdt.Caption:=s; editNomTrain.text:=Trains[index].nom_train; + LabelTitreTrain.Caption:=Trains[index].nom_train; editAdresseTrain.Text:=intToSTR(trains[index].adresse); editVitesseMaxi.Text:=intToSTR(trains[index].vitmax); editLongLoco.text:=IntToSTR(trains[index].longueur); @@ -7662,12 +7676,12 @@ begin begin Left:=1; Top:=32; - width:=617; + width:=round(617/redfonte); Height:=420; TitleCaptions[0]:='Désignation'; TitleCaptions[1]:='Valeur'; - ColWidths[0]:=420; + ColWidths[0]:=round(420/RedFonte); // création des lignes de la liste for i:=1 to 22 do @@ -7811,9 +7825,9 @@ begin RowCount:=NbDetArret+1; Options := StringGridArr.Options + [goEditing]; ColWidths[0]:=0; // colonne grise invisible - ColWidths[1]:=70; // Précédent - ColWidths[2]:=70; // détecteur - ColWidths[3]:=55; // temps + ColWidths[1]:=round(70/RedFonte); // Précédent + ColWidths[2]:=round(70/RedFonte); // détecteur + ColWidths[3]:=round(55/RedFonte); // temps Cells[1,0]:='Précédent'; Cells[2,0]:='Détecteur'; @@ -7828,7 +7842,7 @@ begin {$IFEND} {$IFDEF WIN64} // si compilé en 64 bits labelD12.Caption:='D12 x64'; - LabelD12.Left:=730; + LabelD12.Left:=LabelD12.Left-30; {$ENDIF} // création des champs dynamiques de l'onglet décodeurs personnalisés @@ -7961,7 +7975,7 @@ begin Left:=8; top:=GroupBoxPN.Top+GroupBoxPN.Height+5; width:=GroupBoxPN.Width; - height:=190; + height:=GroupBoxGPN.height-GroupBoxPN.Height-40; visible:=true; end; with GroupBoxPNZ do @@ -7969,7 +7983,7 @@ begin Left:=8; top:=GroupBoxPN.Top+GroupBoxPN.Height+5; width:=GroupBoxPN.Width; - height:=190; + height:=GroupBoxGPN.height-GroupBoxPN.Height-40; visible:=false; end; @@ -7977,7 +7991,7 @@ begin with LbATitre do begin Left:=64;Top:=20;Width:=50;Height:=12; - caption:='Act ferme Act ouvre'; + caption:='Act ferme Act ouvre'; name:='LbATitre'; parent:=GroupBoxPNA; end; @@ -8185,7 +8199,7 @@ begin with EditZDet2V1F do begin Name:='EditZDet2V1F'; - left:=100;Top:=50;Width:=35;Height:=21; + left:=104;Top:=50;Width:=35;Height:=21; text:=''; hint:='Détecteur 2 de fermeture'; showhint:=true; @@ -8196,7 +8210,7 @@ begin with EditZDet1V1O do begin Name:='EditZDet1V1O'; - left:=152;Top:=50;Width:=35;Height:=21; + left:=164;Top:=50;Width:=35;Height:=21; text:=''; hint:='Détecteur 1 d''ouverture'; showhint:=true; @@ -8207,7 +8221,7 @@ begin with EditZDet2V1O do begin Name:='EditZDet2V1O'; - left:=190;Top:=50;Width:=35;Height:=21; + left:=204;Top:=50;Width:=35;Height:=21; text:=''; hint:='Détecteur 2 d''ouverture'; showhint:=true; @@ -8238,7 +8252,7 @@ begin with EditZDet2V2F do begin Name:='EditZDet2V2F'; - left:=100;Top:=74;Width:=35;Height:=21; + left:=104;Top:=74;Width:=35;Height:=21; text:=''; hint:='Détecteur 2 de fermeture'; showhint:=true; @@ -8249,7 +8263,7 @@ begin with EditZDet1V2O do begin Name:='EditZDet1V2O'; - left:=152;Top:=74;Width:=35;Height:=21; + left:=164;Top:=74;Width:=35;Height:=21; text:=''; hint:='Détecteur 1 d''ouverture'; showhint:=true; @@ -8260,7 +8274,7 @@ begin with EditZDet2V2O do begin Name:='EditZDet2V2O'; - left:=190;Top:=74;Width:=35;Height:=21; + left:=204;Top:=74;Width:=35;Height:=21; text:=''; hint:='Détecteur 2 d''ouverture'; showhint:=true; @@ -8292,7 +8306,7 @@ begin with EditZDet2V3F do begin Name:='EditZDet2V3F'; - left:=100;Top:=98;Width:=35;Height:=21; + left:=104;Top:=98;Width:=35;Height:=21; text:=''; hint:='Détecteur 2 de fermeture'; showhint:=true; @@ -8303,7 +8317,7 @@ begin with EditZDet1V3O do begin Name:='EditZDet1V3O'; - left:=152;Top:=98;Width:=35;Height:=21; + left:=164;Top:=98;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 1 d''ouverture'; @@ -8314,7 +8328,7 @@ begin with EditZDet2V3O do begin Name:='EditZDet2V3O'; - left:=190;Top:=98;Width:=35;Height:=21; + left:=204;Top:=98;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 2 d''ouverture'; @@ -8345,7 +8359,7 @@ begin with EditZDet2V4F do begin Name:='EditZDet2V4F'; - left:=100;Top:=122;Width:=35;Height:=21; + left:=104;Top:=122;Width:=35;Height:=21; text:=''; hint:='Détecteur 2 de fermeture'; showhint:=true; @@ -8356,7 +8370,7 @@ begin with EditZDet1V4O do begin Name:='EditZDet1V4O'; - left:=152;Top:=122;Width:=35;Height:=21; + left:=164;Top:=122;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 1 d''ouverture'; @@ -8367,7 +8381,7 @@ begin with EditZDet2V4O do begin Name:='EditZDet2V4O'; - left:=190;Top:=122;Width:=35;Height:=21; + left:=204;Top:=122;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 2 d''ouverture'; @@ -8398,7 +8412,7 @@ begin with EditZDet2V5F do begin Name:='EditZDet2V5F'; - left:=100;Top:=146;Width:=35;Height:=21; + left:=104;Top:=146;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 2 de fermeture'; @@ -8409,7 +8423,7 @@ begin with EditZDet1V5O do begin Name:='EditZDet1V5O'; - left:=152;Top:=146;Width:=35;Height:=21; + left:=164;Top:=146;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 1 d''ouverture'; @@ -8420,7 +8434,7 @@ begin with EditZDet2V5O do begin Name:='EditZDet2V5O'; - left:=190;Top:=146;Width:=35;Height:=21; + left:=204;Top:=146;Width:=35;Height:=21; text:=''; parent:=GroupBoxPNZ; hint:='Détecteur 2 d''ouverture'; @@ -8712,6 +8726,7 @@ begin label72.caption:='La rotation de bouton changera la vitesse du train. L''appui sur le bouton stoppe le train.'+#13+ 'Les évènements clavier sont interceptés par signaux complexes ce qui ne nécessite pas d''activer la fenêtre'; + { with GroupBoxBr do begin Left:=312; @@ -8727,7 +8742,8 @@ begin Width:=260; Height:=140; Visible:=false; - end; + end;} + GroupBoxBT.Visible:=false; PageControl.ActivePage:=Formconfig.TabSheetCDM; // force le premier onglet sur la page couleurs_config; @@ -19292,7 +19308,7 @@ procedure TFormConfig.LabeledEditNUMChange(Sender: TObject); var i,erreur : integer; begin val(LabeledEditNUM.Text,i,erreur); - if (erreur<>0) or (i<0) or (i>10) then exit; + if (erreur<>0) or (i<1) or (i>10) then exit; NumBlocUSB:=i; LabeledEditCT.Text:=''; LabeledEditRM.Text:=''; diff --git a/UnitConfigCellTCO.dfm b/UnitConfigCellTCO.dfm index b5ea5ad..5901a82 100644 --- a/UnitConfigCellTCO.dfm +++ b/UnitConfigCellTCO.dfm @@ -226,7 +226,7 @@ object FormConfCellTCO: TFormConfCellTCO OnChange = EditTexteCCTCOChange end end - object GroupBox2: TGroupBox + object GroupBoxEl: TGroupBox Left = 8 Top = 8 Width = 297 @@ -256,7 +256,7 @@ object FormConfCellTCO: TFormConfCellTCO end object Label2: TLabel Left = 192 - Top = 6 + Top = 14 Width = 53 Height = 20 Caption = 'Adresse : ' diff --git a/UnitConfigCellTCO.pas b/UnitConfigCellTCO.pas index 5992408..af40fc3 100644 --- a/UnitConfigCellTCO.pas +++ b/UnitConfigCellTCO.pas @@ -15,7 +15,7 @@ type Label1: TLabel; ButtonFonte: TButton; EditTexteCCTCO: TEdit; - GroupBox2: TGroupBox; + GroupBoxEl: TGroupBox; Label15: TLabel; EditTypeImage: TEdit; CheckPinv: TCheckBox; @@ -419,7 +419,7 @@ begin with formConfCellTCO.StringGridDet do begin for i:=0 to ColCount-1 do - for j:= 1 to RowCount-1 do + for j:=1 to RowCount-1 do Cells[i,j]:=''; ligne:=1; for i:=1 to Ntrains do @@ -822,10 +822,10 @@ begin RowCount:=21; Options := Options -[goEditing] ; ColWidths[0]:=0; // colonne grise invisible - ColWidths[1]:=40; // Précédent - ColWidths[2]:=35; // tempe - ColWidths[3]:=60; // train - ColWidths[4]:=105; // icone train + ColWidths[1]:=round(40/RedFonte); // Précédent + ColWidths[2]:=round(35/RedFonte); // tempe + ColWidths[3]:=round(60/RedFonte); // train + ColWidths[4]:=round(105/RedFonte); // icone train Cells[1,0]:='Précé.'; Cells[2,0]:='Temps'; @@ -880,6 +880,23 @@ begin itemHeight:=16; end; + // calcul des éléments en fonction de la taille de GroupBoxEL à cause du dimensionnement enn % des textes windows + width:=GroupBoxEL.Left+GroupBoxEL.Width+20; + height:=BitBtnOk.Top+BitBtnOK.Height+50; + GroupBoxCanton.top:=ButtonFond.Top+ButtonFond.Height+12; + GroupBoxCanton.Height:=RadioButtonDS.Height+RadioButtonDS.Top+10; + GroupBoxCanton.Width:=GroupBoxEL.Width-10; + GroupBoxDet.top:=RadioGroupSEl.Height+RadioGroupSel.Top+10; + GroupBoxDet.Width:=GroupBoxEL.Width-10; + GroupBoxAction.top:=RadioGroupSEl.Height+RadioGroupSel.Top+10; + GroupBoxAction.Width:=GroupBoxEL.Width-10; + + GroupBoxOrientation.top:=RadioGroupSEl.Height+RadioGroupSel.Top+10; + GroupBoxOrientation.Width:=GroupBoxEL.Width-20; + + GroupBoxImplantation.top:=GroupBoxOrientation.Height+GroupBoxOrientation.Top+10; + GroupBoxImplantation.Width:=GroupBoxEL.Width-20; + // dessine les composants - non utilisé { i:=1; diff --git a/UnitFicheHoraire.dfm b/UnitFicheHoraire.dfm index d5a4089..9e8cc9b 100644 --- a/UnitFicheHoraire.dfm +++ b/UnitFicheHoraire.dfm @@ -15,43 +15,40 @@ object FormFicheHoraire: TFormFicheHoraire OnActivate = FormActivate OnCreate = FormCreate DesignSize = ( - 620 - 354) + 612 + 346) PixelsPerInch = 96 TextHeight = 13 object Label1: TLabel - Left = 104 - Top = 313 + Left = 96 + Top = 305 Width = 310 Height = 13 - Anchors = [akLeft, akBottom] Caption = 'Le nom des trains doit respecter l'#39#233'criture d'#233'clar'#233'e dans CDM Ra' + 'il' end object LabelErreur: TLabel - Left = 99 - Top = 297 + Left = 11 + Top = 0 Width = 3 Height = 13 Anchors = [akLeft, akBottom] Caption = '.' end object Label2: TLabel - Left = 104 - Top = 329 + Left = 96 + Top = 321 Width = 296 Height = 13 - Anchors = [akLeft, akBottom] Caption = 'Les horaires sont sauvegard'#233's dans le fichier '#39'FicheHoraire.txt"' end object ButtonOk: TButton Left = 8 - Top = 313 + Top = 305 Width = 75 Height = 32 Hint = 'Sauvegarde la fiche et ferme la fen'#234'tre' - Anchors = [akLeft, akBottom] Caption = 'Ok' ParentShowHint = False ShowHint = True @@ -61,7 +58,7 @@ object FormFicheHoraire: TFormFicheHoraire object StringGridFO: TStringGrid Left = 8 Top = 16 - Width = 601 + Width = 593 Height = 273 ColCount = 4 Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing] diff --git a/UnitFicheHoraire.pas b/UnitFicheHoraire.pas index e0f3364..a18692a 100644 --- a/UnitFicheHoraire.pas +++ b/UnitFicheHoraire.pas @@ -20,6 +20,7 @@ type Rect: TRect; State: TGridDrawState); procedure StringGridFOSetEditText(Sender: TObject; ACol, ARow: Integer; const Value: String); + procedure Button1Click(Sender: TObject); private { Déclarations privées } public @@ -118,7 +119,7 @@ end; procedure TFormFicheHoraire.FormCreate(Sender: TObject); -var i,champ,ligne,col,erreur : integer; +var i,champ,ligne,col,erreur,larg : integer; f : textFile ; s,ss,v,nomTrain : string; ver : single; @@ -127,23 +128,29 @@ begin with stringGridFO do begin Anchors:=[]; - Anchors:=[AkTop,AkLeft,akright,akBottom]; + //Anchors:=[AkTop,AkLeft,akright,akBottom]; + Anchors:=[]; + Anchors:=[AkTop,AkLeft,akright]; Options:=options // édition pas multiselect trackbar dynamique autoriz le dimensionnement des colonnes + [goEditing] - [goRangeSelect] + [goThumbTracking]+ [goColSizing] + [goAlwaysShowEditor]; // autorise l'édition Hint:='Grille horaire'; + ShowHint:=true; ColCount:=7; RowCount:=MaxHoraire+1; - Options := stringGridFO.Options + [goEditing]; - ColWidths[ColLigne]:=30; - ColWidths[ColTrain]:=200; - ColWidths[ColRoute]:=100; - ColWidths[ColHDep]:=60; - ColWidths[ColVitDem]:=60; - ColWidths[ColSens]:=60; - ColWidths[ColArret]:=60; + //Options := stringGridFO.Options + [goEditing]; + + ColWidths[ColLigne]:=round(30/RedFonte); + ColWidths[ColTrain]:=round(200/RedFonte); + ColWidths[ColRoute]:=round(100/RedFonte); + ColWidths[ColHDep]:=round(60/RedFonte); + ColWidths[ColVitDem]:=round(60/RedFonte); + ColWidths[ColSens]:=round(60/RedFonte); + ColWidths[ColArret]:=round(60/RedFonte); + larg:=0; + for i:=0 to colCount-1 do larg:=larg+ColWidths[i]; Cells[ColLigne,0]:='Ligne'; Cells[ColTrain,0]:='Nom du train'; @@ -154,8 +161,8 @@ begin Cells[ColArret,0]:='Forcer arrêt'+#13+'O/N'; RowHeights[0]:=30; - - // numéroter les lignes et fixer la hauteur des lignes + + // numéroter les lignes et fixer la hauteur des lignes à 16 for i:=1 to RowCount-1 do begin if i>0 then Cells[0,i]:=intToSTR(i); @@ -265,6 +272,8 @@ begin closefile(f); couleurs_Fiche; StringGridFO.Selection:=tGridRect(rect(0,0,0,0)); + FormFicheHoraire.Width:=larg+70; + FormFicheHoraire.Height:=ButtonOK.Top+ButtonOK.Height+50; end; procedure TFormFicheHoraire.FormActivate(Sender: TObject); @@ -423,5 +432,10 @@ begin end; end; +procedure TFormFicheHoraire.Button1Click(Sender: TObject); +begin +FormFicheHoraire.Width:=StringGridFO.Left+StringGridFO.Width+10; +end; + end. diff --git a/UnitPareFeu.pas b/UnitPareFeu.pas index 4b91fbd..e26e7ec 100644 --- a/UnitPareFeu.pas +++ b/UnitPareFeu.pas @@ -49,7 +49,8 @@ begin NewRule.Applicationname:=fichier; NewRule.Protocol:=NET_FW_IP_PROTOCOL_TCP; - //NewRule.LocalPorts := '9999'; // '80,443,4520-4533' sans spécif=tous ports + NewRule.LocalPorts :=''; // sans spécif=tous ports + //NewRule.LocalPorts := '9999'; // '80,443,4520-4533' NewRule.Direction:=net_fw_rule_dir_in; NewRule.Enabled:=True; NewRule.Grouping:=''; @@ -62,7 +63,9 @@ begin r:=true; except begin - s:='Erreur: impossible d''accéder au pare feu Windows. Le pare feu est géré par un programme tiers.'; + s:='Erreur: impossible d''accéder au pare feu Windows. Le pare feu est géré par un programme tiers'; + Affiche(s,clred); + s:='ou Signaux_Complexes n''a pas été lancé en mode administrateur.'; Affiche(s,clred); formconfig.Labelinfo.caption:=s; r:=false; diff --git a/UnitPrinc.dfm b/UnitPrinc.dfm index 4fb2110..faa030d 100644 --- a/UnitPrinc.dfm +++ b/UnitPrinc.dfm @@ -1,11 +1,11 @@ object FormPrinc: TFormPrinc - Left = 154 - Top = 199 + Left = 257 + Top = 205 Anchors = [akLeft, akTop, akRight] BorderStyle = bsNone Caption = 'Signaux complexes' - ClientHeight = 618 - ClientWidth = 1091 + ClientHeight = 431 + ClientWidth = 866 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -23,8 +23,8 @@ object FormPrinc: TFormPrinc OnKeyDown = FormKeyDown OnResize = FormResize DesignSize = ( - 1091 - 618) + 866 + 431) PixelsPerInch = 96 TextHeight = 13 object LabelTitre: TLabel @@ -1432,7 +1432,7 @@ object FormPrinc: TFormPrinc Visible = False end object LabelClock: TLabel - Left = 999 + Left = 774 Top = 0 Width = 85 Height = 22 @@ -1453,7 +1453,7 @@ object FormPrinc: TFormPrinc Height = 195 Picture.Data = { 07544269746D61701AC00100424D1AC00100000000003600000028000000C300 - 0000C30000000100180000000000E4BF0100C30E0000C30E0000000000000000 + 0000C30000000100180000000000E4BF0100C20E0000C20E0000000000000000 0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -2487,8 +2487,8 @@ object FormPrinc: TFormPrinc 444D5159676B56616957626A545F67545F6758636B57626A5E6971333E463E49 51545F67505B63505B63505C61505C60535C60545C615151524B4B4B5050503D 3C3C12151A16191E171A1F161A1F18191D131418090A0EB6B7BBFFFFFFFFFFFF - 6A6B7007080C16181D171A1F171A1F171A1F171A1F16191E171A1F14171D0F0F - 12ABAAACEBEAEC171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 6A6B7007080C16181D171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 @@ -2505,17 +2505,17 @@ object FormPrinc: TFormPrinc FFFFFFFFFFFFFFFFFF737D80515E6455616A58636B58636B58636B545F675560 6857626A4C575F2B363E545F674C575F505B63505A634F5C60515B5F595E6350 52584C49495453524D4E4E17191816191D161A1F171A1F161A1F191A1D191A1D - 17171B00000365666AFFFFFFFFFFFF78797C0B0E13171A1F171A1F171A1F161A - 1F16191E171B2002050BC9C8CBFFFFFFAAA9ABD3D2D4171A1F171A1F171A1F17 + 17171B00000365666AFFFFFFFFFFFF78797C0B0E13171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F16191E171A1F171A1F05080D000208171A1F16191E18191F07070D - 01010701010700000701010700000611111718191F161A1F070A0F080B110B0E - 1306090F15181D161A1F16191E171A1F0B0E1374777CFFFFFFFFFFFF66676B01 + 1F171A1F171A1F171A1F16191E171A1F0B0E1374777CFFFFFFFFFFFF66676B01 020616181C16191E16191E171A1F15191F151B1E15191A131716606060666362 636264636568868B907B888C7C878B7D898D7B898C76848792989DE3E9EC8994 9955636C606D75606E76606D75626F77626F77616E765F6C73828A8EFFFFFFFB @@ -2524,16 +2524,16 @@ object FormPrinc: TFormPrinc 6B57636B59646C57636B55606859646C343F473E4951525D65505B634E59614F 5A634F5C60505C5F555A5D47474B4E494C4848482A2B2C131719161A1E17191F 171A1F161A1F181A1E181A1E16181C181A1E06070C282A2EBFC0C41011161518 - 1D171A1F171A1F161A1F17191F17191F13151A1A1C22FFFFFFC1C0C300000074 - 7477E6E3E2171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 1D171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F14171C080B10B0B3B7FFFFFF - 0C0E1215181D04060BD3D3D8F2F3F6EFF0F3F3F4F8F2F2F7FFFFFF56575C1011 - 1704070C777A7EFFFFFFFFFFFFB3B5B8080A0F15181C181A1F16191E171A1F0B + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F181A1F16191E171A1F0B 0E13C1C4C8282A2E07080D181A1E181A1F16191E171A1F171A1F16191F151A1E 15191C1317182F30326765666663645B585B75777B7F8C8F79878A7D888D7D89 8D7B888C747E82DAE1E5A6B0B5657076606C73616E75616D75616E76616E7661 @@ -2542,17 +2542,17 @@ object FormPrinc: TFormPrinc 97535F675A646D5A656D56636B56636B58656D57656D5D68704A555D29343C57 626A4E59614E59614F5A624E5962525C5F556161464E4D484747464547424245 14151B17192216191F171A1E171A1F171A1F161A1F161A1F161A1F161A1F171A - 1F11151A06090E15181D16191E171A1F171A1F161A1F19181F19181E13131940 - 4046FFFFFF97989C000003545559FFFFFF171A1F171A1F171A1F171A1F171A1F + 1F11151A06090E15181D16191E171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 15181D01050AC3C3C6FFFFFF090B0C15181C090B1177787BFFFFFFFFFFFFCDCF - D1DEDFE3ECEEF14E4F530A0B0F4B4B4FFFFFFFCACBCF9A9B9DFFFFFF989A9B0A - 0B0F181A1F16191E171A1F13161B06090E12151A16191F16191F16191E171A1F + 1A1F181A1F16191E171A1F13161B06090E12151A16191F16191F16191E171A1F 171A1F171A1F171A1F17191F171A1F16191F0E101658575B5D5A5C5650515250 50808E8D7B898B7E878D7F868D7C888B788387929DA1D6DFE28B9194626A6F62 6F74616D76606D75606D75616E766371785E6A6F9BA3A8FFFFFFFBFDFDFFFFFF @@ -2560,17 +2560,17 @@ object FormPrinc: TFormPrinc FFFDFFFFFCFEFEFFFFFF4B565E58646C5A656D5A656D56646C57646C58656D57 656D5D687038434B404B53515C644E59614E59614E59614E5961535C604F5759 3D4040413F3F48474824232616181D171A2216191F171A1E171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F16191E16191E171A1F16191E171A1F16 - 1A1F19181F19191F0F0F15525258FFFFFF8C8D90040509494A4EFFFFFF171A1F + 1F171A1F171A1F171A1F171A1F171A1F16191E16191E171A1F16191E171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F15181D02050ABFC0C3FFFFFF080A0B15181C1517 - 1D040509D9DCDCFFFFFF61636600000004050913141806070BADAEB2FFFFFF20 - 2126000000F3F6F5F8FAFA05060A191A1F16191E171A1F16191E16191E171A1F + 1A1F171A1F171A1F171A1F171A1F191A1F16191E171A1F16191E16191E171A1F 171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F1618 1D201E23625F615A56565D5A5B676E6E828D907D878D7E878D7D888C7D888C72 7D81E3EDF0A3ABAE616B6F626E74636F77606D75606D75626F77626F77616E73 @@ -2579,16 +2579,16 @@ object FormPrinc: TFormPrinc 656D57656D57656D57646C58666E535E662B363E59646C4B565E4E59614E5860 4E58604D5861515B5F44484A403D3E4B484838373915151818191E161821161A 1E16191E171A1F161A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F16191E171A1F171A1F161A1F19181F19191F0E0E144E4E54FFFFFF919295 - 0001064B4C51FFFFFF171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F15181D01050ABFC0 - C3FFFFFF07090A15181D17191E16171B080A0AE1E3E2FFFFFF8081850102061A - 1B1F040509D1D2D5FFFFFF141519000203DADCDCFFFFFF12131716181D16191E + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16181D16191E 16191E171A1F171A1F16191E16191E171A1F161A1E161A1E161A1E171A1F161A 1F161A1F16191E161A1F18191E141317504D4F615C5C544E50545657828A8D7D 888D7F878E7E898D7D888C7C878B9AA3A6D1D8DA7E868B5F6B72616D76606D75 @@ -2597,17 +2597,17 @@ object FormPrinc: TFormPrinc 777856616A59656D59646C59656D58656D58646C59656D5C687039444C434E56 505B634D58604B58604C59604D59614D59615057593F3F414642434441431F1F 2218191D18191F17192112141A16181D16181D17191E171A1F16191E171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F18191F18191E - 15161B2F3036FFFFFF9C9D9F000000515355FFFFFF171A1F171A1F171A1F171A + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1619 - 1E16191D0C0F1402050ABEBFC2FFFFFF070A0A16181C191A2019191E15161A07 - 080ADDDEE1FFFFFF6F70740C0D1105060AE0E1E4FFFFFF0F1015000002D4D6D6 - FFFFFF1C1D2214151B161A1F171A1F171A1F171A1F171A1F171A1F161A1E1719 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F14151B161A1F171A1F171A1F171A1F171A1F171A1F161A1E1719 1F17191F18192015171E17191F15171C14171B17191E17191E1A191D1B1A1D59 5658585355585557696F72838C907F878E7D888C7D888C7E898D717B7FECF4F7 7D878B646F75616D75606D76606D75626F77616F77607076626F746F7B7EFFFF @@ -2616,16 +2616,16 @@ object FormPrinc: TFormPrinc 5B666E5661692A353D59646C4B565E4D575F47595F48595F4B575F525D663F3F 3F3A393A44434637363C13161C16191E181B2012161A34343A1313190B0B1117 161C16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F161A1F161A1F14171C06090FFFFFFFEDF0EF000000A7AAA9FFFF - FF171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F161A1F16181D16161A717276000000B9BBBCFFFFFF070A0A18 - 181C191820100F180A091214121C030209F0F1F4FFFFFF0E0F13020307D7D8DB - FFFFFF111216000001D7D9D9FFFFFF16171B13151A171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F13151A171A1F171A1F171A1F171A 1F171A1F171A1F161A1E18191F19182018171F17161E09091013141833343817 171B18191D18191D141519383A3E4E4D5054504F494A4B868C8F80898D7B878B 7D898D7D898D768185A4AFB3A3AEB1657074646F73606D76606D75626F77616E @@ -2634,16 +2634,16 @@ object FormPrinc: TFormPrinc 58656D58656D5A656D5A656D5C676F444F573B464E515C644C575F4D57604A58 604C58604D576048515B4040404140413D3C3F1D1C2116181E16191E16191E09 0D12F9FAFCFEFFFF787A7B090B0C0A0D1214171C16191E171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E0B0F14696B - 6DFFFFFFFFFFFFFFFFFFB5B6BA05060A171A1F191A1E171A1F171A1F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F191A1E171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F17191D05060AFFFFFFE2 - E3E6C9CACCFFFFFF070A0A17181D1112174E4F549D9DA217171C04040978797C - FFFFFF535459000001B6B7BBFFFFFF16171C000000E6E8E8FFFFFF090A0E1819 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1819 1F16191E171A1F171A1F171A1F171A1F171A1F16191E181A1F17171C0D0D1208 080D77777DFFFFFFF9FAFE0B0C1018191D18191D17181C2122264D4C4F4C4848 47494A666C6F838C907B878B7C888C7D898D7C878B778286B7C2C6545F636470 @@ -2653,16 +2653,16 @@ object FormPrinc: TFormPrinc 644C575F4D58604D58604C57604D57605158614147503738383736373231341A 181E17191F16191E181B2012151AA5A7A7FFFFFFFFFFFFFEFFFF6F72760B0E13 15181D16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F16191E08090D38393D7172764F50540A0B0F14151918191D19 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F19 1A1D141920171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 - 191E1A1B2010111435363AE7E8EBFFFFFFFFFFFF07090A17181C0F0F14797C7C - FFFFFF8E9091191A1DCBCCCFFFFFFF3435390B0C10696A6EFFFFFF8485894042 - 44FFFFFFC0C2C207080C18191F16191E171A1F171A1F171A1F171A1F171A1F16 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F18191F16191E171A1F171A1F171A1F171A1F171A1F16 191F16181D0A0C0C717475F9FBFCFFFFFFFFFFFFA2A3A715161A18181C18191D 191A1E16171B3E3C3F4B46464547484C5255838C907B888C7B878B7D898D7B87 8B7984889EA9AD596468667176606D76606D75616F77636F77646E7665707861 @@ -2671,16 +2671,16 @@ object FormPrinc: TFormPrinc 6E5C676F4E5961303B4359646C48535B4C575F4C575F4C585E4D585F4E565C35 373F39393940404021202317171C16191F16191E191C21171A200104041A1D1D A2A5A5FFFFFFFFFFFFE1E4E805080D16191E171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F17181E1111170F101610 - 111717191D191B1F18191D18191E161A21171B22171A1F171A1F171A1F171A1F + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F18191E161A21171B22171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F16191E181A1F191A1E101216000000E5E8EAFFFFFF - 090C0E17181D15161B080A0DD8DADCFFFFFFFFFFFFFFFFFF999B9F0204081718 - 1D07090DCED0D4FFFFFFFFFFFFFEFFFF20222515161A181A2016191E171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F181A2016191E171A1F17 1A1F171A1F171A1F171A1F16191E05080CE2E4E5FFFFFFFFFFFFA3A5A7191A1F 040509181A1E181A1E18191E18191E16181C232427514D4E404142393C3E7B82 857B898D7B888B7C888C7C878B7B868A818D916F7A7E646F74606C75606D7562 @@ -2690,16 +2690,16 @@ object FormPrinc: TFormPrinc 565F49595B4B5B5B404A49383736393737353636171B1C16191F171A1F171A1F 16191E16191E171A1F13161B02050B1A1D22B4B7BB6E71750C0F14171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F161A1F161A1F16191E161A1E16191F16191E161A1F161A1F17191E17191E + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F17191E17191E 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E16191F - 16191E14171C26292F5F636712151A16191E16191E15191E000409383B40575A - 5F272A2F03060C161A1F16191E16191E01050A4044494D50550F12180F121816 - 191F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F0B0D12727377 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F0B0D12727377 B4B5B81F202404060A13161B161A1F16191E16191F161A1F161A1F16191E1216 1B3C3E42424144413E3E5C5C5D818F937C888C7B878B7B878B7B888C7B878B8E 9A9E49555A667179636E76646F77626F77616E76626F7765727A5D6B7396A0A3 @@ -2709,15 +2709,15 @@ object FormPrinc: TFormPrinc 171A1C16191E171A1F171A1F171A1F171A1F171A1F16191E171A1F13161B0609 0E0E111616191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F161A1F171A1F171A1F171A1F171A1F171A + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F16191E191C2114171C15181D0C0F1416191E171A1F171A - 1F16191E16191E11141910131812151A181B2016191E181B2016191E16191E10 - 13180F121715181D171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F 171A1F161A1F17191E0F10140B0C1014141815171B171A1F171A1F171A1F171A 1F171A1F171A1F16191E15181D2D2F334140434442423B3A3C818A8F7D888B7C 888C7C888C7C888C7A868A87939757626769747C606B73646F77636E76626F77 @@ -2727,15 +2727,15 @@ object FormPrinc: TFormPrinc 3332333A373736363518191A171A1C16191D171A1F171A1F171A1F171A1F171A 1F171A1F16191E16191E16191E16191E171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E181B - 23171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F1619 - 1E171A1F171A1F171A1F16191E171A1F16191E16191E16191E171A1F16191E17 - 1A1F16191E171A1F16191E171A1F171A1F16191E16191E171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F161A1F181A1F19191D18191D191A1E181A 1E161A1F171A1F171A1F171A1F171A1F171A1F16191E16191E191A1F43424445 434244404365686E848A8F7C878B7B878B7B878B7A868A7985886F7B805D6870 @@ -2746,8 +2746,8 @@ object FormPrinc: TFormPrinc 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1E161920171B220C0E14171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F @@ -2764,7 +2764,7 @@ object FormPrinc: TFormPrinc 2515191E16191F171A1F16191E171A1F16191E171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1E16191E181B2017 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 @@ -2783,7 +2783,7 @@ object FormPrinc: TFormPrinc 191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F16191E16191E171A1F171A1F171A1F171A1F171A1F171A1F + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F @@ -2801,9 +2801,9 @@ object FormPrinc: TFormPrinc 171C04070C0B0E1413161C161A1F16191F16191E161A1F161A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1E161921171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1619 - 1E161A1F161A1F161A1F161A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 @@ -2820,8 +2820,8 @@ object FormPrinc: TFormPrinc 17191E171A1E161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1E161920171A20171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F17191E17191F17191F171A1F161A1F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 @@ -2838,9 +2838,9 @@ object FormPrinc: TFormPrinc FFFFFFD0D2D16D6D7126272B141519191A1D161A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1E16191E171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F19181E19 - 181F181A1F161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F @@ -3111,8 +3111,8 @@ object FormPrinc: TFormPrinc 5E6C725F6A725C68705E6A72606C745F6C7469747C2A353D47525A424D554350 53434F53434F534450544350531E1F222B26272C2929171A1E171A1F16191E16 1A1F181A1E181A1E181A1E181A1E181A1E181A1E181A1E181A1E161A1F171A1F - 171A1F161A1E17191F17191F17191F17191F171A1E171A1E171A1E171A1E1719 - 1F17191F17191F17191F171A1E171A1E171A1E171A1E161A1F171A1F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F161A1F171A1E17191E181B2016191E06070A0E10101A1C1D1B @@ -3120,36 +3120,36 @@ object FormPrinc: TFormPrinc 1F212226282922242527292A21232425272825272827292A2123242628282526 2904050902030717181C181A1F161A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F161A1F171A1F17191E171A1E16191D1719 - 1E171A1F171A1F16191E16191E17191E17191E171A1F16191E16191D171A1F17 - 191E171A1E181B1F16191D181A1F15181D181A1F17191E17191E171A1E161A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17191E171A1E161A1F 171A1F161A1E17191F18182018182018182017191F161A1E171A1F171A1F171A 1F16191D1A1C1D272727202121151919A3A9AAC0C7CABCC4C7BEC4C7BCC3C6C2 C9CC798183212D3169767C617078627079616E76616E76616E766371785A6568 F2F2F4000000E0E6E8515D605C686E5E666F5D686F5C676F5E68705D68706671 7926313948535C404B53434F54424E52424E52434F54434D4D2622241F222323 232416181E16191E171A1F171A1F161A1F161A1F161A1F161A1F161A1F161A1F - 161A1F161A1F171A1F171A1F171A1F161A1E191721191820191820191721191A - 1D191A1D191A1D191A1D19181F191720191720191721191A1D19191D191A1D19 - 1A1D161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 161A1F161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F181A1D191A1D191A1E14 151906080A2022231416171012131315161A1C1D1B1D1E1D1F20191B1C1F2122 1B1D1E2224251C1E1F222425242627252728252728212324282A2B2628292628 2927292A2628292527282425281B1C200000030D0E12191C2016191F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F181A - 1F191A1D18191D0E0F130000040D1014171A1E16191D191B1F14141804050904 - 05090203071213171B1C2019191D18181C0D0E1204050905060A05060A121216 - 1A1B1F19191D181A1D161A1F171A1F171A1F161A1E161A1E161A1E161A1E161A + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F19191D181A1D161A1F171A1F171A1F161A1E161A1E161A1E161A1E161A 1E171A1F171A1F171A1F171A1F16191E17191B2727272424251A1A1F979A9EC1 C7CABAC1C4BAC1C4BAC1C4C2C9CC868D901C26286E797D626F765F6C74616E76 606D75636F7864737A5C696BE9ECED000000D7DCDE4F5A5D5A666C5B646D5964 6C59646C5A656D5A656D657078202B334C575F3E4A52424E53424E52424E5243 4F53404A4A28252825272827282816181E16191E171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F1313 - 190A0A0F09090F0A0A10090A0E0A0B0F0E0F1318191C1A1A2018181E0D0D1303 - 03090A0B0F16171B18191D191A1D161A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 1A1F181A1D191A1E1A1B1F0A0B0F1517191E20201315161C1E1F17191A1A1C1D @@ -3157,17 +3157,17 @@ object FormPrinc: TFormPrinc 2724262724262722242523252627292A222425282A2B25272928282D090A0E01 0205181B1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F161A1F181A1F191A1D0C0D11828387FFFFFF4F52560E111516 - 1A1E1114182B2C30F4F5F8FFFFFFFFFFFF4243480F1014191A1E0A0B0F525357 - FFFFFFFFFFFFE9EAEE23242814151919191D181A1D161A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F19191D181A1D161A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E17191B23 222326262718191D868A8DC3C9CCBAC1C4BAC1C4BCC3C6C0C7CA90979A162022 6E7A7E647278616E76606D75606D7563707864727A5E6B6DE2E4E6000000CFD5 D6586466626F7568707A66717966717A6570786570786C777F1B262E4D58603E 4950414D52404C50404C50414D52404A4A2320221C1F2021212217191E161A1F 171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F1619 - 1F16191E16191E11151A3F40429B9D9E8F91928F91928E8F9293949776777B0F - 1014161819080A0B797B7CCDCFCF97989B11121616171B19191D161A1F171A1F + 1F16191E16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F161A1F181A1D191A1E17181C040509292A2C161819 @@ -3175,36 +3175,36 @@ object FormPrinc: TFormPrinc 251F212222242523252624262724262726282924262725272826282926282925 272827282B27282C141519010206121419171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F181A1F191A1E090A0E8C - 8C91FFFFFF5053570E111516191D000206F7F8FCFFFFFF6A6B6FF2F3F7FFFFFF - 0B0C101213171D1E22FFFFFFE9EAED737478FFFFFFD6D7DB04050918191D181A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F18191D181A 1D161A1F161A1F161A1F161A1F171A1F171A1F171A1F16191E16191E16191E16 1A1F16191F16191E17191A252526252626191A1F7E8084C3C9CCB9C1C3B9C0C3 BCC3C6BDC4C79BA2A50B1518707B8066747A6471796370786370786370786574 7B5E6B6DD9DCDD000000CDD2D5717C7F778388828B94879299848F9787919987 9199939EA6111C2349555C3C474F404C51414D51414D51414E523C4546222022 26282921212216191E161A1F171A1F16191E171A1F16191E16191F16191E1619 - 1E16191E16191E16191F181B1F181B20171A1F13161B2B2D2FFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFECEDF0030308030507B5B7B8FFFFFFE6E8E9FFFFFFE6E7E9 - 03040818191D16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1E16191E16191E16191F181B1F181B20171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F18191E191A1E 1112160D0E12363839111314181A1B161819181A1B161819191B1C1A1C1D1D1F 202022231D1F2020222320222324262722242523252626282925272827292A26 2829252728262829232526282A2B27292B28292D1F20230000030E1015181B20 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 - 1A1F181A1F191A1E090A0E898B8DFFFFFF4F52560F12161013173F4145FFFFFF - A3A4A70000007E7F82FFFFFF5B5C5F05050A76787BFFFFFF606264000000BFC0 - C3FFFFFF23242814161A171A1E16191E17191E17191E17191E16191F16191E16 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F14161A171A1E16191E17191E17191E17191E16191F16191E16 191E171A1F181B1F181A1F16191E181B2016191E17191B25252525252617191C 6E7175C4CACDB9C0C3B9C0C3B9C0C3BBC2C5A5ACAF030D0F737E8266747A6370 78616E76616E7663707866747B5D696BD7DADC000000C7CCD0A4ADB1A4B0B4AC B8BCB5C0C4B8C3C6B6C1C5B7C3C6C0CBCE0A0F134452553F484B3E4A4E414D51 404C50414D503A414322232424212328282915181E171A1F171A1F16191F0306 - 0B00040900010600010600010600010600010600010600020201030413131816 - 161D09090E9C9EA0FFFFFFA5A8A60001011C1E201D1D2316151E191A1FFFFFFF - C8C9CD000000909195FFFFFF47484B101115171A1F16191E171A1F171A1F171A + 0B00040900010600010600010600010600010600010600020201030413131817 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F161A1E1818201919211010151C1E1E3638390F111214161717191A1517 @@ -3212,36 +3212,36 @@ object FormPrinc: TFormPrinc 252621232427292A23252627292A2527282325262527282426272C2E2F282A2B 242627010304090B0E181B2016191E171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F161A1F181A1F19191E0B0D0E8A8C8CFFFFFF515256 - 1112160F0F14616364FFFFFF7E80800102075D5E62FFFFFF8082830000019898 - 9BFFFFFF414243000206999C9FFFFFFF4C4E4E0E12160F121700010502030700 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F0E12160F121700010502030700 0105000105000106000106000106000105010304050708181A1A17191D161820 16171D2221242322241E20206A6E6EC2C8CCB6BDC2B6BDC0B8BFC2BBC2C5A9B0 B301080B757E8268737A657179616E76616E76626F7765727A606B6ED3DADA00 0000C5CBCECDD6DAC9D5D9C9D5D9D1DCE0D7E2E6D5E0E4D6E1E5DBE6EA060C11 4250543B44483F4B4F414D513C484C3E4A4E3B43441B1C1E2522242121221519 1E171A1F171A1F03060CCED0D3F8FAFBF2F4F5F2F4F5F2F4F5F2F4F5F2F4F5F2 - F4F5F1F4F4FFFFFF45474A11111716161D020207BFC0C2FFFFFFA0A2A3000000 - 17171D0E0D164F5054FFFFFF9495980001054E4F54FFFFFF7D7E820B0C10171A - 1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + F4F5F1F4F4FFFFFF45474A171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F161A1E1818201A19210D0E122B2D2E3032 33131516141617191B1C17191A17191A1416171C1E1F1D1F201E20211E20211D 1F201D1F201F2122242627282A2B23252625272826282927292A27292A262829 242627282A2B26282927292A27292A05070806080C181B2115181D171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F17181E101015 - 0407078B8D8DFFFFFF5152570F10140E0F136A6C6EFFFFFF7476760304085052 - 55FFFFFF8C8E8E000000A4A4A7FFFFFF3B3D3D0104088D9093FFFFFF585A5A07 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F07 0A0E44474BFFFFFFF2F4F5F2F4F5F2F4F5F2F4F5F2F4F5F2F4F5F2F5F5F8F9FA D0D2D3060708171A1C16182016171C2321242525261B1D1D65696AC3C9CCB6BC C1B4BBBEB7BEC1BBC2C5A1A8AB050D10747D8267727A647078616E76616E7662 6F7765737A5F6A6DD3DADA000000C4CACFD4DDE0D8E4E8DBE7EBE2EDF1E9F4F8 E9F4F8E3EEF1E0ECF0050A0F3B494D3841453D484C3D494D3844473B484B3B43 441B1B1C27242625252616191E16191F171A1F000309DEE0E0FFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF47494B11111619172116151F - 020309BFC0C3FFFFFFA8AAAB0101070F0F1865656AFFFFFF86878A0405094A4B - 4EFFFFFF9293970B0C0F15181D171A1F171A1F171A1F171A1F171A1F171A1F17 + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF47494B171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1E1818 201A19210A0B0F3E41413032331214151517181B1D1E161819191B1C1A1C1D1E @@ -3249,17 +3249,17 @@ object FormPrinc: TFormPrinc 292B2C212324292B2C282A2B27292A23252627292A2A2C2D282A2B0507080509 0C181B21171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F16191E0F1117797A7E0D0F107D7F7FFFFFFF5152561112161011156365 - 66FFFFFF7B7E7E02020756565AFFFFFF8689890000019A9B9EFFFFFF3F414201 - 0408929598FFFFFF515353070A0E45494BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F070A0E45494BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFDEE0E1020405181A1E16182017181D2424262020 211B1D1C626667C2C8CBB6BCC2B7BEC1B5BCBFBAC1C4969DA0070F11717A7F67 7279636E76606D75606D75626F786572795E696BD4DBDC000000CDD2D6D5DEE3 E1EDF2EBF8FBEDF9FCEEFAFDF0FBFFE5F0F5E1EBEF03080D39474B363E433A45 493B464B36414639454B3B424325262727242725252715181E16191F171A1F00 0309EFF0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - 4B4D4F11121619182113131C101016000005BABDBDFFFFFF58595D05040C6768 - 6CFFFFFF88898C0203074A4B4EFFFFFF9091940C0C11171A1E16191F171A1F17 + 4B4D4F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F161A1E18191F1919200D0E1243454633363711131413151616 @@ -3267,36 +3267,36 @@ object FormPrinc: TFormPrinc 202223212324222425232526252728232526282A2B282A2B292B2C2426272527 28242627282A2B05060705080B181B21171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F161A1F020309E6E7EAFFFFFFBEC0C0FFFF - FF51525611121612131747494AFFFFFF999B9B000000717275FFFFFF686A6B03 - 05087A7A7EFFFFFF525455000000B4B6B9FFFFFF2C2E300B0D124A4E51FFFFFF + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F0B0D124A4E51FFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEDEFF10203051719 1E16182018191E201F21252526191B1A666A6BC2C8CBB6BDC2B6BDC0B5BCBFBB C2C591989B1017196E777C677279636E77606E76606D756370786572795D696B D5DCDD000000DADFE2D2DCE4E2EEF6EEFAFDECF8F7EFFBFCEFFAFEE5EFF7E0EB EE000409374649333B4039404A3B444D38414A3B444E363D3E2323252A272922 222315181E171A1F171A1F14171C1D20261F23281D20261D20261D20261D2026 - 1D20261D20261D20261F2328181B2014171D16171B2A2B2E2B2C300E0F131718 - 19FFFFFFC0C3C4010106494A4EFFFFFF96979A0000034E5151FFFFFF7A7B800F - 0D1717191F161A1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 1D20261D20261D20261F2328181B20171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F181A1D191A1E0D0E1242 4247494B4D14161717191A181A1B141617181A1B191B1C191B1C1618191B1D1E 1F21221E20212022231E20212426272325261F212223252627292A2527282729 2A25272827292A2A2C2D2B2D2E262829282A2B080A0B080B0E181B2116191E17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191F1417 - 1A141616B4B6B6FFFFFFFFFFFF4F52560F121615181C050909FFFFFFF3F6F526 - 2827DDDFDFFFFFFF191A1E1213172C2E2FFFFFFFC9CBCA2E302FFFFFFFF0F1F4 - 06070B17181C18191E21242A1E21261D20251D20261D20261D20261D20261D20 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F17181C18191E21242A1E21261D20251D20261D20261D20261D20261D20 261F22281D202614171D171A2016182017181D201E211F1F201E201F707474C2 C8CBB7BDC2B5BCBFB6BDC0BEC5C88E9598091013717A7F677279636F78616E76 616E7663717966727A616C6FD5DDDE000000E0E5E8CED8E0E3EFF6EDF9FCEDF9 F8EFFBFCEFFAFEE5EFF7DEEAED00000535434630393D39414A3B444D3B444D37 404A3B42432021222A272A25252615181E171A1F171A1F16191E15181D111419 - 12151A12151A12151A12151A12151A12151A12151A12151A14171C15191E1D1E - 22FFFFFFDDDEE00000001A1C1DFFFFFFC9CBCC000107131318FFFFFFD1D2D600 - 0000999B9CFFFFFF42424812111A16191E171A1F171A1F171A1F171A1F171A1F + 12151A12151A12151A12151A12151A12151A12151A12151A14171C171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 1A1F181A1D191A1E111216303135636567101212111314151718161819181A1B @@ -3304,17 +3304,17 @@ object FormPrinc: TFormPrinc 2925272823252624262727292A21232425272824262722242527292A1D1F2000 02020E1014191C2116191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F161A1F171A1E151619000000A0A1A5FFFFFF56595D0F121616 - 191D0D0F12595B5BFFFFFFFFFFFFFFFFFF7475790A0B0F191A1E07080B8E9090 - FFFFFFFFFFFFFFFFFF40414612131718191D18191E13161B11141912151A1215 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F18191D18191E13161B11141912151A1215 1A12151A12151A12151A12151A12151A12151A171A1F181B2116181F19191F1E 1D20272728191B1B757979C2C8CBB8BEC3B8BFC2B8BFC2BDC4C7989FA200080B 767F84667279636F77616E76616E7663707866727A606B6ED6DEDE000000E8ED EFCBD4DDDFEBF3ECF7FAEFFBFBEFFBFCEDF8FCE0EAF1DEE9ED00050A3240442E 373A363E473A434C3B444D37404A3D434423232425232523232416191E16191F 171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F16191E07080CAAABAFFFFFFFFFFFFFFFFFFFFFFFFF50525411 - 111706070B9D9EA3FFFFFFFFFFFFFFFFFFD8D9DA010107181721161A1E171A1F + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F161A1F181A1D19191D18191D1B1B207D7F81181A1B @@ -3322,36 +3322,36 @@ object FormPrinc: TFormPrinc 202022231D1F2023252621232426282924262723252620222326282925272826 2829242627252728191B1C000102131519171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1E18191F19181F16161D14 - 131A494A5022252913161A171A1E15171B0C0D111516194243471B1C200A0B0F - 191A1E18191D191A1E05060A2222264041440F101410111518191C191A1E1719 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F191A1E1719 1D161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 191E161A2016182018181E2222242222231719197F8384C2C8CBB8BEC3B7BFC1 B8BFC2BDC4C7979EA102090C757E83667279646E76606D75606D75626F776573 7A5E696CDDE4E4000000E8EDEFCAD3DCDAE6EDEDF8FBEEFBFBEFFBFDEBF6FAD7 E1E8E3EEF1080D12303D412B3337343C453840493C444D38404A3A4142222324 32303228282916191E16191E171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F16191F17191D06070C646569AD - AFB2A4A6A7393B3C080A0D191A1F17181C05070B6A6B6FB1B2B585878908090C - 17181D181721161A1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F171A1E18191E 191A1E0A0C107678793A3C3D0F111214161717191A181A1B17191A191B1C191B 1C191B1C1A1C1D1D1F202123242022231F21221E20211E202124262723252625 27282527282426272426272628292224252527280C0E0F020405191B1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 - 1A1E17191F18182019192117161F0E0F1514181C15181D161A1E181A1F191920 - 17171D10111716171C181A1E18191E181A1E18191E19191F15161C1313191819 - 1E17191D191A1F18191E171A1E161A1F171A1F171A1F171A1F171A1F171A1F17 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F18191E171A1E161A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1E171A1F16191F18191E232324212122171919 828687BEC4C7B6BDC1B7BEC1B8BFC3BEC5C8898F930D1517717B7F667279636E 76606D75606D7563707865727A606B6EE2E8E9000000E8EFEEC6D0D7D7E3EBEB F5FBEEFAFEEBF7FBE2EEF2D1DDE1E8EFF2161D2031383B2B32353439423A3F48 3F444D3A3F47373E4226262A2B292A23242315191E16191F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F16191F16191E0C0F1506090E070A0F101319161A1F16191F161A1F16191E - 0C0F1406090E090D1215181D161A1E161A1E171A1F171A1F171A1F171A1F171A + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F161A1F16191E181B2013161B4042457B7D7E1012131517181416 @@ -3359,9 +3359,9 @@ object FormPrinc: TFormPrinc 222320222320222323252622242521232422242524262727292A202223202222 0002040D0D12191B20161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F161A1E161A1E161A1E161A1E171A1F171A1F - 171A1F171A1F16191E16191E161A1E161A1F161A1F16191F16191F161A1F161A - 1F161A1E161A1E161A1E16191E161A1F16191F161A1F161A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F161A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191D 181B1C232423282727161919868C8BB4BEC0AFBABEB2B8BDB1B7BCBCC2C77279 7D141D1F6E7E81637177636E77606D75616E7663707966737A5E696BEAEBED00 @@ -3792,8 +3792,8 @@ object FormPrinc: TFormPrinc 6871751E242A181C1F1F24272126292126291E22261D21244243444C4C4C5753 53464444161518181A1E16191F171A1F16191E161A1E19181E18181E0F0F1504 030A6B6C6F43444813141719191D161A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E16191E171A - 1F171A1F16191E16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 @@ -3811,7 +3811,7 @@ object FormPrinc: TFormPrinc 26202326313333525353544F5053515220202316181D16191E16191E171A1F16 1A1F101114020405545658E7E9EBFFFFFFE6E7EB07080C19191D161A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F16191E171A1F171A1F16191E16191E171A1F171A1F16191E171A1F171A1F17 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 @@ -3828,17 +3828,17 @@ object FormPrinc: TFormPrinc D3DBDFDAE4ECD2DEE1D6E2E6E4F0F4EDF9FDEDF9FDE7F3F7E7F0F4575D621F24 261A1F2220252822272A1F23282023252223235252524B47475351523A3A3D13 151916191E16191E16191E12151A525455E4E6E6FFFFFFFFFFFFB9BABD343438 - 14151919191D161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1619 - 1E16191F16191F161A1F161A1F14171C13161B171A1F16191E171A1F15181E15 - 181D0F12170F121715181D16191E171A1F171A1F171A1F171A1F171A1F171A1F + 14151919191D161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F16191F171A1F171A1F16191E171A1F171A1F - 16191F161A1F161A1F16191E171A1F16191E171A1F16191F161A1F161A1E161A - 1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 191F121519323337C0C1C4FFFFFFFFFFFFDFE0E455565A12131718191D161A1F 16191E11141A37383C4D4B4B4644444A4848212120121718141819171B1C161A 1C1114180B0E120A0C10676C7178848C6D7880606B735B666E5360695B68705B @@ -3847,16 +3847,16 @@ object FormPrinc: TFormPrinc FDECF8FCE7F0F4A4ABB1272C2F161B1E20242822272A1F23282023252223233F 40405A56575150505F5F621A1B1E16191E171A1F17191E111419FFFFFFFFFFFF C4C6C62E313005060A12131818191D191A1E161A1F171A1F171A1F171A1F171A - 1F171A1F171A1F16191E171A1F171A1E171A1F171A1E14171C1F22272F323717 - 1A1F16191E171A1F0D1014101317585B6045484D05080D16191E16191E171A1F + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191F171A1F13161B - 04070C0003080104090C0E13171A1E171A1E16191E15171C03060B0003080407 - 0C14171C16191E17191F17191F161A1E171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F161A1F16191D141519010307303135C4C5C9FFFFFF FFFFFF14151917191D161A1F14171C181B204F4F524846454A48493E3C3C1A1A 1B131819141819171B1C161A1B1114180C0F131A1D2184898F68747C5C68705D @@ -3865,16 +3865,16 @@ object FormPrinc: TFormPrinc EDD0DBE3D4DFE7E6F1F9ECF7FBEFFAFEE4EFF3ECF7FB333C40141C1F1C202421 23282126291E23261F242722282C4C4E4C57575659565445403E14141917171D 19191F0F0E145F626740434800010610131916191E161A1F161A1F161A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F16191E1A1C2018191D0E0E120E - 0F130204058E9091FFFFFF2C2E2E1414191213162C2D2DFFFFFFFFFFFFFFFFFF - CFD0D304040816191E16191F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F161A1F13151915161AB0B1B4F9F9FDDDDFE05F616107090919191D1516 - 1B16161AB6B6BAF9FAFCBABBBE17191915151A191820181820161A1E171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F16191F 16191E1013190002073F424762656A0E111616191E16191E1517172E2E2E4B4A 4A4645484E50511F2324151A1B121617181C1D151A1B1316171212130E111540 @@ -3883,17 +3883,17 @@ object FormPrinc: TFormPrinc FFFBFFFFFAFFFFD9E1E4D8E3EBD8E3EBCED9E1DDE8F0EBF6FAEFFAFEEEF9FDE9 F4F9818A8D1F26291A1E212124282126291E23261C21241E23274547455A5A58 5653525C57551F1E2418181E18181E19181F0D101510131816191E171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 - 191F16171C242529696A6F62636757595AAEB0B1FFFFFF787B7B292A2F000105 - D6D8D8FFFFFF2A2A2E85868AFFFFFF66666B0D101516191E171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16171B171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F15181D090B0FEFF0F3FFFFFFA6A7AAE3E4 - E5FFFFFF5658590F101405050BE2E3E6FFFFFFB3B4B8FFFFFFE6E9E906070C18 - 181F181820161A1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F16191E171A1F0E11160E111616191E181B 2016191D17191A5251524646464B4A4C4244451418191418191115161A1E1F16 1A1B1317180D0F100A1114646E73606D735C69715D6A725360685B687059686F @@ -3902,17 +3902,17 @@ object FormPrinc: TFormPrinc DFE6E2EDF1EEF9FDF0FBFFEBF6FADAE4E72D343715191C1D1F2422272A202528 1C21241D22262829275858565B5857615C5A44444A13141A18181E19181E161A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E16191E16191E16 - 1A1F171A1F171A1F171A1F161A1F111317424246FFFFFFFFFFFFFFFFFFFFFFFF - FCFEFEFFFFFF626267000002FFFFFFE6E9E80000001F2024FFFFFFAFB0B40407 - 0C161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F18191D17191F16191E16191E171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1114193A3C - 40FFFFFF9091950000000C0E10FFFFFFC2C4C500000438393FFFFFFF9D9EA200 - 00009FA1A3FFFFFF31323613131A181820161A1E171A1F171A1F171A1F171A1F - 16191E16191E161A1F171A1F161A1F161A1F161A1F171A1F171A1F171A1F1619 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1619 1E171A1F16191E171A1F15191E12151A3033344E4E4E5150515453552A2C2D17 1B1C131718141819191D1D15191A0F13140C1112262E316D7B7F5E6C73616D76 5461695A676F5C69715E6A725B646AAAB0B3FFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -3920,18 +3920,18 @@ object FormPrinc: TFormPrinc FBFED7E2EADAE5EDDBE6EED2DDE5D9E4E8ECF7FBEDF8FCECF7FBF4FEFF767E80 2024281C1F231F242723282B1D22251E23272324234444435E5B5A605B5A5453 5917171E18181E18181F171A1F16191E171A1F171A1F171A1F171A1F171A1F16 - 191E171A1F171A1F171A1F16191E171A1F171A1F171A1F16191F17181C17181C - FFFFFFBFBFC30F1012959798FFFFFF4E5051191A1E1D1E22FFFFFFCCCECE0405 - 080D0E12FFFFFFD3D4D604060B16191E171A1F171A1F171A1F171A1F171A1F17 + 191E171A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F16191E171A1F171A1F171A1F18191D171A1F161A1F171A1F171A1F171A 1F171A1F171A1F161A1F17181F18191F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F11141935373CFFFFFF8C8D91000000030506FFFFFFC4C6C600 - 00006A6A6FFFFFFF6F7074000105797B7DFFFFFF7071750D0D14181820161A1E - 171A1F171A1F171A1F16191E171A1F171A1F171A1F16191E171A1E171A1E171A - 1E161A1F171A1F161A1F171A1F17191F17191E17191F16191E191D2043444651 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F161A1F171A1F17191F17191E17191F16191E191D2043444651 525159585943424518181A181D1E131819171B1C1A1E1F1216170D11120C1314 596466616F7460707656626A5C69715B68705E6A72606C73596268F2F5F6FDFE FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFF @@ -3939,17 +3939,17 @@ object FormPrinc: TFormPrinc ECF8FCEFFBFFE7F3F7DFEBEF2F383C141A201E232623282B2126291E23262123 2427282A595658534F5159585A47484C11151A161922171A1F16191E171A1F17 1A1F171A1F171A1F16191E171A1F16171B19191D1010141A1A1E16191E171A1F - 171A1F16191F191B1F0E0F1355565AFFFFFF393B3D7B7D7EFFFFFF2B2D2E0A0D - 12212528FFFFFFD0D0D00203040F1112FFFFFFD9DBDA03050916191E171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F16191E161A1F16191F161A1F161A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F161A1F161A1F16 1A1F161A1F161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F16191E04060BBFC0C3FFFFFF8E - 8F93DDDDDEFFFFFF36383903060A76797CFFFFFF6567670405096C6C6FFFFFFF - 818484090C10151A1F171A1F171A1F171A1F171A1F16191E171A1F14181D0B0D - 1217181C191A1D191A1D18191D161A1F171A1F161A1F181A1F19181F19181E1A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F14181D171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F181A1F19181F19181E1A 1920141619353B385354514947455552522123271A1B1F19191E16171B191C20 181B1F1114181014181C262B737D8465717A5B67715B68705D6A725C69715F6D 745C6B6C869291FFFFFFFCFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00 @@ -3957,17 +3957,17 @@ object FormPrinc: TFormPrinc EAF2F9E5EDF6DAE6EBD4E0E4E1EDF1ECF8FCEBF7FBF0FCFF818A8D1D2328181D 202126292126291E23271F23241E21223F3E405B585A57555561606123232714 171C16191F171A1E171A1F171A1F171A1F16191E171A1F15191E15161A0B0C10 - 75767A08090D171A1F16191E171A1F16191F191B1E191A1E020307B4B5B8FDFF - FF818384FFFFFF3032320F1317121418FFFFFFD5D5D5010203111314FFFFFFCA - CCCC020509171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 75767A08090D171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 - 1A1F0E10143A3B3FFFFFFFFFFFFFFFFFFFA8A8A8000000080B10737678FFFFFF - 686A6B0304086E6E71FFFFFF7F81820A0D11151A1F171A1F171A1F171A1F171A - 1F171A1F16191E080B11787A7E0A0B0F12131718191D181A1E16191F171A1F16 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F16191E080B11787A7E0A0B0F171A1F171A1F171A1F171A1F171A1F17 1A1F181A1F19181E19191F17171E2121255153515859575C5C5A3E3E3E0E0F13 14151918191D1A1C20191D2115181C0F1216101418545E63717A825E6B745A66 705E6B735D6A725F6C74626F765A6668DCE4E5FDFFFFFEFFFFFFFFFFFFFFFFFF @@ -3976,17 +3976,17 @@ object FormPrinc: TFormPrinc FDE8F3F7E3ECEF343A3F12171A1E232622272A2025281B22231E23232226275B 5D5E56515059565552515314141715181E171A1F171A1F171A1E161A1F16191E 181B2005080D232429E7E8EAFFFFFF6B6C700D101516191E171A1F161A1F1919 - 1D18191D16171B0B0C10FFFFFFFCFEFFFFFFFF3032330F1317010307FCFEFEF7 - F6F6000000292B2CFFFFFF9C9E9E090B1016191E171A1F171A1F171A1F171A1F + 1D18191D171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F16191E04060BFFFFFFCCCDD00000005B5C5EFFFFFF - 585A5A06090E565A5DFFFFFF787A7A000001818184FFFFFF5D5F600D1014151A - 1F171A1F171A1F171A1F171A1F16191E0D101666696EFFFFFFE6E7EA292A2E09 - 0A0E18191E16191F16191E161A1F171A1E19181E18181E15151B49494C5B5957 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F16191E0D101666696EFFFFFFE6E7EA292A2E17 + 1A1F171A1F171A1F171A1F171A1F171A1E19181E18181E15151B49494C5B5957 515250545755191C1B11121610111513141817191D16191D15181C16191D2025 28788287636D755A6770626E78606D75606D75606D75616E76767F82FFFFFFFE FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFF @@ -3994,17 +3994,17 @@ object FormPrinc: TFormPrinc F4DBE7EBD4E0E4D8E4E8E7F3F7E9F5F9F1FAFE838A8F22272A181D201F242724 282C1B23231D24241E232535383A66615E5F5A596C686937353613151A16191E 161A1E16191F171A1E16181D0002076C6F74FFFFFFFFFFFFB3B4B817181C1517 - 1D16191E171A1F161A1F191A1D18191D191A1E0E0F13464849FFFFFFFFFFFF31 - 3334101418080B0E999B9CFFFFFFA2A3A4D9DCDDFFFFFF383A3B101217171A1F + 1D16191E171A1F161A1F191A1D18191D171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F15181E080A0FFFFFFF - CECFD30000005F6061FFFFFF7275750A0D111A1D1FFFFFFFCED0D1000000C8C8 - CBFFFFFF1A1C1D13161A161A1F171A1F171A1F171A1F171A1F171A1F14171C14 - 171CB2B4B8FFFFFFFFFFFF6D6E7200020614171D171A1F16191E181A1F19181F + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F14171C14 + 171CB2B4B8FFFFFFFFFFFF6D6E72171A1F171A1F171A1F16191E181A1F19181F 14131A3231385D5B5E5752505454533C403E0D10101213181213171314181113 17101418101317181B1F5B60646B747A616C7367747C636F79626F77626F7762 707859656CCAD0D2FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -4012,16 +4012,16 @@ object FormPrinc: TFormPrinc FEF8FEFDD8E1E2E7F1F5EBF4FEE4ECF6D9E1EBD3DCE5DDE6EFE7F0F9E6F0F9DC E5EE303D3F0E181B1B222523282B1F24271B20231F24271D2326595757696465 645D5F655B5C171819181C1E15191E13192116171B18191DC0C1C5FFFFFFFFFF - FF5F5F6501010718171D17191E161A1F171A1F161A1F19191D18191D18191D19 - 1A1E0001069FA0A4FFFFFF34353911141915181D0A0D13ABAFB3FFFFFFF9FCFF - 696C7005080D171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A + FF5F5F6501010718171D17191E161A1F171A1F161A1F19191D18191D171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F161A1F06080C999C9CFFFFFFFFFFFFFFFFFFF7F8FC10111516171B0607 - 0A969999FFFFFFFFFFFFFFFFFF999A9D06070C191A1E181A1D161A1F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F14171C000105626464FFFFFFFFFFFFC0C2C4171A1F 15181D16191E191A211B182019151B5D575C5E58585754525755551214151214 17111616111616111616101516070E0E171F22222C316D777F66727A6A757D69 @@ -4031,15 +4031,15 @@ object FormPrinc: TFormPrinc E1EAD3DCE5D6DFE8DCE5EEEEF7FF798587212B2D151C1F2025282126291E2326 1D22252024282C2C2C6766655955555D565749484A111214171A1F1518211718 1C141418FEFFFFE6E7EA21222709091019191F1A1920171A1E161A1F171A1F16 - 191F19191D191A1E18191D0A0B0F1314180D0E12141519131418181A1F16191E - 14171C04070C090C11070A0E080B0F171A1E16191E171A1F171A1F171A1F171A + 191F19191D191A1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F16191E181A1F0405085051548A8B8E7475 - 790E0F1316171B18191D191B1E0405095253568B8C8F52535708090D1314180A + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F1314180A 0B0F16191D16191E16191E171A1F171A1F171A1F171A1F161A1F17191D08090C 222326E5E6E9FFFFFF101318171A1F16191E191A201311174541465D585A5A56 545F5E5D2C2C2C1115151216191115161216171115161215160F15161C23264B @@ -4056,9 +4056,9 @@ object FormPrinc: TFormPrinc 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1E1718 - 1F18181F1110170B0B120D0D1416181B18191D191A1D18191D18181F1010170B - 0B121212180F101426272B939498010308181B20171A1F16191E161A1E171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F0F101426272B939498010308181B20171A1F16191E161A1E171A1F 171A1F161A1E181A1F19181F1313190D0D1425262C13161B181B2016191E1415 1A2D2C2F615F5F5F5A5A63605D484B490F131213181A13181A12161713171712 16171014152026262E36384C555A59636B5F6A736570786E79816B767E6B767C @@ -4075,8 +4075,8 @@ object FormPrinc: TFormPrinc 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F161A1E17192019172118172118172118191E181A1D181A1E18 - 1A1D18181E18172118172118172115151B25262AF5F7F9FFFFFF999B9E000005 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F15151B25262AF5F7F9FFFFFF999B9E000005 14171C16191F16191E161A1E171A1F161A1E17182019172118172016151E1415 1D171A20181B2014181D1A1B1F5C5B5B5A58575E5A5765635E181E1C13191812 191A12181A131617131718141819191D1E282F2F3C4447414B4F424C54525D65 @@ -4093,8 +4093,8 @@ object FormPrinc: TFormPrinc 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1E161A1E161A1E16 - 1A1E161A1F161A1F161A1F161A1F161A1F161A1E161A1E161A1E070A0EB2B4B4 + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1E070A0EB2B4B4 FFFFFFFDFFFDFFFFFF9B9C9F0000051A1821181820161A1E16191E171A1F161A 1E161A1E161A1E171A1E151A20141920161A1F111417514F505A51515F5A5964 605F3131320E111613161A16191D17191D19191D15171B12161A262E312F3C41 @@ -4145,8 +4145,8 @@ object FormPrinc: TFormPrinc 191D161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1E171A1E171A1E161A1E171A1F171A1F17191F17191F17191E171A1E - 171A1F171A1E171A1F171A1F17191F17191F17191F161A1E171A1F171A1F171A + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1E1718 @@ -4163,9 +4163,9 @@ object FormPrinc: TFormPrinc 161B171A1F16191E16191F161A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1D171A1D171A1D161A1D15151C14121C - 16151E19172119191E19191D1A1B1F1A1A1E14141B15131D1817201917211818 - 20161A1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F161A1E161A1E161A1E14171D000105B8B9BAFFFFFFFC @@ -4181,9 +4181,9 @@ object FormPrinc: TFormPrinc FFFFBABBBE00010517181C19191D16191F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1D171A1E - 16191D070B0F17181E29292F1111170D0D13191A1D18191D18191D08090D2323 - 2825252B07070D17171D181A1F16191E171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 @@ -4200,8 +4200,8 @@ object FormPrinc: TFormPrinc 161A1F161A1F171A1F161A1F16191E161A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F161A1D16191D05080D717478FFFFFFFFFFFFFFFFFF5C5E600D0E - 1118191D0C0D11C4C5C8FFFFFFFFFFFFCCCECF090B0D16181C16191F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F16191E171A1F171A1F161A1F161A1F17 @@ -4218,9 +4218,9 @@ object FormPrinc: TFormPrinc 191A1E19191D16191F17191F17191F171A1F15181D0E1116171A1F16191E1619 1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F161A1F16191D101317393C40FFFFFFDCDE - DF464849DBDDDEFFFFFF1D1E21090A0E88898DFFFFFF8A8C8D818384FFFFFF8A - 8B8B090B0F161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F16 191E16191E0E111615181D16191E16191E171A1F171A1F161A1E171820181720 @@ -4236,9 +4236,9 @@ object FormPrinc: TFormPrinc 12151A15191E161A1F161A1F16191F161A1F19181F19181F19181E18171E0D0E 1264656907080C1B1C20171A1E16191F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F1819 - 1F09090DA1A3A3FFFFFF48494C00000066676BFFFFFF545559000001DBDCE0FF - FFFF04050A06070BFFFFFFDCDDE1000308161A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F15181D171A2006070C62626610111518181C191B1F16191E @@ -4255,8 +4255,8 @@ object FormPrinc: TFormPrinc 1F18181E19191F030309939498FFFFFF8B8C8F0C0C1017191E161A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F16191E1A1A2007080CBDBFBFFFFFFF4041440000006E6F73FF - FFFF4F5053000000F7F8FBF5F6F805060B04050AF7F8FBFFFFFF06080D16191E + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F15181D0C0F14898B90FFFFFF @@ -4273,9 +4273,9 @@ object FormPrinc: TFormPrinc 1E161A1F161A1F161A1F19181F19191F0D0D1345454BFFFFFFFBFCFE13141919 191D16191E161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F17181D06070BC5C7C7FF - FFFFE5E6E8646569FAFBFEFEFFFF0C0D1106070BFFFFFFF3F4F806070C040509 - F7F8FBFFFFFF0A0D1215181D171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F14171C0F1116FEFEFFFFFFFF4041450E101516191E16191E171A1F171A @@ -4291,9 +4291,9 @@ object FormPrinc: TFormPrinc 4213161B16191E171A1F171A1F16191E171A1E161A1E19181E14141A0F0F15FF FFFFFFFFFF3B3C4010111517181C181A1F16191E171A1F171A1F171A1E171A1E 171A1E171A1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16 - 1A1F17181D06070BBBBEBEFFFFFF88898CFFFFFFD1D2D526272B101215000105 - F7F8FAF6F7F905060B05060AF6F7FAFFFFFF06080E16191E171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F16191F0E10143F4044FFFFFFFFFFFF0F11 @@ -4310,9 +4310,9 @@ object FormPrinc: TFormPrinc 191D181A1D0A0C0FCFD0D3FFFFFF8C8F9401040915181D171A1F16191E171A1F 171A1F171A1F16191D171A1D16191D16191D171A1F171A1F171A1F171A1F171A 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F161A1F181A1D0A0B0F909195FFFFFF38393D000000 - 1C1D21434448191921020209D5D5DAFFFFFF02020606070BFFFFFFDBDCDD0103 - 08161A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F16191E16191E16191E171A1F171A1F171A1F171A1F171A1F161A1F171A 1E0102068C8D90FFFFFFCFD1D4070A0F16191E17191E151A20141920171B1F15 @@ -4328,9 +4328,9 @@ object FormPrinc: TFormPrinc 181C18181C191A1E191A1E18191D18191D1C1D21FCFDFFE1E2E500000316191E 171A1F16191E171A1F171A1F171A1F16191F171A1E13161A04070B1114171619 1E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 - 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F181A1D141519 - 28292DFFFFFFDCDDE148494DF3F4F8FFFFFF17171E0A0A127C7D81FFFFFF9192 - 958D8E92FFFFFF8182860B0C12161A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F16191E10131804070D13161B171A1F171A1F171A 1F171A1F171A1F161A1F17191E18181C010206DCDDE1FCFEFF1C1F2414171C17 @@ -4347,8 +4347,8 @@ object FormPrinc: TFormPrinc 14151923242815181C16191E16191E171A1F161A1F161A1F161A1E161A1F1316 1A1B1E22DCDFE245484C10131816191F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F161A1F181A1D191A1E090A0E58595DFDFEFFFFFFFFFFFFFF5C5D610D0D - 1417171E0C0C11BABCBCFFFFFFFFFFFFBEBFC3090A0E16191D16191F171A1F17 + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F161A1F 161A1F161A1F161A1F171A1F171A1F171A1F171A1F171A1F0F121746494FDEE1 E51D2026111419171A1F171A1F171A1F171A1F161A1F181A1F191A1D14151921 @@ -4365,9 +4365,9 @@ object FormPrinc: TFormPrinc 16171A18191C181A1E18191E16171B16161A16191E161A1F171A1F161A1F1719 1F16191E161A1F16191F04070A9DA0A3FFFFFF8B8E92090C11171A1F171A1F17 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F - 171A1F171A1F171A1F171A1F171A1F161A1F181A1D19191D1A1B1F0B0C100B0C - 102425291011160D0E1119182019182016171B080A0B1B1C201E1F2306070B16 - 161A181A1F16191E171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F161A1F161A1E161A1F161A1F161A1E161A1F161A1F171A1F171A1F171A 1F16191E0B0E138B8E92FFFFFF9A9DA003060B16191E16191E171A1F171A1F16 1A1F181A1F191A1D191A1E131417181A1E16191E171A1F15191E121518252627 @@ -4383,9 +4383,9 @@ object FormPrinc: TFormPrinc 393A393F3E3D40413F3F403E2E2F2D18191615191F161A22151921151821171A 1E171A1F171A1F161A1F19181F19181E1A1A2016161D171A1AFFFFFFFFFFFF08 080D15171C161A1F171A1F171A1F171A1F171A1F16191E16191E171A1F16191E - 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A - 1F161A1F16191E161A1F15181D13161B15191E15191E11121912111A14131D19 - 182115171D13171C16191E161A1F16191E171A1F171A1F171A1F171A1F171A1F + 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F161A1F181A1D19191D191A1D19191D181A 1F161A1F171A1F171A1F171A1F16191E16191E04080DFCFFFFFFFFFF16181817 171B191A2016191E171A1F171A1F161A1F161A1F16191F171A1F161A20151820 @@ -4402,8 +4402,8 @@ object FormPrinc: TFormPrinc 1E17181E17191E18191F161A1F16191E171A1F161A1F19181F18181E19191F05 050BA6A8A9FFFFFF747577090A0F181B2016191E171A1F171A1F171A1F16191E 171A1F101319070A0F12151A16191E171A1F171A1F171A1F171A1F171A1F171A - 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F16191E171A1F13 - 161B3E3F443D3D433E3E4415151B181A1F16191E171A1F171A1F171A1F171A1F + 1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F17 + 1A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F 171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F171A1F161A1F1719 1D14151908090E12131717191E161A1F171A1F171A1F171A1F16191E171A1F05 080D77797CFFFFFFA6A8A905050A17181E161A1F171A1F171A1F171A1F16191E @@ -5443,8 +5443,8 @@ object FormPrinc: TFormPrinc end object StatusBar1: TStatusBar Left = 0 - Top = 596 - Width = 1091 + Top = 409 + Width = 866 Height = 22 Panels = < item diff --git a/UnitPrinc.pas b/UnitPrinc.pas index 2fe1725..e8d1753 100644 --- a/UnitPrinc.pas +++ b/UnitPrinc.pas @@ -1,5 +1,5 @@ unit Unitprinc; -// 27/03/2025 +// 11/06/2025 (******************************************** Programme signaux complexes Graphique Lenz Composants ClientSocket et ServeurSocket pour les connexions réseau socket @@ -1056,7 +1056,7 @@ tTrain = record Ttache = array[1..MaxTaches] of record - typeTache : integer ; // 0 : rien - 1 : accessoire ... etc + typeTache : integer ; // 0:rien - 1:accessoire 2:vitesse train 3:fonction F 4:tempo traite : boolean; // traitement en cours tempo : integer; // tempo avant exécution de la commande dest : integer; // destinataire : 1=CDM - 2=XpressNet 3=Dccpp @@ -1101,6 +1101,8 @@ var Modesombre,serveur_ouvert,pasChgTBV,FpBouge,debugPN,simuInterface,option_demitour, mesureTrains,AffCompteur,clicTBGB,clicTBfen,clicTBTrain,ModeTache,NoTraite : boolean; + RedFonte : single; + Style : array[0..200] of Tstyle; Interfaces_CDM : array[1..20] of string; @@ -1257,9 +1259,9 @@ var famille : integer; // 1=système 2=CDM 3=SC ne sert qu'à filtrer l'affichage par la combobox end; - Fonction : array[0..100,0..100] of Tfonction; - NomFonction : array[0..100] of string; - ArbreFonc : array[0..100,0..100] of integer; + Fonction : array[0..100,0..100] of Tfonction; // indice de la fonction,éléments de la fonction + NomFonction : array[0..100] of string; // nom de la fonction + ArbreFonc : array[0..100,0..100] of integer; // fonction sous forme d'arbre blocUSB : array[1..10] of record AffTrain : string; @@ -1490,6 +1492,7 @@ procedure renseigne_comp_trains(i : integer); function ClavierHookLLProc(Code : integer; WordParam : wparam; LongParam: lparam) : LongInt; stdcall; procedure cree_GB_compteur(rang : integer); procedure pilote_train(det1,det2,AdrTrain,it : integer); +procedure equation_droite(y1,y2,x1,x2 : single;var pente,b : single); implementation @@ -1866,7 +1869,7 @@ begin Formprinc.FenRich.StyleName:='Windows'; // et dans formdebug.Create aussi - // énumérer tous les composants pour repaint les richedit - ne marche pas + // énumérer tous les composants pour repaint les richedit - ne marche pas :D { for i:=0 to Screen.FormCount-1 do begin @@ -2156,7 +2159,6 @@ var ts : tstrings; f : textFile; begin s:=GetCurrentProcessEnvVar('SystemDrive'); // s='c:' - cmd:='/c vol '+s+' >vol.txt'; // /c ferme la fenetre en fin d'exec /k ne ferme pas // si on fait un runas au lieu de open, çà ouvre une fenetre de demande admin sur les postes non admin // ou dont le niveau d'utilisateur est bas dans le profil @@ -2181,7 +2183,7 @@ begin i:=pos('-',s); if i>4 then begin - i:=i-4; + i:=i-4; s:=copy(s,i,9)+' '; // Id de formatage de c:\ end; end @@ -2405,12 +2407,6 @@ begin chaine_HEX:=sa_hex; end; -// Affiche une chaîne en Hexa Ascii -procedure affiche_chaine_hex(s : string;couleur : Tcolor); -begin - if traceTrames then AfficheDebug(chaine_HEX(s),couleur); -end; - procedure Affiche(s : string;lacouleur : TColor); begin with formprinc do @@ -2841,7 +2837,6 @@ begin if trouve then result:=port else result:=0; end; - {$ELSE} // connecte un port usb interface vers centrale avec TMSCOMM. Si le port n'est pas ouvert, renvoie 0, sinon renvoie @@ -5221,7 +5216,7 @@ begin end; } -// dessine l'aspect du signal en fonction de son adresse dans la partie droite de droite +// dessine l'aspect du signal en fonction de son adresse dans le canvas de destination procedure Dessine_signal_mx(CanvasDest : Tcanvas;x,y : integer;FrX,frY : single;adresse : integer;orientation : integer); var i,aspect : integer; begin @@ -5507,6 +5502,7 @@ begin //CompteurT[rang].ImgH:=imH; end; + // Nom du train CompteurT[rang].lbl:=TLabel.Create(Formprinc.ScrollBoxC); with CompteurT[rang].lbl do begin @@ -5518,15 +5514,13 @@ begin left:=8; width:=largComptC-10; font.Name:='Arial'; - font.Size:=10; + font.Size:=round(RedFonte*10); font.Style:=[fsbold]; //transparent:=false; //couleur:=compteurT[rang].gb.Color; //affiche(intToHex(couleur,6),clyellow); //color:=couleur; - caption:=trains[rang].nom_train; - end; CompteurT[rang].Img:=Timage.create(CompteurT[rang].gb); @@ -5620,51 +5614,51 @@ end; // renseigne les composants image train, label et vitesse procedure renseigne_comp_trains(i : integer); begin - with image_train[i] do - begin - Autosize:=true; - align:=alNone; - Parent:=Formprinc.ScrollBoxTrains; - Name:='ImageTrain'+IntToSTR(i); // nom de l'image - Top:=50*(i-1); // détermine les points d'origine - Left:=0; - picture.Bitmap.Width:=LargImgTrain; - picture.Bitmap.Height:=HautImgTrain; - end; - with labeltrain[i] do - begin - Name:='LabelTrain'+intToSTR(i); - Caption:=Trains[i].nom_train; - Parent:=Formprinc.ScrollBoxTrains; - font.color:=clBlack; - font.Style:=[fsbold]; - width:=100;height:=20; - Top:=Image_train[i].Top+(HautImgTrain div 3); - Left:=LargImgTrain+10; - BringToFront; - end; - with LabelVitesse[i] do - begin - Name:='LabelVitesse'+intToSTR(i); - Caption:='V=0'; - Parent:=Formprinc.ScrollBoxTrains; - font.color:=clBlack; - width:=100;height:=20; - Top:=Image_train[i].Top+(HautImgTrain div 3)+12; - Left:=LargImgTrain+10; - BringToFront; - end; - with LabelBlocUSB[i] do - begin - Name:='LabelBlocUSB'+intToSTR(i); - caption:=''; - Parent:=Formprinc.ScrollBoxTrains; - font.color:=clBlack; - width:=100;height:=20; - Top:=Image_train[i].Top+(HautImgTrain div 3)+24; - Left:=LargImgTrain+10; - BringToFront; - end; + with image_train[i] do + begin + Autosize:=true; + align:=alNone; + Parent:=Formprinc.ScrollBoxTrains; + Name:='ImageTrain'+IntToSTR(i); // nom de l'image + Top:=50*(i-1); // détermine les points d'origine + Left:=0; + picture.Bitmap.Width:=LargImgTrain; + picture.Bitmap.Height:=HautImgTrain; + end; + with labeltrain[i] do + begin + Name:='LabelTrain'+intToSTR(i); + Caption:=Trains[i].nom_train; + Parent:=Formprinc.ScrollBoxTrains; + font.color:=clBlack; + font.Style:=[fsbold]; + width:=100;height:=20; + Top:=Image_train[i].Top+(HautImgTrain div 3); + Left:=LargImgTrain+10; + BringToFront; + end; + with LabelVitesse[i] do + begin + Name:='LabelVitesse'+intToSTR(i); + Caption:='V=0'; + Parent:=Formprinc.ScrollBoxTrains; + font.color:=clBlack; + width:=100;height:=20; + Top:=Image_train[i].Top+(HautImgTrain div 3)+12; + Left:=LargImgTrain+10; + BringToFront; + end; + with LabelBlocUSB[i] do + begin + Name:='LabelBlocUSB'+intToSTR(i); + caption:=''; + Parent:=Formprinc.ScrollBoxTrains; + font.color:=clBlack; + width:=100;height:=20; + Top:=Image_train[i].Top+(HautImgTrain div 3)+24; + Left:=LargImgTrain+10; + BringToFront; + end; end; // créée une image dans l'onglet trains , 2 label dynamiquement dans la partie droite pour un nouveau train déclaré dans le fichier de config @@ -5698,7 +5692,6 @@ begin renseigne_comp_trains(rang); with Image_Train[rang] do begin - onClick:=Formprinc.ImageTrainonclick; // affectation procédure clique G sur image OnDblClick:=formPrinc.ImageTrainDoubleClic; //onMouseDown:=Formprinc.ProcOnMouseDown; // clique G ou D @@ -5730,7 +5723,6 @@ begin begin labelBlocUSB[rang].Caption:='Bloc USB '+intToSTR(i); end; - end; end; @@ -6032,7 +6024,8 @@ begin end; end; -// teste la condition d'une action +// teste la (les) condition(s) d'une action +// action : index de l'action function teste_condition(action : integer) : boolean; var condValide : boolean; vit,vit1,vit2,it,pa,m1,m2,hc,n,ncond,cond,etat : integer; @@ -6394,7 +6387,7 @@ end; // fonction hook clavier de bas niveau (LL) appellée par appui ou relache sur une touche -// cette fonction intercepte tous les évènements clavier (pas les touches de fonctions [hotkeys]) windows quelque soit la fenetre ou le prog activé. +// cette fonction d'interception est appellée par tous les évènements clavier (pas les touches de fonctions [hotkeys]) windows quelque soit la fenetre ou le prog activé. // https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms644984(v=vs.85)?redirectedfrom=MSDN // https://learn.microsoft.com/fr-fr/windows/win32/api/winuser/ns-winuser-kbdllhookstruct function ClavierHookLLProc(Code : integer; WordParam : wparam; LongParam: lparam) : longint; @@ -6764,7 +6757,7 @@ begin begin sc:=false; // il faut qu'on soit en RUN pour que les vitesses des trains soient prises en compte - // pour arrêter un train dans CDM, envoyer une consigne nulle ne suffit pas, il faut envoyer un _STOP + // pour arrêter un train dans CDM, envoyer une consigne nulle ne suffit pas, il faut envoyer un _STOP mais il n'y a pas de décélération if PilotageTrainsCDMNom then s:=chaine_CDM_vitesseST(vitesse,nom_train) // par nom du train else @@ -21091,6 +21084,12 @@ begin timer1.Interval:=100; timer1.Enabled:=true; + {$IF CompilerVersion >= 28.0} + RedFonte:=Screen.DefaultPixelsPerInch/Screen.PixelsPerInch; // pour la réduction des fontes : windows mise à l'échelle du texte + {$ELSE} + RedFonte:=100/Screen.PixelsPerInch; // pour la réduction des fontes : windows mise à l'échelle du texte + {$IFEND} + ButtonEssai.Visible:=not(diffusion); GetLocaleFormatSettings(0,FormatSettings); FormatSettings.DecimalSeparator:='.'; @@ -21943,7 +21942,7 @@ begin end; end; -// donne l'equation de droite: renvoie la pente et b (y=ax+b) de la droite passant par les points (x1,y1) et (x2,y2) +// donne l'equation de droite: renvoie la pente a et b (y=ax+b) de la droite passant par les points (x1,y1) et (x2,y2) procedure equation_droite(y1,y2,x1,x2 : single;var pente,b : single); begin if x2-x1<>0 then pente:=(y2-y1)/(x2-x1) else pente:=9999; @@ -21963,6 +21962,7 @@ begin end; // traite les taches par le timer +// une tache est piloter un accessoire, une vitesse de train ou une fonction F // tableau taches[].typeTache // [].chaine // [].tempo @@ -28097,4 +28097,6 @@ begin menu.Items[1].caption:='Extraire le compteur du train '+trains[IdTrainClic].nom_train; end; + + end. diff --git a/UnitTCO.dfm b/UnitTCO.dfm index 7dc8d69..4e29d75 100644 --- a/UnitTCO.dfm +++ b/UnitTCO.dfm @@ -307,6 +307,20 @@ object FormTCO: TFormTCO 8888888888888888888BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBB} end + object LabelPM: TLabel + Left = 968 + Top = 320 + Width = 16 + Height = 20 + Anchors = [akTop, akRight] + Caption = '- +' + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = 'Arial Narrow' + Font.Style = [] + ParentFont = False + end object ScrollBox: TScrollBox Left = 8 Top = 12 diff --git a/UnitTCO.pas b/UnitTCO.pas index 203551a..2a100c8 100644 --- a/UnitTCO.pas +++ b/UnitTCO.pas @@ -170,6 +170,7 @@ type Modeslection1: TMenuItem; Modedplacement1: TMenuItem; N12: TMenuItem; + LabelPM: TLabel; //TimerTCO: TTimer; procedure FormCreate(Sender: TObject); procedure FormActivate(Sender: TObject); @@ -417,6 +418,7 @@ type procedure EditAdrElementExit(Sender: TObject); procedure Modeslection1Click(Sender: TObject); procedure Modedplacement1Click(Sender: TObject); + procedure Button1Click(Sender: TObject); public { Déclarations publiques } end; @@ -1633,7 +1635,7 @@ begin if (typEL=Tjd) or (typel=Tjs) then begin if deb then Affiche(intToSTR(adr1),clred); - + // croisements ou tjd case Bim of 21 : begin zone_tco(t,adr1,typEl,SensTCO_E,13,false,false); // chercher 1er élément à droite - xcanton Tel1 @@ -1835,7 +1837,7 @@ procedure Init_TCO(indexTCO : integer); var x,y : integer; begin sauve_tco:=true; - Affiche('Nouveau tco '+intToSTr(indexTCO),clyellow); + Affiche('Nouveau tco '+intToStr(indexTCO),clyellow); NbreCellX[indexTCO]:=35;NbreCellY[indexTCO]:=20;LargeurCell[indexTCO]:=35;HauteurCell[indexTCO]:=35; largeurCelld2[indexTCO]:=largeurCell[indexTCO] div 2;HauteurCelld2[indexTCO]:=HauteurCell[indexTCO] div 2; EcranTCO[indexTCO]:=1; @@ -2500,13 +2502,6 @@ begin b:=i; end; -// donne l'équation de droite y=ax+b passant par les points (x1,y1) (x2,y2) -procedure droite(x1,y1,x2,y2: integer;var a,b: single); -begin - if x2<>x1 then a:=(y2-y1)/(x2-x1) else a:=99999; - b:=y1-a*x1; -end; - procedure sauve_fichiers_tco; var fichier : textfile; s : string; @@ -2971,7 +2966,7 @@ begin taillefont:=tco[indextco,x,y].TailleFonte; if taillefont=0 then taillefont:=8; tf:=(taillefont*LargeurCell[indexTCO]) div 40; - c.font.Size:=tf; + c.font.Size:=round(tf*RedFonte); if b=id_action then c.Brush.Color:=couleurAction; @@ -3018,7 +3013,7 @@ begin if repr=4 then texte_reparti(s,indextco,x,y,c.font.size) else c.Textout(x0+xt,y0+yt,s); - + // texte encadré if tco[indextco,x,y].buttoir=1 then @@ -6294,7 +6289,7 @@ begin if testbit(pont,2) or testbit(pont,6) then begin pen.color:=clfond[indexTCO]; - droite(xf,y0,x0,yf,a1,b1); + equation_droite(xf,y0,x0,yf,a1,b1); // droite a2,b2 // passant par x2,y2 a2:=a1; @@ -6439,7 +6434,7 @@ begin with canvas do begin // donne l'équation de droite y=ax+b passant par les points (x1,y1) (x2,y2) - droite(xc,yc,xf,y0,a1,b1); + equation_droite(xc,yc,xf,y0,a1,b1); //haut moveTo(x0,yc); LineTo(xc-epaisseur,yc); LineTo(xc+epaisseur,round((xc+epaisseur)*a1+b1) ); LineTo(xf,y0); @@ -6581,7 +6576,7 @@ begin if testbit(pont,0) or testbit(pont,4) then begin pen.color:=clfond[indexTCO]; - droite(x0,y0,xf,yf,a1,b1); + equation_droite(x0,y0,xf,yf,a1,b1); // droite a2,b2 // passant par x2,y2 a2:=a1; @@ -6717,7 +6712,7 @@ begin with canvas do begin // donne l'équation de droite y=ax+b passant par les points (x1,y1) (x2,y2) - droite(x0,y0,xc,yc,a1,b1); + equation_droite(x0,y0,xc,yc,a1,b1); moveTo(x0,y0);LineTo(xc-epaisseur,round((xc-epaisseur)*a1+b1) ); LineTo(xc+epaisseur,yc); LineTo(xf,yc); moveTo(x0,yc);lineTo(xc-epaisseur,yc); @@ -7115,7 +7110,7 @@ begin s:=canton[i].nom; if s<>'' then begin - font.Size:=((Larg*10) div 30)+1; //((LargCell*5) div 29); + font.Size:=round(RedFonte*((Larg*10) div 30)+1); //((LargCell*5) div 29); Brush.Color:=coul; dx:=TextWidth(s) div 2; dy:=TextHeight(s) div 2; @@ -7168,7 +7163,7 @@ begin if l'' then begin - font.Size:=((Larg*10) div 30)+1; //((LargCell*5) div 29); + font.Size:=round(RedFonte*((Larg*10) div 30)+1); //((LargCell*5) div 29); Brush.Color:=coul; dy:=TextWidth(s) div 2; dx:=TextHeight(s) div 2; @@ -7941,7 +7936,7 @@ begin if testbit(pont,2) or testbit(pont,6) then begin pen.color:=clfond[indexTCO]; - droite(xf,y0,x0,yf,a1,b1); + equation_droite(xf,y0,x0,yf,a1,b1); // droite a2,b2 // passant par x2,y2 a2:=a1; @@ -8085,7 +8080,7 @@ begin with canvas do begin // donne l'équation de droite y=ax+b passant par les points (x1,y1) (x2,y2) - droite(xc,yc,x0,yf,a1,b1); + equation_droite(xc,yc,x0,yf,a1,b1); //gauche moveTo(xc,y0); LineTo(xc,yc-epaisseur); LineTo(xc-epaisseur,round((xc-epaisseur)*a1+b1) ); LineTo(x0,yf); @@ -8236,7 +8231,7 @@ begin if testbit(pont,0) or testbit(pont,4) then begin pen.color:=clfond[indexTCO]; - droite(x0,y0,xf,yf,a1,b1); + equation_droite(x0,y0,xf,yf,a1,b1); // droite a2,b2 // passant par x2,y2 a2:=a1; @@ -8380,7 +8375,7 @@ begin with canvas do begin // donne l'équation de droite y=ax+b passant par les points (x1,y1) (x2,y2) - droite(x0,y0,xf,yf,a1,b1); + equation_droite(x0,y0,xf,yf,a1,b1); //gauche moveTo(xc,yf); LineTo(xc,yc+epaisseur); LineTo(xc-epaisseur,round((xc-epaisseur)*a1+b1) ); LineTo(x0,y0); @@ -11390,7 +11385,7 @@ begin with PCanvasTCO[indexTCO] do begin Brush.Color:=clFond; - font.Size:=((LargCell*6) div 30)+1; //((LargCell*5) div 29); + font.Size:=round(RedFonte*((LargCell*6) div 30)+1); //((LargCell*5) div 29); if NB then font.color:=clBlack else Font.Color:=tco[indextco,x,y].coulFonte; Font.Name:='Arial'; @@ -11973,9 +11968,50 @@ begin begin parent:=self; name:='BallonHint'; + BallonHint.Style:=bhsBalloon; + BallonHint.HideAfter:=4000; end; {$IFEND} + + + Label1.Font.Size:=round(12*RedFonte); + Label2.Font.Size:=round(12*RedFonte); + Label3.Font.Size:=round(12*RedFonte); + Label4.Font.Size:=round(12*RedFonte); + Label5.Font.Size:=round(12*RedFonte); + Label6.Font.Size:=round(12*RedFonte); + Label7.Font.Size:=round(12*RedFonte); + Label8.Font.Size:=round(12*RedFonte); + Label9.Font.Size:=round(12*RedFonte); + Label10.Font.Size:=round(12*RedFonte); + Label11.Font.Size:=round(12*RedFonte); + Label12.Font.Size:=round(12*RedFonte); + Label13.Font.Size:=round(12*RedFonte); + Label14.Font.Size:=round(12*RedFonte); + Label15.Font.Size:=round(12*RedFonte); + Label16.Font.Size:=round(12*RedFonte); + Label17.Font.Size:=round(12*RedFonte); + Label18.Font.Size:=round(12*RedFonte); + Label19.Font.Size:=round(12*RedFonte); + Label20.Font.Size:=round(12*RedFonte); + Label21.Font.Size:=round(12*RedFonte); + Label22.Font.Size:=round(12*RedFonte); + Label23.Font.Size:=round(12*RedFonte); + Label24.Font.Size:=round(12*RedFonte); + Label25.Font.Size:=round(12*RedFonte); + Label26.Font.Size:=round(12*RedFonte); + Label27.Font.Size:=round(12*RedFonte); + Label28.Font.Size:=round(12*RedFonte); + Label29.Font.Size:=round(12*RedFonte); + Label32.Font.Size:=round(12*RedFonte); + Label33.Font.Size:=round(12*RedFonte); + Label34.Font.Size:=round(12*RedFonte); + Label50.Font.Size:=round(12*RedFonte); + Label51.Font.Size:=round(12*RedFonte); + Label52.Font.Size:=round(12*RedFonte); + Label53.Font.Size:=round(12*RedFonte); + ModeSlection1.checked:=false; ModeDplacement1.Checked:=true; modeGlisse:=true; @@ -12000,7 +12036,19 @@ begin TamponTCO_org.Yorg:=0; indexTrace:=0; KeyPreview:=true; // valide les évènements clavier - TrackBarZoom.Tabstop:=false; // permet d'avoir les evts curseurs + with TrackBarZoom do + begin + Tabstop:=false; // permet d'avoir les evts curseurs + Anchors:=[]; + Anchors:=[akTop,akRight]; + end; + ImageDrapVert.Visible:=false; + ImageDrapRouge.Visible:=false; + ImageBt0Bistable.Visible:=false; + ImageBt1Bistable.Visible:=false; + ImageTemp2.Visible:=false; + ImageTemp.Visible:=false; + ButtonSauveTCO.TabStop:=false; ButtonConfigTCO.TabStop:=false; ButtonRaz.TabStop:=false; @@ -14169,6 +14217,7 @@ begin clLarge:=Width; clHaut:=Height; + PanelBas.Height:=GroupBox1.top+GroupBox1.Height+20; panelBas.width:=clLarge-5; PanelBas.Top:=clHaut-PanelBas.Height-50; // 50=entete de la fenetre @@ -14204,7 +14253,7 @@ end; procedure TFormTCO.FormActivate(Sender: TObject); //procedure PFormTCO[indexTCO].FormActivate(Sender: TObject); -var indextco : integer; +var i,indextco : integer; begin indextco:=index_TCO(sender); IndexTCOCourant:=indexTCO; @@ -14248,6 +14297,10 @@ begin TrackBarZoom.Min:=ZoomMin; positionne(indexTCO); + i:=ScrollBox.Left+ScrollBox.Width; + trackBarZoom.Left:=i; + LabelPM.Left:=i; + LabelZoom.Left:=i; renseigne_tous_cantons; renseigne_TJDs_TCO; @@ -15083,6 +15136,7 @@ var s,d,indexTCO : integer; begin if affevt then Affiche('TCO.FormKeyDown',clOrange); indexTCO:=index_TCO(Sender); + //Affiche('Avant xClicCell='+intToSTR(XClicCell[indexTCO]),clCyan); if (RadioGroupSel.ItemIndex=1) and (Key=Vk_Escape) then @@ -15153,6 +15207,23 @@ begin stop_modetrace(indexTCO); end; VK_DELETE : couper(indexTCO); + + 107 : begin + d:=TrackBarZoom.Position; + if d>15 then + begin + dec(d); + TrackBarZoom.Position:=d; + end; + end; + 109 : begin + d:=TrackBarZoom.Position; + if d<100 then + begin + inc(d); + TrackBarZoom.Position:=d; + end; + end; end; if (ssShift in Shift) then @@ -16329,13 +16400,12 @@ begin begin BallonHint.Title:=s1; BallonHint.Description:=s2; - BallonHint.Style:=bhsBalloon; - BallonHint.HideAfter:=4000; x:=(canton[IdCantonSelect].x-1)*LargeurCell[indexTCO]+(LargeurCell[indexTCO] div 2); y:=(canton[IdCantonSelect].y-1)*HauteurCell[indexTCO]+HauteurCell[indexTCO] div 2; ballonhint.ShowHint(PimageTCO[indexTCO].ClientToScreen(point(x,y))); // affiche le ballonHint - end; - {$IFEND} + ImageTCO.Hint:=''; // pas de hint "normal" + end; + {$IFEND} end; // évènement qui se produit quand on clique gauche ou droit @@ -18184,7 +18254,7 @@ begin begin FontDialog1.Font.Name:=tco[indextco,XclicCell[indexTCO],YclicCell[indexTCO]].Fonte; FontDialog1.Font.Color:=tco[indextco,XclicCell[indexTCO],YclicCell[indexTCO]].CoulFonte; - FontDialog1.Font.Size:=tco[indextco,XclicCell[indexTCO],YclicCell[indexTCO]].taillefonte; + FontDialog1.Font.Size:=round(RedFonte*tco[indextco,XclicCell[indexTCO],YclicCell[indexTCO]].taillefonte); fs:=[]; s:=tco[indextco,XclicCell[indexTCO],YclicCell[indexTCO]].FontStyle; @@ -19631,6 +19701,15 @@ begin modeGlisse:=true; end; +procedure TFormTCO.Button1Click(Sender: TObject); +var i : integer; +begin + i:=trackBarZoom.Left ; + Affiche(intToSTR(i),clLime); + dec(i); + trackBarZoom.Left:=i; +end; + end. diff --git a/Unit_Pilote_aig.dfm b/Unit_Pilote_aig.dfm index 34455b5..66c3537 100644 --- a/Unit_Pilote_aig.dfm +++ b/Unit_Pilote_aig.dfm @@ -13,6 +13,7 @@ object FormAig: TFormAig KeyPreview = True OldCreateOrder = False OnActivate = FormActivate + OnCreate = FormCreate OnKeyPress = FormKeyPress PixelsPerInch = 96 TextHeight = 13 diff --git a/Unit_Pilote_aig.pas b/Unit_Pilote_aig.pas index 7a0c6ff..454d47e 100644 --- a/Unit_Pilote_aig.pas +++ b/Unit_Pilote_aig.pas @@ -22,6 +22,7 @@ type procedure ButtonDev2Click(Sender: TObject); procedure ButtonDroit2Click(Sender: TObject); procedure FormKeyPress(Sender: TObject; var Key: Char); + procedure FormCreate(Sender: TObject); private { Déclarations privées } public @@ -194,9 +195,10 @@ begin if key=chr(27) then close; end; +procedure TFormAig.FormCreate(Sender: TObject); begin + width:=ButtonDroit2.left+buttonDroit2.Width+30; // adapte la fenetre aux taille des boutons qui ont pu changer si on sélectionne un % de fonte dans windows +end; - - - +begin end. diff --git a/selection_train.pas b/selection_train.pas index 3142137..2d3d33f 100644 --- a/selection_train.pas +++ b/selection_train.pas @@ -36,12 +36,10 @@ type { Déclarations publiques } end; -const -HauteurLigneSGT=30; var FormSelTrain: TFormSelTrain; - largC,hautC,LargeurSGT,indexTrainClic : Integer; + largC,hautC,LargeurSGT,indexTrainClic,HauteurLigneSGT : Integer; routeSav : TuneRoute; procedure actualise_seltrains; @@ -437,6 +435,7 @@ end; procedure TFormSelTrain.FormCreate(Sender: TObject); var i : integer; begin + HauteurLigneSGT:=round(30/redFonte); with ImageHaut do begin Width:=60;Height:=60;visible:=false; end; with ImageBas do begin Width:=60;Height:=60;visible:=false; end; with ImageDroite do begin Width:=60;Height:=60;visible:=false; end; @@ -454,14 +453,14 @@ begin ShowHint:=true; ColCount:=8; // nombre de colonnes RowCount:=Ntrains+1; - ColWidths[0]:=50; - ColWidths[1]:=200; // icone - ColWidths[2]:=150; // nom du train - ColWidths[3]:=60; // canton - ColWidths[4]:=100; - ColWidths[5]:=120; - ColWidths[6]:=30; - ColWidths[7]:=35; + ColWidths[0]:=round(50/RedFonte);; + ColWidths[1]:=round(200/RedFonte);; // icone + ColWidths[2]:=round(150/RedFonte);; // nom du train + ColWidths[3]:=round(60/RedFonte);; // canton + ColWidths[4]:=round(100/RedFonte);; + ColWidths[5]:=round(120/RedFonte);; + ColWidths[6]:=round(30/RedFonte);; + ColWidths[7]:=round(35/RedFonte);; LargeurSGT:=0; for i:=0 to 7 do LargeurSGT:=LargeurSGT+ColWidths[i]; width:=LargeurSGT+30; diff --git a/verif_version.pas b/verif_version.pas index c6b913f..b41b96f 100644 --- a/verif_version.pas +++ b/verif_version.pas @@ -26,7 +26,7 @@ var f : textFile; Const -VersionSC = '10.54'; // sert à la comparaison de la version publiée +VersionSC = '10.6'; // sert à la comparaison de la version publiée SousVersion=' '; // A B C ... en cas d'absence de sous version mettre un espace // pour unzip SHCONTCH_NOPROGRESSBOX=4; diff --git a/versions.txt b/versions.txt index 90068c8..982d211 100644 --- a/versions.txt +++ b/versions.txt @@ -333,7 +333,12 @@ version 10.51 : Correction placement des trains dans le TCO. version 10.52 : Sélection routes pour plusieurs trains dans le TCO. version 10.53 : Vérification du répertoire d'installation de CDM Rail. Correction d'un bug sur la suppression/création train. -version 10.54 : Améliorations diverses +version 10.54 : Améliorations diverses. +version 10.6 : Modification pour l'affichage de la barre de zoom du TCO pour les + versions les plus récentes de W11. + Ajout des touches + et - pour le zoom du TCO. + Correction des affichages lors des mises à l'échelle du texte dans win10/11. +