Skip to content

Commit 6e15ba1

Browse files
committed
update AX 20.05.53d
1 parent 6ffa8e2 commit 6e15ba1

18 files changed

+161
-468
lines changed

CADViewer_config.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
"fileLocation" : "c:/nodejs/cadviewer-conversion-server/converters/files/",
66
"fileLocationUrl" : "http://127.0.0.1:3000/converters/files/",
77
"converterLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
8-
"ax2020_executable" : "AX2020_W64_20_05_53a.exe",
8+
"ax2020_executable" : "AX2020_W64_20_05_53d.exe",
99
"cvjs_svgz_compress" : true,
1010
"licenseLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
1111
"xpathLocation" : "c:/nodejs/cadviewer-conversion-server/converters/xpath/",
1212
"callbackMethod" : "getFile_09",
1313
"cvjs_debug" : true,
1414
"temp_print_folder" : "C:/nodejs/cadviewer-conversion-server/temp_print",
1515
"dwgmergeLocation" : "c:/nodejs/cadviewer-conversion-server/converters/dwgmerge2020/windows/",
16-
"dwgmerge2020_executable" : "DwgMerge2020.exe"
16+
"dwgmerge2020_executable" : "DwgMerge2020.exe",
17+
"linklistLocation" : "c:/nodejs/cadviewer-conversion-server/converters/linklist2020/windows/",
18+
"linklist2020_executable" : "LinkList_2020_W32_20_02_14a.exe"
1719
}
1820

CADViewer_config_angular.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
"fileLocation" : "c:/nodejs/cadviewer-conversion-server/converters/files/",
66
"fileLocationUrl" : "http://127.0.0.1:3000/converters/files/",
77
"converterLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
8-
"ax2020_executable" : "AX2020_W64_20_05_53a.exe",
8+
"ax2020_executable" : "AX2020_W64_20_05_53d.exe",
99
"cvjs_svgz_compress" : true,
1010
"licenseLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
1111
"xpathLocation" : "c:/nodejs/cadviewer-conversion-server/converters/xpath/",
1212
"callbackMethod" : "getFile_09",
1313
"cvjs_debug" : true,
1414
"temp_print_folder" : "C:/nodejs/cadviewer-conversion-server/temp_print",
1515
"dwgmergeLocation" : "c:/nodejs/cadviewer-conversion-server/converters/dwgmerge2020/windows/",
16-
"dwgmerge2020_executable" : "DwgMerge2020.exe"
16+
"dwgmerge2020_executable" : "DwgMerge2020.exe",
17+
"linklistLocation" : "c:/nodejs/cadviewer-conversion-server/converters/linklist2020/windows/",
18+
"linklist2020_executable" : "LinkList_2020_W32_20_02_14a.exe"
1719
}
1820

CADViewer_config_laravel.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
"fileLocation" : "c:/nodejs/cadviewer-conversion-server/converters/files/",
66
"fileLocationUrl" : "http://127.0.0.1:3000/converters/files/",
77
"converterLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
8-
"ax2020_executable" : "AX2020_W64_20_05_53a.exe",
8+
"ax2020_executable" : "AX2020_W64_20_05_53d.exe",
99
"cvjs_svgz_compress" : false,
1010
"licenseLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
1111
"xpathLocation" : "c:/nodejs/cadviewer-conversion-server/converters/xpath/",
1212
"callbackMethod" : "getFile_09",
1313
"cvjs_debug" : true,
1414
"temp_print_folder" : "C:/nodejs/cadviewer-conversion-server/temp_print",
1515
"dwgmergeLocation" : "c:/nodejs/cadviewer-conversion-server/converters/dwgmerge2020/windows/",
16-
"dwgmerge2020_executable" : "DwgMerge2020.exe"
16+
"dwgmerge2020_executable" : "DwgMerge2020.exe",
17+
"linklistLocation" : "c:/nodejs/cadviewer-conversion-server/converters/linklist2020/windows/",
18+
"linklist2020_executable" : "LinkList_2020_W32_20_02_14a.exe"
1719
}
1820

CADViewer_config_nodejs.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
"fileLocation" : "c:/nodejs/cadviewer-conversion-server/converters/files/",
66
"fileLocationUrl" : "http://127.0.0.1:3000/converters/files/",
77
"converterLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
8-
"ax2020_executable" : "AX2020_W64_20_05_53a.exe",
8+
"ax2020_executable" : "AX2020_W64_20_05_53d.exe",
99
"cvjs_svgz_compress" : false,
1010
"licenseLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
1111
"xpathLocation" : "c:/nodejs/cadviewer-conversion-server/converters/xpath/",
1212
"callbackMethod" : "getFile_09",
1313
"cvjs_debug" : true,
1414
"temp_print_folder" : "C:/nodejs/cadviewer-conversion-server/temp_print",
1515
"dwgmergeLocation" : "c:/nodejs/cadviewer-conversion-server/converters/dwgmerge2020/windows/",
16-
"dwgmerge2020_executable" : "DwgMerge2020.exe"
16+
"dwgmerge2020_executable" : "DwgMerge2020.exe",
17+
"linklistLocation" : "c:/nodejs/cadviewer-conversion-server/converters/linklist2020/windows/",
18+
"linklist2020_executable" : "LinkList_2020_W32_20_02_14a.exe"
1719
}
1820

CADViewer_config_reactjs.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
"fileLocation" : "c:/nodejs/cadviewer-conversion-server/converters/files/",
66
"fileLocationUrl" : "http://127.0.0.1:3000/converters/files/",
77
"converterLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
8-
"ax2020_executable" : "AX2020_W64_20_05_53a.exe",
8+
"ax2020_executable" : "AX2020_W64_20_05_53d.exe",
99
"cvjs_svgz_compress" : true,
1010
"licenseLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
1111
"xpathLocation" : "c:/nodejs/cadviewer-conversion-server/converters/xpath/",
1212
"callbackMethod" : "getFile_09",
1313
"cvjs_debug" : true,
1414
"temp_print_folder" : "C:/nodejs/cadviewer-conversion-server/temp_print",
1515
"dwgmergeLocation" : "c:/nodejs/cadviewer-conversion-server/converters/dwgmerge2020/windows/",
16-
"dwgmerge2020_executable" : "DwgMerge2020.exe"
16+
"dwgmerge2020_executable" : "DwgMerge2020.exe",
17+
"linklistLocation" : "c:/nodejs/cadviewer-conversion-server/converters/linklist2020/windows/",
18+
"linklist2020_executable" : "LinkList_2020_W32_20_02_14a.exe"
1719
}
1820

CADViewer_config_vuejs.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
"fileLocation" : "c:/nodejs/cadviewer-conversion-server/converters/files/",
66
"fileLocationUrl" : "http://127.0.0.1:3000/converters/files/",
77
"converterLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
8-
"ax2020_executable" : "AX2020_W64_20_05_53a.exe",
8+
"ax2020_executable" : "AX2020_W64_20_05_53d.exe",
99
"cvjs_svgz_compress" : false,
1010
"licenseLocation" : "c:/nodejs/cadviewer-conversion-server/converters/ax2020/windows/",
1111
"xpathLocation" : "c:/nodejs/cadviewer-conversion-server/converters/xpath/",
1212
"callbackMethod" : "getFile_09",
1313
"cvjs_debug" : true,
1414
"temp_print_folder" : "C:/nodejs/cadviewer-conversion-server/temp_print",
1515
"dwgmergeLocation" : "c:/nodejs/cadviewer-conversion-server/converters/dwgmerge2020/windows/",
16-
"dwgmerge2020_executable" : "DwgMerge2020.exe"
16+
"dwgmerge2020_executable" : "DwgMerge2020.exe",
17+
"linklistLocation" : "c:/nodejs/cadviewer-conversion-server/converters/linklist2020/windows/",
18+
"linklist2020_executable" : "LinkList_2020_W32_20_02_14a.exe"
1719
}
1820

app/css/cvjs_6.5.css

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,6 +2215,38 @@ table.info_messageModal_2Table td {
22152215

22162216
}
22172217

2218+
2219+
2220+
2221+
2222+
.cvjs_inputCalibrateModal{ /*6.5.11a*/
2223+
2224+
width: 80px;
2225+
height: 20px;
2226+
padding: 1px;
2227+
top: 3px;
2228+
bottom: 3px;
2229+
z-index:1000;
2230+
margin: 0px;
2231+
text-indent: 1px;
2232+
text-align:center;
2233+
font-family: "Arial-BoldMT", Arial, Helvetica, sans-serif;
2234+
text-decoration: none;
2235+
font-weight: none;
2236+
color:#000000;
2237+
font-size: 12px;
2238+
line-height: 1;
2239+
background: #D28A8E0;
2240+
2241+
}
2242+
2243+
2244+
2245+
2246+
2247+
2248+
2249+
22182250
.calibrateModal{
22192251
z-index:1000;
22202252
width: 360px;
@@ -2360,13 +2392,6 @@ table.calibrateModalTable td {
23602392
}
23612393

23622394

2363-
2364-
2365-
2366-
2367-
2368-
2369-
23702395
#cvjs_measurementModalText{
23712396
margin-top: 1px;
23722397
margin-bottom: 2px;
@@ -2382,7 +2407,7 @@ table.calibrateModalTable td {
23822407
.measurementModal{
23832408
z-index:1000;
23842409
width: 480px;
2385-
height: 120px;
2410+
height: 150px; /* 6.5.14a */
23862411
border-radius: 3px;
23872412
background-color: #FFFFFF;
23882413
border: 2px solid gray;
@@ -6622,7 +6647,7 @@ table.settingsModalTable td {
66226647
color:#000000;
66236648
font-size: 12px;
66246649
line-height: 1;
6625-
background: #D28A8E0;
6650+
background: "#D28A8E0";
66266651

66276652
}
66286653

@@ -6641,10 +6666,32 @@ table.settingsModalTable td {
66416666
width: 200px;
66426667
position: absolute;
66436668
left : 10px;
6644-
bottom : 6px
6669+
bottom : 36px /* 6.5.14a 6 -> 26 */
66456670
}
66466671

66476672

6673+
6674+
.cvjs_measurementSnap{
6675+
width: 100px;
6676+
display: inline-block;
6677+
position: absolute;
6678+
left : 10px;
6679+
bottom : 6px /* 6.5.14a */
6680+
6681+
}
6682+
6683+
.cvjs_measurementSnapSelect{
6684+
width: 140px;
6685+
display: inline-block;
6686+
position: absolute;
6687+
left : 140px;
6688+
bottom : 6px /* 6.5.14a */
6689+
6690+
}
6691+
6692+
6693+
6694+
66486695
.cvjs_measurementDisplayBox{
66496696
position: absolute;
66506697
left : 85px;

app/cv/cv-pro/language_table/cadviewerProLanguage.xml

Lines changed: 72 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,13 @@
297297
<PointsText>Select multiple points, capture from clipboard.</PointsText>
298298
<PathText>Click on an path for length</PathText>
299299
<PathLength>Length:</PathLength>
300+
<Snap>Snap Mode:</Snap>
301+
<SnapItems>
302+
<SnapItem>None</SnapItem>
303+
<SnapItem>Nearest</SnapItem>
304+
<SnapItem>End Point</SnapItem>
305+
<SnapItem>Center Point</SnapItem>
306+
</SnapItems>
300307
</MeasurementModal>
301308
<BirdsEyeModal>
302309
<Header>Birds-Eye Window</Header>
@@ -822,6 +829,13 @@
822829
<PointsText> Seleccione varios puntos, capture desde el portapapeles. </PointsText>
823830
<PathText>Haga clic en una ruta para ver la longitud</PathText>
824831
<PathLength>Longitud:</PathLength>
832+
<Snap>Modo de ajuste:</Snap>
833+
<SnapItems>
834+
<SnapItem>Ninguno</SnapItem>
835+
<SnapItem>Más cercano</SnapItem>
836+
<SnapItem>Punto final</SnapItem>
837+
<SnapItem>Punto central</SnapItem>
838+
</SnapItems>
825839
</MeasurementModal>
826840
<BirdsEyeModal>
827841
<Header> Ventana de ojo de pájaro </Header>
@@ -1348,7 +1362,14 @@
13481362
<PointsText>选择多个点,从剪贴板中捕获。</PointsText>
13491363
<PathText>单击路径以获取长度</PathText>
13501364
<PathLength>长度:</PathLength>
1351-
</MeasurementModal>
1365+
<Snap>捕捉模式:</Snap>
1366+
<SnapItems>
1367+
<SnapItem>无</SnapItem>
1368+
<SnapItem>最近</SnapItem>
1369+
<SnapItem>终点</SnapItem>
1370+
<SnapItem>中心点</SnapItem>
1371+
</SnapItems>
1372+
</MeasurementModal>
13521373
<BirdsEyeModal>
13531374
<Header>鸟眼窗口</Header>
13541375
</BirdsEyeModal>
@@ -1874,7 +1895,14 @@
18741895
<PointsText>選擇多個點,從剪貼板中捕獲。</PointsText>
18751896
<PathText>單擊路徑以獲取長度</PathText>
18761897
<PathLength>長度:</PathLength>
1877-
</MeasurementModal>
1898+
<Snap>捕捉模式:</Snap>
1899+
<SnapItems>
1900+
<SnapItem>無</SnapItem>
1901+
<SnapItem>最近</SnapItem>
1902+
<SnapItem>終點</SnapItem>
1903+
<SnapItem>中心點</SnapItem>
1904+
</SnapItems>
1905+
</MeasurementModal>
18781906
<BirdsEyeModal>
18791907
<Header>鳥眼窗口</Header>
18801908
</BirdsEyeModal>
@@ -2400,6 +2428,13 @@
24002428
<PointsText> Selecione vários pontos, capture da área de transferência. </PointsText>
24012429
<PathText>Clique em um caminho para obter comprimento</PathText>
24022430
<PathLength>Comprimento:</PathLength>
2431+
<Snap>Modo de ajuste:</Snap>
2432+
<SnapItems>
2433+
<SnapItem>Nenhum</SnapItem>
2434+
<SnapItem>Mais próximo</SnapItem>
2435+
<SnapItem>Ponto final</SnapItem>
2436+
<SnapItem>Ponto central</SnapItem>
2437+
</SnapItems>
24032438
</MeasurementModal>
24042439
<BirdsEyeModal>
24052440
<Header> Janela panorâmica </Header>
@@ -2927,6 +2962,13 @@
29272962
<PointsText> 여러 지점을 선택하고 클립 보드에서 캡처합니다. </PointsText>
29282963
<PathText>길이를 보려면 경로를 클릭하십시오</PathText>
29292964
<PathLength>길이:</PathLength>
2965+
<Snap>스냅 모드:</Snap>
2966+
<SnapItems>
2967+
<SnapItem>없음</SnapItem>
2968+
<SnapItem>가장 가까운</SnapItem>
2969+
<SnapItem>끝점</SnapItem>
2970+
<SnapItem>중심점</SnapItem>
2971+
</SnapItems>
29302972
</MeasurementModal>
29312973
<BirdsEyeModal>
29322974
<Header> 새 눈 창 </Header>
@@ -3454,6 +3496,13 @@
34543496
<PointsText> Pilih beberapa titik, ambil dari clipboard. </PointsText>
34553497
<PathText>Klik pada sebuah jalur untuk panjangnya</PathText>
34563498
<PathLength>Panjangnya:</PathLength>
3499+
<Snap>Mode jepret:</Snap>
3500+
<SnapItems>
3501+
<SnapItem>Tidak ada</SnapItem>
3502+
<SnapItem>Terdekat</SnapItem>
3503+
<SnapItem>Titik akhir</SnapItem>
3504+
<SnapItem>Titik tengah</SnapItem>
3505+
</SnapItems>
34573506
</MeasurementModal>
34583507
<BirdsEyeModal>
34593508
<Header> Jendela Bird-Eyes </Header>
@@ -3979,6 +4028,13 @@
39794028
<PointsText> Wählen Sie mehrere Punkte aus, die aus der Zwischenablage erfasst werden sollen. </PointsText>
39804029
<PathText>Klicken Sie auf einen Pfad für die Länge</PathText>
39814030
<PathLength>Länge:</PathLength>
4031+
<Snap>Fangmodus:</Snap>
4032+
<SnapItems>
4033+
<SnapItem>Keiner</SnapItem>
4034+
<SnapItem>Nächster</SnapItem>
4035+
<SnapItem>Endpunkt</SnapItem>
4036+
<SnapItem>Mittelpunkt</SnapItem>
4037+
</SnapItems>
39824038
</MeasurementModal>
39834039
<BirdsEyeModal>
39844040
<Header> Birds-Eye-Fenster </Header>
@@ -4505,6 +4561,13 @@
45054561
<PointsText> Sélectionnez plusieurs points, capturez à partir du presse-papiers. </PointsText>
45064562
<PathText>Cliquez sur un chemin pour la longueur</PathText>
45074563
<PathLength>Longueur:</PathLength>
4564+
<Snap>Mode Snap:</Snap>
4565+
<SnapItems>
4566+
<SnapItem>Aucun</SnapItem>
4567+
<SnapItem>Le plus proche</SnapItem>
4568+
<SnapItem>Point final</SnapItem>
4569+
<SnapItem>Point central</SnapItem>
4570+
</SnapItems>
45084571
</MeasurementModal>
45094572
<BirdsEyeModal>
45104573
<Header> Fenêtre à vol d'oiseau </Header>
@@ -4524,17 +4587,17 @@
45244587
<AllLayerOn> Calques activés </AllLayerOn>
45254588
<AllLayerOff> Désactivés </AllLayerOff>
45264589
<SwapLayers> Permuter </SwapLayers>
4527-
<On> Sur </On>
4528-
<Off> Hors </Off>
4590+
<On>OUI</On>
4591+
<Off>NON</Off>
45294592
<BaseAndXref> Dessin de base </BaseAndXref>
45304593
<Xref> Xref: </Xref>
45314594
</LayerListModal>
45324595
<PageChangeListModal>
45334596
<Header> Modifier la page de dessin </Header>
45344597
<Search> Recherche </Search>
45354598
<Sort> Trier par nom </Sort>
4536-
<On>Sur</On>
4537-
<Off>Hors</Off>
4599+
<On>OUI</On>
4600+
<Off>NON</Off>
45384601
</PageChangeListModal>
45394602
<LayerListSpaceModal>
45404603
<Header>Liste des calques - Objets spatiaux</Header>
@@ -4543,8 +4606,8 @@
45434606
<AllLayerOn> Calques activés </AllLayerOn>
45444607
<AllLayerOff> Désactivés </AllLayerOff>
45454608
<SwapLayers> Permuter </SwapLayers>
4546-
<On> Sur </On>
4547-
<Off> Hors </Off>
4609+
<On>OUI</On>
4610+
<Off>NON</Off>
45484611
<NotAssigned> Non attribué </NotAssigned>
45494612
<TextLayer> Calque de texte </TextLayer>
45504613
<RoomLayer> Couche de la pièce </RoomLayer>
@@ -4730,7 +4793,7 @@
47304793
<WaitModal>
47314794
<Printing> Impression </Printing>
47324795
<Thumbnails> Enregistrement </Thumbnails>
4733-
<BatchPDF> Imprimer au format PDF </BatchPDF>
4796+
<BatchPDF> Imprimer au PDF </BatchPDF>
47344797
<MergeDWG> Impression </MergeDWG>
47354798
</WaitModal>
47364799
</languages>
Binary file not shown.

0 commit comments

Comments
 (0)