dev

app-install/vms-comm-server.txt.jsmooth

@@ -11,7 +11,7 @@
 <executableName>vms-comm-server.exe</executableName>
 <iconLocation>application.png</iconLocation>
 <initialMemoryHeap>-1</initialMemoryHeap>
-<jarLocation>vms-comm-server-0.0.1.jar</jarLocation>
+<jarLocation>..\target\vms-comm-server-0.0.1.jar</jarLocation>
 <mainClassName>org.springframework.boot.loader.JarLauncher</mainClassName>
 <maximumMemoryHeap>-1</maximumMemoryHeap>
 <maximumVersion></maximumVersion>

conf/debug.properties

@@ -1,5 +1,5 @@
 #system debug setting configuration...
-#Fri Sep 15 10:20:30 KST 2023
+#Tue Sep 19 11:57:47 KST 2023
 packet-info=1001
 packet-dump=1001
 system-debug=true

src/main/java/com/its/vms/domain/VmsForm.java

@@ -278,10 +278,10 @@ public class VmsForm implements Serializable {
         for (int jj = 0; jj < objCnt; jj++) {
             VmsFormObject pFormObj = getItem(jj);
 
-
             if (StringUtils.isEmpty(pFormObj.getMemSymbLibNmbr())) pFormObj.setMemSymbLibNmbr("1"); //이력저장용
             if (StringUtils.isEmpty(pFormObj.getTextData())) pFormObj.setTextData(" "); //이력저장용
 
+            String bitmapId = String.valueOf(pFormObj.getBitmapId());
             switch(pFormObj.getObjectType())
             {
                 case   1: //심볼
@@ -301,7 +301,7 @@ public class VmsForm implements Serializable {
                             pFormObj.getBkColor(),
                             pFormObj.getDsplWidth(),
                             pFormObj.getDsplHeight(),
-                            pFormObj.getMemSymbLibNmbr());
+                            bitmapId);
 
                     sCont = String.format("%02X%02X%s", objType, sTmp.length(), sTmp);
                     msgData.append(sCont);
@@ -319,7 +319,7 @@ public class VmsForm implements Serializable {
                             pFormObj.getBkColor(),
                             pFormObj.getDsplWidth(),
                             pFormObj.getDsplHeight(),
-                            pFormObj.getMemSymbLibNmbr());
+                            bitmapId);
 
                     sCont = String.format("%02X%02X%s", objType, sTmp.length(), sTmp);
                     msgData.append(sCont);

src/main/java/com/its/vms/domain/VmsFormObject.java

@@ -107,7 +107,7 @@ public class VmsFormObject implements Serializable {
     /**
      * 문자열 객체의 위치좌표 X 를 조정한다.
      */
-    public void changeTextPosition() {
+    public void changeTextPosition(float fontSizeRatio) {
         if ("".equals(this.textData)) {
             // 표출데이터가 없는 경우
             return;
@@ -122,7 +122,7 @@ public class VmsFormObject implements Serializable {
 
         int style = this.fontBold == 0 ? Font.PLAIN : Font.BOLD;
         Font font = new Font(this.fontName, style, this.fontSize);
-        font = font.deriveFont(this.fontSize * 1.35f);
+        font = font.deriveFont(this.fontSize * fontSizeRatio);//1.35f);
 
 //        FontRenderContext frc = new FontRenderContext(null, true, true);
 //        Rectangle2D r2 = font.getStringBounds(this.textData, frc);
@@ -139,7 +139,7 @@ public class VmsFormObject implements Serializable {
         }
         else if (this.textAlign == eVmsTextAlign.TEXT_ALIGN_CENTER.getValue()) {
             // 가운데정렬: 원래 글자의 중앙값을 얻은 다음에 조정된 글자의 1/2 크기를 뺀다음 음수이면 0으로 설정
-            this.posX = (this.posX+(this.dsplWidth /2)) - (textWidth/2);
+            this.posX = (this.posX+(this.dsplWidth/2)) - (textWidth/2);
             //this.posX += (correctWidth / 2);
         }
 
@@ -181,6 +181,9 @@ public class VmsFormObject implements Serializable {
         if (VmsFormService.isObjectBitmap(this.objectType)) {
             Image imgBmp = getImage();
             if (imgBmp != null) {
+//                g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+//                g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+//                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_DEFAULT);
                 g2d.drawImage(imgBmp, this.posX, this.posY, this.dsplWidth, this.dsplHeight, null);
             }
         }

src/main/java/com/its/vms/process/DbmsDataType.java

@@ -11,8 +11,6 @@ public enum DbmsDataType {
     DBMS_DATA_VMS_FORM_DOWNLOAD_RESULT,
     DBMS_DATA_SECT_TRAF_HS,
     DBMS_DATA_SECT_PASS_HS,
-    DBMS_DATA_LOG_HS,
-    DBMS_DATA_MULTIMEDIA_HS,
     DBMS_DATA_CTRL_HS,
 
     DBMS_DATA_SYMB_DNLD,

src/main/java/com/its/vms/service/VmsManageService.java

@@ -1004,7 +1004,7 @@ public class VmsManageService {
                         case 0:     // 고정문자열
                         case 201:   // 동영상파일명
                         case 301:   // 스트리밍영상주소
-                            formObj.changeTextPosition();
+                            formObj.changeTextPosition(this.config.getFontSizeRatio());
                             break;
                         case 1:     // 심볼
                         case 2:     // 파일이미지
@@ -1168,7 +1168,7 @@ public class VmsManageService {
                             if ("".equals(formObj.getTextData())) {
                                 formObj.setTextData(" ");
                             }
-                            formObj.changeTextPosition();
+                            formObj.changeTextPosition(this.config.getFontSizeRatio());
                             break;
                         case 401: // @관측장소
                         case 402: // @PM10
@@ -1232,7 +1232,7 @@ public class VmsManageService {
                             if ("".equals(formObj.getTextData())) {
                                 formObj.setTextData(" ");
                             }
-                            formObj.changeTextPosition();
+                            formObj.changeTextPosition(this.config.getFontSizeRatio());
                             break;
                         case 101: // @주차장명
                         case 102: // @주차면수
@@ -1268,7 +1268,7 @@ public class VmsManageService {
                             if ("".equals(formObj.getTextData())) {
                                 formObj.setTextData(" ");
                             }
-                            formObj.changeTextPosition();
+                            formObj.changeTextPosition(this.config.getFontSizeRatio());
                             break;
                         default:
                             //객체가 가변(소통정보 표출) 인 경우 가변문자를 설정하자....
@@ -1362,7 +1362,7 @@ public class VmsManageService {
                                     break;
                                 default: break;
                             }
-                            formObj.changeTextPosition();
+                            formObj.changeTextPosition(this.config.getFontSizeRatio());
                             break;
                     }
                 } // (ii = 0; ii < vmsForm.getObjects().size()