From d86882c51b810efd002af3cee605bb80e005715c Mon Sep 17 00:00:00 2001 From: Bert in het Veld Date: Thu, 24 Dec 1998 13:20:22 +0000 Subject: [PATCH] Procedure cad_SLNKPredraw aangepast zodat multi_select in het boringen- scherm ook goed werk. svn path=/Database/trunk/; revision=6416 --- CAD/CAD_PAC.SRC | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/CAD/CAD_PAC.SRC b/CAD/CAD_PAC.SRC index d510987b..3f418676 100644 --- a/CAD/CAD_PAC.SRC +++ b/CAD/CAD_PAC.SRC @@ -521,7 +521,6 @@ CREATE OR REPLACE PACKAGE BODY cad AS SELECT alg_locatie_key INTO locatie_key FROM alg_v_aanweziglocatie WHERE alg_locatie_code = LocCode; - IF LPNName = 'LPN_BIS_BORING' THEN BEGIN SELECT cad_tekening_filenaam @@ -769,14 +768,16 @@ CREATE OR REPLACE PACKAGE BODY cad AS SeqNr NUMBER(10); Datum DATE; BEGIN - LPNName := cad_SLNKSTRUCTreadVALSTR(Session_id, 'LPNALIASINSA'); - LPNKey := cad_SLNKSTRUCTreadVALINT(Session_id, 'LPNKEYINSA'); + LPNName := cad_SLNKSTRUCTreadVALSTR(Session_id, 'LPNALIASPREDRAW'); + LPNKey := cad_SLNKSTRUCTreadVALINT(Session_id, 'LPNKEYPREDRAW'); SeqNr := cad_SLNKSTRUCTreadVALINT(Session_id, 'SEQNR'); IF SeqNr IS NULL THEN SeqNr := 1; END IF; IF LPNNAME = 'LPN_BIS_BORING' THEN - /* Bepaal of er sprake is van een veld(contour) of van een puntboring */ + cad.cad_SLNKSTRUCTinsertVALSTR(Session_Id,'LPNALIASINSA', SeqNr, 'LPN_BIS_BORING', 1); + cad.cad_SLNKSTRUCTinsertVALINT(Session_Id,'LPNKEYINSA', SeqNr, LPNKey, 1); + /* Bepaal of er sprake is van een veld(contour) of van een puntboring */ SELECT bis_veld_key, bis_boring_nummer INTO veld_key, boring_nummer FROM bis_v_aanwezigboring WHERE bis_boring_key = LPNKey; @@ -792,7 +793,7 @@ CREATE OR REPLACE PACKAGE BODY cad AS BEGIN SELECT ins_discipline_key INTO DisciplineKey FROM ins_discipline - WHERE ins_discipline_omschrijving = ' '; + WHERE ins_discipline_omschrijving = 'Milieu'; EXCEPTION WHEN NO_DATA_FOUND THEN DisciplineKey := NULL; @@ -825,6 +826,8 @@ CREATE OR REPLACE PACKAGE BODY cad AS cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABELCOL',SeqNr, 'BIS_BORING_NUMMER', 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABEL',SeqNr, boring_nummer, 1); ELSIF LPNNAME = 'LPN_ALG_TERREINSECTOR' THEN + cad.cad_SLNKSTRUCTinsertVALSTR(Session_Id,'LPNALIASINSA', SeqNr, 'LPN_ALG_TERREINSECTOR', 1); + cad.cad_SLNKSTRUCTinsertVALINT(Session_Id,'LPNKEYINSA', SeqNr, LPNKey, 1); cad.cad_SLNKstructinsertVALINT(Session_Id,'DIMENSION', SeqNr, 2, 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LAYER', SeqNr, 'SUBLOCATIE', 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LPNCOLINSA', SeqNr, 'ALG_TERREINSECTOR_KEY', 1); @@ -843,6 +846,8 @@ CREATE OR REPLACE PACKAGE BODY cad AS WHERE alg_terreinsector_key = LPNKey; cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABEL',SeqNr, Subloc_code, 1); ELSIF LPNNAME = 'LPN_BIS_PROJECT' THEN + cad.cad_SLNKSTRUCTinsertVALSTR(Session_Id,'LPNALIASINSA', SeqNr, 'LPN_BIS_PROJECT', 1); + cad.cad_SLNKSTRUCTinsertVALINT(Session_Id,'LPNKEYINSA', SeqNr, LPNKey, 1); cad.cad_SLNKstructinsertVALINT(Session_Id,'DIMENSION', SeqNr, 2, 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LPNCOLINSA', SeqNr, 'BIS_PROJECT_KEY', 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABELCOL',SeqNr, 'BIS_PROJECT_NR', 1); @@ -861,6 +866,8 @@ CREATE OR REPLACE PACKAGE BODY cad AS ProjectNr := SUBSTR(ProjectNr,1,2)||'-'||SUBSTR(ProjectNr,3,6); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABEL',SeqNr, ProjectNr, 1); ELSIF LPNName = 'LPN_BIS_ONTGRAVINGSVAK' THEN + cad.cad_SLNKSTRUCTinsertVALSTR(Session_Id,'LPNALIASINSA', SeqNr, 'LPN_BIS_ONTGRAVINGSVAK', 1); + cad.cad_SLNKSTRUCTinsertVALINT(Session_Id,'LPNKEYINSA', SeqNr, LPNKey, 1); cad.cad_SLNKstructinsertVALINT(Session_Id,'DIMENSION', SeqNr, 2, 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LAYER', SeqNr, 'ONTGRAVINSVAK', 1); cad.cad_SLNKstructinsertVALSTR(Session_Id,'LPNCOLINSA', SeqNr, 'BIS_ONTGRAVINGSVAK_KEY', 1); @@ -869,10 +876,19 @@ CREATE OR REPLACE PACKAGE BODY cad AS FROM bis_ontgravingsvak WHERE bis_ontgravingsvak_key = LPNKey; cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABEL',SeqNr, Ontgraafvak_naam, 1); + SELECT alg_locatie_key INTO LocatieKey + FROM bis_ontgravingsvak + WHERE bis_ontgravingsvak_key = LPNKey; + SrcDwg := cad_getContourtekening(LocatieKey); + LoadDwg := cad_getPlattegrondtekening(LocatieKey); + AttachDwg1 := SrcDwg; + cad.cad_SLNKstructinsertVALSTR(Session_Id,'SRCDWG', 1, SrcDwg, 1); + cad.cad_SLNKstructinsertVALSTR(Session_Id,'LOADDWG', 1, LoadDwg, 1); + cad.cad_SLNKstructinsertVALSTR(Session_Id,'ATTACHDWG', 1, AttachDwg1, 1); SELECT bis_ontgravingsvak_diepte INTO Diepte FROM bis_ontgravingsvak WHERE bis_ontgravingsvak_key = LPNKey; - cad.cad_SLNKstructinsertVALINT(Session_Id,'DEPTH', SeqNr, Diepte, 1); + cad.cad_SLNKstructinsertVALREAL(Session_Id,'DEPTH', SeqNr, Diepte, 1); SELECT bis_ontgravingsvak_aanmaak INTO Datum FROM bis_ontgravingsvak WHERE bis_ontgravingsvak_key = LPNKey;