Kleine aanpassingen in ...convPredraw aangebracht.

svn path=/Database/trunk/; revision=6415
This commit is contained in:
Bert in het Veld
1998-12-23 12:45:24 +00:00
parent 3c2caf3162
commit 9fb63a0b0c

View File

@@ -738,11 +738,12 @@ CREATE OR REPLACE PACKAGE BODY cad AS
WHERE bis_boring_key = LPNKey;
cad.cad_SLNKstructinsertVALINT(Session_Id,'LPNKEYCONDA', SeqNr, LPNKeyCond, 1);
IF Punt_boring THEN
cad.cad_SLNKstructinsertVALINT(Session_Id,'INSPOINTX', SeqNr, loc_x_coord, 1);
cad.cad_SLNKstructinsertVALINT(Session_Id,'INSPOINTY', SeqNr, loc_y_coord, 1);
cad.cad_SLNKstructinsertVALREAL(Session_Id,'INSPOINTX', SeqNr, loc_x_coord, 1);
cad.cad_SLNKstructinsertVALREAL(Session_Id,'INSPOINTY', SeqNr, loc_y_coord, 1);
cad.cad_SLNKstructinsertVALINT(Session_Id,'INSPOINTCODE', SeqNr, 1, 1);
END IF;
cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABELCOL',SeqNr, 'BIS_BORING_NUMMER', 1);
cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABEL',SeqNr, boring_nummer, 1);
END cad_SLNKConvPreDraw;
@@ -752,10 +753,16 @@ CREATE OR REPLACE PACKAGE BODY cad AS
LPNKeyCond NUMBER(10);
Diepte NUMBER(8,2);
Veld_Key NUMBER(10);
LocatieKey NUMBER(10);
DisciplineKey NUMBER(10);
Subloc_Code VARCHAR2(5);
Boring_nummer VARCHAR2(5);
Projectnr VARCHAR2(8);
Ontgraafvak_Naam VARCHAR2(32);
SrcDwg VARCHAR2(128);
LoadDwg VARCHAR2(128);
AttachDwg1 VARCHAR2(128);
AttachDwg2 VARCHAR2(128);
Punt_boring BOOLEAN;
Boring_Symbol VARCHAR2(128);
Valint NUMBER;
@@ -781,6 +788,24 @@ CREATE OR REPLACE PACKAGE BODY cad AS
Punt_boring := FALSE;
END IF;
cad.cad_SLNKstructinsertVALINT(Session_Id,'DIMENSION', SeqNr, Valint, 1);
/* Zoek de juiste tekeningen bij de boring */
BEGIN
SELECT ins_discipline_key INTO DisciplineKey
FROM ins_discipline
WHERE ins_discipline_omschrijving = ' ';
EXCEPTION
WHEN NO_DATA_FOUND THEN
DisciplineKey := NULL;
END;
Locatiekey := bis.bis_boring_get_locatie(LPNKey);
SrcDwg := cad_getDisciplinetekening(LocatieKey, DisciplineKey);
LoadDwg := cad_getPlattegrondtekening(LocatieKey);
AttachDwg1 := cad_getContourtekening(LocatieKey);
AttachDwg2 := SrcDwg;
cad_SLNKstructinsertVALSTR(Session_Id,'SRCDWG', SeqNr, SrcDwg, 1);
cad_SLNKstructinsertVALSTR(Session_Id,'LOADDWG', SeqNr, LoadDwg, 1);
cad_SLNKstructinsertVALSTR(Session_Id,'ATTACHDWG', SeqNr, AttachDwg1, 1);
cad_SLNKstructinsertVALSTR(Session_Id,'ATTACHDWG', SeqNr, Attachdwg2, 0);
IF Punt_boring THEN
/* Zoek juiste boringsymbool bij Boringnummer */
Boring_Symbol := cad_GETBoringSymbolName(LPNKey);
@@ -803,6 +828,15 @@ CREATE OR REPLACE PACKAGE BODY cad AS
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);
SELECT alg_locatie_key INTO Locatiekey
FROM alg_terreinsector
WHERE alg_terreinsector_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);
cad.cad_SLNKstructinsertVALSTR(Session_Id,'LABELCOL',SeqNr, 'ALG_TERREINSECTOR_CODE', 1);
SELECT alg_terreinsector_code INTO Subloc_code
FROM alg_v_aanwezigterreinsector
@@ -812,9 +846,19 @@ CREATE OR REPLACE PACKAGE BODY cad AS
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);
SELECT alg_locatie_key INTO Locatiekey
FROM bis_project
WHERE bis_project_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_project_nr INTO ProjectNr
FROM bis_v_aanwezigproject
WHERE bis_project_key = LPNKey;
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_SLNKstructinsertVALINT(Session_Id,'DIMENSION', SeqNr, 2, 1);