論理演算の記述ミス G91M98のバグ fix #16

NCVC-CAM · Sep 14, 2023 · 93eb9f0 · 93eb9f0
1 parent bf7737e
commit 93eb9f0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/NCVC/NCVC.rc b/NCVC/NCVC.rc
@@ -935,7 +935,7 @@ BEGIN
     CONTROL         IDB_SPLASH,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,7,7,285,137,WS_EX_DLGMODALFRAME
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME,46,152,187,70,WS_EX_STATICEDGE
     ICON            IDR_MAINFRAME,IDC_STATIC,58,166,20,20
-    LTEXT           "NCVC Version 4.12b",IDC_ABOUT_VER,86,166,135,8,SS_NOPREFIX
+    LTEXT           "NCVC Version 4.12c",IDC_ABOUT_VER,86,166,135,8,SS_NOPREFIX
     LTEXT           "Copyright (C) 1997-2023 MNCT K.Magara",IDC_STATIC,86,182,135,8
     LTEXT           "https://k-magara.github.io/",IDC_ABOUT_URL,86,198,135,8,SS_NOTIFY
 END
@@ -2411,8 +2411,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,2,2
- PRODUCTVERSION 4,1,2,2
+ FILEVERSION 4,1,2,3
+ PRODUCTVERSION 4,1,2,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -2430,13 +2430,13 @@ BEGIN
             VALUE "Comments", "NC Viewer and Converter"
             VALUE "CompanyName", "MNCT"
             VALUE "FileDescription", "NC Viewer and Converter"
-            VALUE "FileVersion", "4.1.2.2"
+            VALUE "FileVersion", "4.1.2.3"
             VALUE "InternalName", "NCVC.exe"
             VALUE "LegalCopyright", "Copyright (C) 1997-2023 K.Magara"
             VALUE "LegalTrademarks", "NIT(KOSEN) Maizuru College"
             VALUE "OriginalFilename", "NCVC.exe"
             VALUE "ProductName", "NCVC"
-            VALUE "ProductVersion", "4.1.2.2"
+            VALUE "ProductVersion", "4.1.2.3"
             VALUE "SpecialBuild", "Boost C++ 1.83, GLEW 2.10, Kodatuno R3.4kai"
         END
     END

diff --git a/NCVC/TH_NCRead.cpp b/NCVC/TH_NCRead.cpp
@@ -963,8 +963,9 @@ int NC_GSeparater(INT_PTR nLine, CNCdata*& pDataResult)
 	//
 	if ( bNCsub && bNCval ) {
 		// M98での[P_|L_]のｵﾌﾞｼﾞｪｸﾄ生成を抑制
-		if ( !(g_ncArgv.nc.dwValFlags & ~(NCD_P|NCD_L)) )
+		if ( g_ncArgv.nc.dwValFlags & (NCD_P|NCD_L) ) {
 			bNCval = FALSE;
+		}
 	}
 	//
 	if ( bNCobj || bNCval ) {

diff --git a/docs/Readme.txt b/docs/Readme.txt
@@ -1,9 +1,9 @@
 ===========================================================================
-�y�\ �t �g���z�@NCVC - NC(Gcode) Viewer and Converter Ver4.12b
-�y�o  �^  ���z�@ncvc412b.zip
+�y�\ �t �g���z�@NCVC - NC(Gcode) Viewer and Converter Ver4.12c
+�y�o  �^  ���z�@ncvc412c.zip
 �y���쌠  �ҁz�@�����@����
 �y�Ή�  �n�r�z�@Windows Vista �ȍ~�i�SVerOS�œ���m�F�����킯�ł͂���܂���j
-�y�f  ��  ���z�@2023/09/08
+�y�f  ��  ���z�@2023/09/15
 �y�\�t�g��ʁz�@�t���[�\�t�g
 �y�]��  �����z�@����ł��A��
 ===========================================================================
@@ -24,7 +24,7 @@
 
 
 �y�t�@�C�����X�g�z
-�@ncvc412b.zip�ɂ́A���̃t�@�C��������܂��B
+�@ncvc412c.zip�ɂ́A���̃t�@�C��������܂��B
 NCVC.exe             �F �{��
 Init.mnc             �F �@�B���̃T���v��
 Lathe.mnc            �F �@�B���̃T���v��(����)
@@ -181,10 +181,14 @@ NCVC
 
 
 �y�ύX�����z
+4.12b �� 4.12c �ւ̕ύX��
+�E�o�O���|�[�g
+�@�FG91G00X_Y_M98P_ �̂悤�ȃu���b�N�ŁC���W��2����Z����Ă����o�O���C���iIssue #16�j
+
 4.12a �� 4.12b �ւ̕ύX��
 �E�o�O���|�[�g
 �@�FM�R�[�h�̃u���b�N�Ƀ��[�_����z�肵�����W�f�[�^������ƁC���̍��W�f�[�^����������Ă����o�O���C���iIssue #15�j
-�@�FM98���iM30�̒��O�Ȃǁj�Ō�ɂ���ƁCNCVC��������o�O���C��
+�@�FM98���iM30�̒��O�Ȃǁj�Ō�ɂ���ƁC�g���[�X���s��NCVC��������o�O���C��
 
 4.12 �� 4.12a �ւ̕ύX��
 �E�o�O���|�[�g