diff --git a/mswin/VS12/SVExportPanel/GeneratedFiles/qrc_exportresource.cpp b/mswin/VS12/SVExportPanel/GeneratedFiles/qrc_exportresource.cpp index fae62b5..9ad367d 100644 --- a/mswin/VS12/SVExportPanel/GeneratedFiles/qrc_exportresource.cpp +++ b/mswin/VS12/SVExportPanel/GeneratedFiles/qrc_exportresource.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // C:/cpp/other/SVisual/src/SVExportPanel/resources/svexportpanel_en.qm + // C:/cpp/SVisual/src/SVExportPanel/resources/svexportpanel_en.qm 0x0,0x0,0x8,0x1d, 0x3c, 0xb8,0x64,0x18,0xca,0xef,0x9c,0x95,0xcd,0x21,0x1c,0xbf,0x60,0xa1,0xbd,0xdd,0x42, @@ -140,7 +140,7 @@ static const unsigned char qt_resource_data[] = { 0xbe,0x20,0xd1,0x81,0xd0,0xbe,0xd1,0x85,0xd1,0x80,0xd0,0xb0,0xd0,0xbd,0xd0,0xb5, 0xd0,0xbd,0x3a,0x20,0x7,0x0,0x0,0x0,0xb,0x65,0x78,0x70,0x6f,0x72,0x74,0x50, 0x61,0x6e,0x65,0x6c,0x1,0x88,0x0,0x0,0x0,0x2,0x1,0x1, - // C:/cpp/other/SVisual/src/SVExportPanel/resources/images/arrow-right.png + // C:/cpp/SVisual/src/SVExportPanel/resources/images/arrow-right.png 0x0,0x0,0x7,0x9f, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -265,7 +265,7 @@ static const unsigned char qt_resource_data[] = { 0x4,0xb6,0xfb,0x2b,0x8,0x46,0x0,0xe5,0xd0,0x0,0xca,0xa1,0x1,0x8,0x21,0x84, 0x10,0x42,0x8,0x21,0x84,0x10,0x42,0x94,0xf0,0x1f,0xe7,0x5a,0xc0,0x9a,0xc1,0x5b, 0x6b,0xb4,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVExportPanel/resources/images/arrow-left.png + // C:/cpp/SVisual/src/SVExportPanel/resources/images/arrow-left.png 0x0,0x0,0x4,0x9a, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, diff --git a/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj.user b/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj.user index d1b37ab..8aa17b0 100644 --- a/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj.user +++ b/mswin/VS12/SVExportPanel/SVExportPanel.vcxproj.user @@ -2,7 +2,7 @@ - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b$(PATH) @@ -10,7 +10,7 @@ PATH=$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b$(PATH) diff --git a/mswin/VS12/SVGraphPanel/GeneratedFiles/qrc_gpresource.cpp b/mswin/VS12/SVGraphPanel/GeneratedFiles/qrc_gpresource.cpp index 67b9643..c250c4d 100644 --- a/mswin/VS12/SVGraphPanel/GeneratedFiles/qrc_gpresource.cpp +++ b/mswin/VS12/SVGraphPanel/GeneratedFiles/qrc_gpresource.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/svgraphpanel_en.qm + // C:/cpp/SVisual/src/SVGraphPanel/resources/svgraphpanel_en.qm 0x0,0x0,0x9,0x3a, 0x3c, 0xb8,0x64,0x18,0xca,0xef,0x9c,0x95,0xcd,0x21,0x1c,0xbf,0x60,0xa1,0xbd,0xdd,0x42, @@ -158,7 +158,7 @@ static const unsigned char qt_resource_data[] = { 0xd0,0xb8,0xd1,0x82,0xd1,0x8c,0x20,0xd0,0xb2,0xd0,0xbd,0xd0,0xb8,0xd0,0xb7,0x7, 0x0,0x0,0x0,0xd,0x77,0x64,0x67,0x47,0x72,0x61,0x70,0x68,0x43,0x6c,0x61,0x73, 0x73,0x1,0x88,0x0,0x0,0x0,0x2,0x1,0x1, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/bw.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/bw.png 0x0,0x0,0x3,0xf5, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -225,7 +225,7 @@ static const unsigned char qt_resource_data[] = { 0x10,0x81,0xdf,0x18,0x85,0x7e,0x62,0x14,0xfa,0x89,0x51,0xe8,0x1f,0x12,0xf5,0x7, 0x67,0xbb,0xc2,0x6f,0x82,0x77,0xb,0x67,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44, 0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/SVLabel.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/SVLabel.png 0x0,0x0,0xa4,0x2c, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -2855,7 +2855,7 @@ static const unsigned char qt_resource_data[] = { 0xce,0x75,0xcd,0xe7,0xda,0x47,0x27,0x97,0xf1,0x5a,0xc0,0x51,0x5a,0xe6,0x33,0x6b, 0x7f,0xbe,0x5e,0x26,0x79,0xfd,0xff,0x24,0x1e,0x28,0x83,0x75,0x76,0xc0,0x12,0x0, 0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/arrowUp.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/arrowUp.png 0x0,0x0,0xb,0x48, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -3039,7 +3039,7 @@ static const unsigned char qt_resource_data[] = { 0x64,0xeb,0xd0,0x6d,0xab,0xf6,0xa3,0xfb,0xa8,0xe4,0x12,0xd5,0x7e,0x25,0x5b,0x87, 0x6e,0xdb,0xff,0xee,0x34,0xac,0x2,0xf2,0x3c,0x64,0x60,0x0,0x0,0x0,0x0,0x49, 0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/player_stop.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/player_stop.png 0x0,0x0,0x4,0xc1, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -3119,7 +3119,7 @@ static const unsigned char qt_resource_data[] = { 0xd8,0xd8,0x18,0xa5,0x7e,0xff,0x7c,0xc3,0xaa,0x28,0x7f,0x2,0x32,0xec,0x3d,0x1f, 0xd7,0xe2,0xb1,0x7f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/ascale.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/ascale.png 0x0,0x0,0x9,0x1b, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -3268,7 +3268,7 @@ static const unsigned char qt_resource_data[] = { 0x7c,0x41,0xdb,0xf5,0xa1,0xc7,0x64,0x1f,0x3f,0x43,0x93,0x79,0xb5,0xf9,0x8,0xcc, 0x47,0x60,0x86,0x11,0xf8,0x17,0x63,0x26,0x9,0xfd,0x31,0x1c,0x89,0xf1,0x0,0x0, 0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/player_play.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/player_play.png 0x0,0x0,0x4,0xff, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -3351,7 +3351,7 @@ static const unsigned char qt_resource_data[] = { 0x81,0x78,0x7d,0xd4,0xd6,0xd6,0x72,0x51,0xae,0x37,0x5,0xac,0x7d,0xf2,0x75,0x38, 0x2f,0xe7,0x83,0xc3,0xfb,0x1b,0x56,0x49,0xfa,0x3,0x36,0x7e,0x14,0x89,0xf5,0x7e, 0x2c,0x6f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/color_wheel.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/color_wheel.png 0x0,0x0,0x9,0x8, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -3499,7 +3499,7 @@ static const unsigned char qt_resource_data[] = { 0x16,0x2,0x33,0x22,0x67,0x91,0x31,0xff,0xb,0x81,0x74,0x16,0xe8,0x39,0x2d,0x3e, 0x5b,0xfe,0xd,0xf8,0x9,0xea,0x70,0x6d,0xfa,0x5c,0x8e,0x0,0x0,0x0,0x0,0x49, 0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/scalePos.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/scalePos.png 0x0,0x0,0x38,0x53, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4404,7 +4404,7 @@ static const unsigned char qt_resource_data[] = { 0xa8,0xaf,0xc0,0x27,0xed,0xd1,0xb3,0x68,0xfc,0x2a,0xe0,0xca,0xff,0x7,0xfe,0xf2, 0xc5,0xc8,0x32,0xf6,0xf9,0x6a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42, 0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/arrowDn.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/arrowDn.png 0x0,0x0,0xb,0x28, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4586,7 +4586,7 @@ static const unsigned char qt_resource_data[] = { 0x6e,0xe4,0x8f,0x79,0x40,0x95,0x7f,0x6e,0xe4,0x4f,0x79,0xc0,0x99,0x6f,0xf7,0xd9, 0xf9,0xfb,0xb,0xc0,0x50,0xac,0x2,0xf9,0x7c,0xf4,0x79,0x0,0x0,0x0,0x0,0x49, 0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/scaleNeg.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/scaleNeg.png 0x0,0x0,0x37,0x9d, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -5479,7 +5479,7 @@ static const unsigned char qt_resource_data[] = { 0xb7,0xf9,0x76,0xcc,0x27,0xe8,0x4f,0xb7,0xfc,0x29,0xe6,0x57,0xe0,0xa3,0xf6,0xe8, 0x59,0x34,0x7e,0xd,0x70,0xe5,0xff,0x3,0xbb,0xf9,0xb9,0xdd,0x73,0x65,0x1,0xa3, 0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/iconResByValue.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/iconResByValue.png 0x0,0x0,0x2,0x59, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -5520,7 +5520,7 @@ static const unsigned char qt_resource_data[] = { 0x2c,0x2d,0x61,0x69,0x9,0x4b,0x4b,0x58,0x5a,0xc2,0xd2,0x12,0x96,0x96,0xb0,0xb4, 0xcd,0xe5,0xf0,0x7,0xaa,0x71,0xd,0xf,0x7,0x1c,0x42,0xab,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/iconResAuto.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/iconResAuto.png 0x0,0x0,0x2,0x87, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -5564,7 +5564,7 @@ static const unsigned char qt_resource_data[] = { 0x48,0xb1,0xaa,0x59,0x50,0x75,0x70,0xf,0xde,0x5,0x20,0x3c,0x8,0xf,0xaa,0x9a, 0x5,0xbf,0x9b,0x12,0x5d,0x1a,0x98,0xd8,0x10,0x32,0x0,0x0,0x0,0x0,0x49,0x45, 0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVGraphPanel/resources/images/iconResByTime.png + // C:/cpp/SVisual/src/SVGraphPanel/resources/images/iconResByTime.png 0x0,0x0,0x2,0xe8, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, diff --git a/mswin/VS12/SVGraphPanel/SVGraphPanel.vcxproj.user b/mswin/VS12/SVGraphPanel/SVGraphPanel.vcxproj.user index 5f62e44..2484769 100644 --- a/mswin/VS12/SVGraphPanel/SVGraphPanel.vcxproj.user +++ b/mswin/VS12/SVGraphPanel/SVGraphPanel.vcxproj.user @@ -2,7 +2,7 @@ - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) @@ -10,7 +10,7 @@ PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) diff --git a/mswin/VS12/SVMonitor/GeneratedFiles/qrc_resource.cpp b/mswin/VS12/SVMonitor/GeneratedFiles/qrc_resource.cpp index 8a3f9f2..cef0938 100644 --- a/mswin/VS12/SVMonitor/GeneratedFiles/qrc_resource.cpp +++ b/mswin/VS12/SVMonitor/GeneratedFiles/qrc_resource.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // C:/cpp/other/SVisual/src/SVMonitor/resources/svmonitor_en.qm + // C:/cpp/SVisual/src/SVMonitor/resources/svmonitor_en.qm 0x0,0x0,0x2d,0x45, 0x3c, 0xb8,0x64,0x18,0xca,0xef,0x9c,0x95,0xcd,0x21,0x1c,0xbf,0x60,0xa1,0xbd,0xdd,0x42, @@ -562,7 +562,7 @@ static const unsigned char qt_resource_data[] = { 0x0,0x64,0x8,0x0,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x10,0xd1,0x81,0xd0,0xba, 0xd0,0xbe,0xd1,0x80,0xd0,0xbe,0xd1,0x81,0xd1,0x82,0xd1,0x8c,0x7,0x0,0x0,0x0, 0x12,0x73,0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x50,0x61,0x6e,0x65,0x6c,0x43,0x6c, - 0x61,0x73,0x73,0x1,0x3,0x0,0x0,0x0,0x26,0x0,0x43,0x0,0x6f,0x0,0x6e,0x0, + 0x61,0x73,0x73,0x1,0x3,0x0,0x0,0x0,0x26,0x0,0x63,0x0,0x6f,0x0,0x6e,0x0, 0x6e,0x0,0x65,0x0,0x63,0x0,0x74,0x0,0x20,0x0,0x6f,0x0,0x66,0x0,0x20,0x0, 0x43,0x0,0x4f,0x0,0x4d,0x0,0x2f,0x0,0x55,0x0,0x41,0x0,0x52,0x0,0x54,0x8, 0x0,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x22,0xd1,0x81,0xd0,0xbe,0xd0,0xb5,0xd0, @@ -735,7 +735,7 @@ static const unsigned char qt_resource_data[] = { 0xd0,0xb2,0xd0,0xbd,0xd0,0xbe,0x7,0x0,0x0,0x0,0x11,0x74,0x72,0x69,0x67,0x67, 0x65,0x72,0x50,0x61,0x6e,0x65,0x6c,0x43,0x6c,0x61,0x73,0x73,0x1,0x88,0x0,0x0, 0x0,0x2,0x1,0x1, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/fontUp.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/fontUp.png 0x0,0x0,0x8,0x25, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -869,7 +869,7 @@ static const unsigned char qt_resource_data[] = { 0xf3,0xf5,0x1e,0x6a,0x23,0x82,0x85,0xb5,0x9,0xc1,0xc2,0xda,0x3,0xa9,0xf3,0x2f, 0x30,0x66,0x53,0xfb,0xb5,0xe7,0x68,0x3b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44, 0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/icon.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/icon.png 0x0,0x0,0x6,0xcc, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -981,7 +981,7 @@ static const unsigned char qt_resource_data[] = { 0xcf,0x94,0x38,0x0,0x68,0x1e,0x38,0x41,0xbc,0x78,0xf1,0xe2,0x18,0xa8,0xbb,0x49, 0x40,0x2d,0x3,0x40,0x80,0x1,0x0,0xb,0x40,0xe7,0xb8,0xdc,0x89,0x9,0x1e,0x0, 0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/print.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/print.png 0x0,0x0,0xc,0x61, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -1183,7 +1183,7 @@ static const unsigned char qt_resource_data[] = { 0x3,0x4c,0x9,0x54,0x1,0x14,0x45,0x51,0x32,0xcb,0xff,0x1,0x4b,0xc1,0xee,0xdc, 0xc9,0xee,0xc2,0x2d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/iconImpuls.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/iconImpuls.png 0x0,0x0,0x8,0xc3, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -1327,7 +1327,7 @@ static const unsigned char qt_resource_data[] = { 0x22,0x2d,0x88,0x44,0x5a,0x10,0x89,0xb4,0xd0,0x6,0x12,0x44,0x7f,0x3,0x2a,0xcc, 0x56,0x8b,0x6b,0xcb,0x21,0x96,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42, 0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/SVLabel.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/SVLabel.png 0x0,0x0,0xa4,0x2c, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -3957,7 +3957,7 @@ static const unsigned char qt_resource_data[] = { 0xce,0x75,0xcd,0xe7,0xda,0x47,0x27,0x97,0xf1,0x5a,0xc0,0x51,0x5a,0xe6,0x33,0x6b, 0x7f,0xbe,0x5e,0x26,0x79,0xfd,0xff,0x24,0x1e,0x28,0x83,0x75,0x76,0xc0,0x12,0x0, 0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/open.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/open.png 0x0,0x0,0x8,0x19, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4090,7 +4090,7 @@ static const unsigned char qt_resource_data[] = { 0xff,0xda,0x6d,0x8a,0xdd,0x61,0x99,0xd5,0x1b,0xb6,0xd8,0x6b,0xbb,0x5e,0x32,0xbe, 0x2f,0x89,0xff,0x1,0x66,0xb9,0x5f,0xfc,0x11,0x80,0x3d,0xcf,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/flag-red.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/flag-red.png 0x0,0x0,0x9,0x7a, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4245,7 +4245,7 @@ static const unsigned char qt_resource_data[] = { 0x6a,0xc4,0x5d,0x4a,0xb9,0x12,0x5c,0x7e,0x4f,0x95,0x72,0x93,0xb1,0xca,0x96,0xea, 0x8f,0xbd,0x16,0xe1,0x7f,0xd6,0xac,0x18,0xc,0x9,0x58,0x58,0x19,0x0,0x0,0x0, 0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/export.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/export.png 0x0,0x0,0x5,0x99, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4338,7 +4338,7 @@ static const unsigned char qt_resource_data[] = { 0x6d,0x3f,0xe0,0xb9,0xb4,0xcd,0x63,0xdb,0xc6,0x24,0x40,0xd4,0x0,0xe8,0xf8,0x15, 0xfc,0x8f,0xe2,0xdf,0x9a,0x2d,0x2a,0x49,0x67,0x80,0x80,0x62,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/add.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/add.png 0x0,0x0,0x10,0x3f, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4601,7 +4601,7 @@ static const unsigned char qt_resource_data[] = { 0xa,0xbb,0xf,0xdf,0x20,0x76,0x37,0xae,0x66,0x5,0x21,0xc4,0x96,0x6d,0xdf,0x7, 0x6e,0x35,0x5b,0xd5,0xe3,0x70,0xc4,0xe6,0xff,0x1,0x3f,0xe,0xd3,0xb8,0xdd,0x54, 0xf3,0x68,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/fontDn.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/fontDn.png 0x0,0x0,0x8,0x14, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -4734,7 +4734,7 @@ static const unsigned char qt_resource_data[] = { 0x5a,0xf,0x9d,0x11,0xce,0xc6,0xce,0x4,0x67,0x63,0xe7,0x81,0x74,0xf9,0xf,0x62, 0xa8,0x53,0xfb,0x2a,0xa6,0x8e,0x78,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae, 0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/logo.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/logo.png 0x0,0x0,0xb3,0xbb, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -7613,7 +7613,7 @@ static const unsigned char qt_resource_data[] = { 0x40,0xb4,0x7,0xa2,0x3d,0x90,0x24,0x30,0xd6,0x6e,0x5c,0xa8,0x1a,0x40,0x34,0x80, 0xb8,0x71,0x5e,0xfe,0xff,0x1,0xe0,0xa5,0x8f,0xa,0x48,0x64,0x7e,0x93,0x0,0x0, 0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/trafficlight-green.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/trafficlight-green.png 0x0,0x0,0x12,0x75, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -7912,7 +7912,7 @@ static const unsigned char qt_resource_data[] = { 0x62,0x46,0xc9,0x40,0x94,0x8d,0xf2,0xca,0x54,0x5d,0x65,0x8a,0xd5,0xeb,0xff,0x3, 0x95,0x1a,0x78,0xdf,0x70,0x28,0x53,0x8b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44, 0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/trafficlight-red.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/trafficlight-red.png 0x0,0x0,0x13,0x86, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -8228,7 +8228,7 @@ static const unsigned char qt_resource_data[] = { 0x69,0x1d,0xd3,0x4b,0x6,0xbc,0xc,0xca,0x3a,0x53,0xf3,0x3a,0x93,0xaf,0x5e,0xff, 0xd,0x2b,0xf5,0xf,0xa,0xd6,0x83,0xef,0x73,0x0,0x0,0x0,0x0,0x49,0x45,0x4e, 0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/trafficlight-yel.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/trafficlight-yel.png 0x0,0x0,0x12,0xf9, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -8535,7 +8535,7 @@ static const unsigned char qt_resource_data[] = { 0xe5,0xd2,0x8c,0x69,0x19,0xd3,0x4b,0xf,0x78,0xd9,0xa8,0x50,0x7b,0xb9,0xb5,0xbb, 0xba,0x4c,0xff,0x7f,0x8f,0xaf,0xbd,0x2b,0xac,0xf9,0x74,0x67,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVMonitor/resources/images/iconSin.png + // C:/cpp/SVisual/src/SVMonitor/resources/images/iconSin.png 0x0,0x0,0x41,0x70, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, diff --git a/mswin/VS12/SVMonitor/GeneratedFiles/ui_settingsPanel.h b/mswin/VS12/SVMonitor/GeneratedFiles/ui_settingsPanel.h index 61e5fe8..ad74fa7 100644 --- a/mswin/VS12/SVMonitor/GeneratedFiles/ui_settingsPanel.h +++ b/mswin/VS12/SVMonitor/GeneratedFiles/ui_settingsPanel.h @@ -27,7 +27,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE @@ -58,13 +57,13 @@ class Ui_settingsPanelClass QPushButton *btnCopyPath; QLineEdit *txtCopyPath; QGroupBox *groupBox_2; - QWidget *widget; + QVBoxLayout *verticalLayout_4; QHBoxLayout *horizontalLayout_4; QLabel *label_4; QSpinBox *spinCycleRecMs; - QSpacerItem *horizontalSpacer_2; QLabel *label_7; QSpinBox *spinPacketSz; + QSpacerItem *horizontalSpacer_2; QHBoxLayout *horizontalLayout_6; QSpacerItem *horizontalSpacer_3; QLabel *lbChange; @@ -74,6 +73,8 @@ class Ui_settingsPanelClass { if (settingsPanelClass->objectName().isEmpty()) settingsPanelClass->setObjectName(QStringLiteral("settingsPanelClass")); + settingsPanelClass->resize(550, 350); + settingsPanelClass->setMinimumSize(QSize(550, 350)); settingsPanelClass->setMaximumSize(QSize(550, 350)); verticalLayout_3 = new QVBoxLayout(settingsPanelClass); verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3")); @@ -214,18 +215,16 @@ class Ui_settingsPanelClass sizePolicy.setHeightForWidth(groupBox_2->sizePolicy().hasHeightForWidth()); groupBox_2->setSizePolicy(sizePolicy); groupBox_2->setMinimumSize(QSize(0, 50)); - widget = new QWidget(groupBox_2); - widget->setObjectName(QStringLiteral("widget")); - widget->setGeometry(QRect(10, 20, 362, 27)); - horizontalLayout_4 = new QHBoxLayout(widget); + verticalLayout_4 = new QVBoxLayout(groupBox_2); + verticalLayout_4->setObjectName(QStringLiteral("verticalLayout_4")); + horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setObjectName(QStringLiteral("horizontalLayout_4")); - horizontalLayout_4->setContentsMargins(0, 0, 0, 0); - label_4 = new QLabel(widget); + label_4 = new QLabel(groupBox_2); label_4->setObjectName(QStringLiteral("label_4")); horizontalLayout_4->addWidget(label_4); - spinCycleRecMs = new QSpinBox(widget); + spinCycleRecMs = new QSpinBox(groupBox_2); spinCycleRecMs->setObjectName(QStringLiteral("spinCycleRecMs")); spinCycleRecMs->setMinimum(5); spinCycleRecMs->setMaximum(5000); @@ -233,22 +232,25 @@ class Ui_settingsPanelClass horizontalLayout_4->addWidget(spinCycleRecMs); - horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_4->addItem(horizontalSpacer_2); - - label_7 = new QLabel(widget); + label_7 = new QLabel(groupBox_2); label_7->setObjectName(QStringLiteral("label_7")); horizontalLayout_4->addWidget(label_7); - spinPacketSz = new QSpinBox(widget); + spinPacketSz = new QSpinBox(groupBox_2); spinPacketSz->setObjectName(QStringLiteral("spinPacketSz")); spinPacketSz->setMinimum(1); spinPacketSz->setValue(10); horizontalLayout_4->addWidget(spinPacketSz); + horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + horizontalLayout_4->addItem(horizontalSpacer_2); + + + verticalLayout_4->addLayout(horizontalLayout_4); + verticalLayout_3->addWidget(groupBox_2); diff --git a/mswin/VS12/SVMonitor/SVMonitor.vcxproj.user b/mswin/VS12/SVMonitor/SVMonitor.vcxproj.user index b6ccd2b..97775a5 100644 --- a/mswin/VS12/SVMonitor/SVMonitor.vcxproj.user +++ b/mswin/VS12/SVMonitor/SVMonitor.vcxproj.user @@ -2,7 +2,7 @@ PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) @@ -10,7 +10,7 @@ PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) diff --git a/mswin/VS12/SVStatPanel/GeneratedFiles/qrc_statresource.cpp b/mswin/VS12/SVStatPanel/GeneratedFiles/qrc_statresource.cpp index ec91150..c1302c0 100644 --- a/mswin/VS12/SVStatPanel/GeneratedFiles/qrc_statresource.cpp +++ b/mswin/VS12/SVStatPanel/GeneratedFiles/qrc_statresource.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // C:/cpp/other/SVisual/src/SVStatPanel/resources/svstatpanel_en.qm + // C:/cpp/SVisual/src/SVStatPanel/resources/svstatpanel_en.qm 0x0,0x0,0x3,0xb5, 0x3c, 0xb8,0x64,0x18,0xca,0xef,0x9c,0x95,0xcd,0x21,0x1c,0xbf,0x60,0xa1,0xbd,0xdd,0x42, diff --git a/mswin/VS12/SVStatPanel/SVStatPanel.vcxproj.user b/mswin/VS12/SVStatPanel/SVStatPanel.vcxproj.user index b6ccd2b..97775a5 100644 --- a/mswin/VS12/SVStatPanel/SVStatPanel.vcxproj.user +++ b/mswin/VS12/SVStatPanel/SVStatPanel.vcxproj.user @@ -2,7 +2,7 @@ PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) @@ -10,7 +10,7 @@ PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) diff --git a/mswin/VS12/SVViewer/GeneratedFiles/qrc_resource.cpp b/mswin/VS12/SVViewer/GeneratedFiles/qrc_resource.cpp index 99e88da..a18f734 100644 --- a/mswin/VS12/SVViewer/GeneratedFiles/qrc_resource.cpp +++ b/mswin/VS12/SVViewer/GeneratedFiles/qrc_resource.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // C:/cpp/other/SVisual/src/SVViewer/resources/svviewer_en.qm + // C:/cpp/SVisual/src/SVViewer/resources/svviewer_en.qm 0x0,0x0,0x9,0x8b, 0x3c, 0xb8,0x64,0x18,0xca,0xef,0x9c,0x95,0xcd,0x21,0x1c,0xbf,0x60,0xa1,0xbd,0xdd,0x42, @@ -163,7 +163,7 @@ static const unsigned char qt_resource_data[] = { 0x0,0x0,0x0,0x6,0x0,0x0,0x0,0xe,0xd0,0xad,0xd0,0xba,0xd1,0x81,0xd0,0xbf, 0xd0,0xbe,0xd1,0x80,0xd1,0x82,0x7,0x0,0x0,0x0,0x7,0x4d,0x61,0x69,0x6e,0x57, 0x69,0x6e,0x1,0x88,0x0,0x0,0x0,0x2,0x1,0x1, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/print.png + // C:/cpp/SVisual/src/SVViewer/resources/images/print.png 0x0,0x0,0xc,0x61, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -365,7 +365,7 @@ static const unsigned char qt_resource_data[] = { 0x3,0x4c,0x9,0x54,0x1,0x14,0x45,0x51,0x32,0xcb,0xff,0x1,0x4b,0xc1,0xee,0xdc, 0xc9,0xee,0xc2,0x2d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/iconImpuls.png + // C:/cpp/SVisual/src/SVViewer/resources/images/iconImpuls.png 0x0,0x0,0x8,0xc3, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -509,7 +509,7 @@ static const unsigned char qt_resource_data[] = { 0x22,0x2d,0x88,0x44,0x5a,0x10,0x89,0xb4,0xd0,0x6,0x12,0x44,0x7f,0x3,0x2a,0xcc, 0x56,0x8b,0x6b,0xcb,0x21,0x96,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42, 0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/open.png + // C:/cpp/SVisual/src/SVViewer/resources/images/open.png 0x0,0x0,0x8,0x19, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -642,7 +642,7 @@ static const unsigned char qt_resource_data[] = { 0xff,0xda,0x6d,0x8a,0xdd,0x61,0x99,0xd5,0x1b,0xb6,0xd8,0x6b,0xbb,0x5e,0x32,0xbe, 0x2f,0x89,0xff,0x1,0x66,0xb9,0x5f,0xfc,0x11,0x80,0x3d,0xcf,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/export.png + // C:/cpp/SVisual/src/SVViewer/resources/images/export.png 0x0,0x0,0x5,0x99, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -735,7 +735,7 @@ static const unsigned char qt_resource_data[] = { 0x6d,0x3f,0xe0,0xb9,0xb4,0xcd,0x63,0xdb,0xc6,0x24,0x40,0xd4,0x0,0xe8,0xf8,0x15, 0xfc,0x8f,0xe2,0xdf,0x9a,0x2d,0x2a,0x49,0x67,0x80,0x80,0x62,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/add.png + // C:/cpp/SVisual/src/SVViewer/resources/images/add.png 0x0,0x0,0x10,0x3f, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -998,7 +998,7 @@ static const unsigned char qt_resource_data[] = { 0xa,0xbb,0xf,0xdf,0x20,0x76,0x37,0xae,0x66,0x5,0x21,0xc4,0x96,0x6d,0xdf,0x7, 0x6e,0x35,0x5b,0xd5,0xe3,0x70,0xc4,0xe6,0xff,0x1,0x3f,0xe,0xd3,0xb8,0xdd,0x54, 0xf3,0x68,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/logo.png + // C:/cpp/SVisual/src/SVViewer/resources/images/logo.png 0x0,0x0,0x37,0x9b, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -1891,7 +1891,7 @@ static const unsigned char qt_resource_data[] = { 0x2,0x40,0x0,0x8,0x0,0x1,0x20,0x0,0x4,0x80,0x0,0x10,0x0,0x2,0x40,0x0, 0x8,0xcc,0x8b,0xc0,0xff,0x7,0x15,0x14,0x99,0xc7,0x4c,0xf5,0x46,0x4,0x0,0x0, 0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/Graph.png + // C:/cpp/SVisual/src/SVViewer/resources/images/Graph.png 0x0,0x0,0x21,0xf, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -2423,7 +2423,7 @@ static const unsigned char qt_resource_data[] = { 0xb8,0x3f,0x9f,0x1,0xaf,0xf3,0x6e,0xd8,0x86,0x21,0x43,0xb8,0xcf,0x15,0xcc,0xd, 0xe1,0x88,0x40,0xbe,0x5f,0x88,0x91,0xce,0xff,0x1f,0x2c,0x1e,0xf0,0x2e,0x26,0xb8, 0xb1,0xaa,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // C:/cpp/other/SVisual/src/SVViewer/resources/images/iconSin.png + // C:/cpp/SVisual/src/SVViewer/resources/images/iconSin.png 0x0,0x0,0x41,0x70, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, diff --git a/mswin/VS12/SVViewer/SVViewer.vcxproj.user b/mswin/VS12/SVViewer/SVViewer.vcxproj.user index 27aa894..cba28fb 100644 --- a/mswin/VS12/SVViewer/SVViewer.vcxproj.user +++ b/mswin/VS12/SVViewer/SVViewer.vcxproj.user @@ -2,11 +2,11 @@ - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.5.1\5.5\msvc2013_64 + C:\Qt64\Qt5.5.1\5.5\msvc2013_64 PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) \ No newline at end of file diff --git a/src/SVConfig/src/SVConfigData.cpp b/src/SVConfig/src/SVConfigData.cpp index 0bda37b..37e0ca2 100644 --- a/src/SVConfig/src/SVConfigData.cpp +++ b/src/SVConfig/src/SVConfigData.cpp @@ -23,8 +23,11 @@ // THE SOFTWARE. // #include +#include +#include #include "SVConfig/SVConfigData.h" +using namespace std; namespace SV_Cng { @@ -69,8 +72,11 @@ namespace SV_Cng { case valueType::tInt: res = value > 0 ? std::to_string((int) (value + 0.5)) : std::to_string((int) (value - 0.5)); break; - case valueType::tFloat: - res = std::to_string(value); + case valueType::tFloat:{ + stringstream stream; + stream << fixed << setprecision(1) << value; + res = stream.str(); + } break; default: break; diff --git a/src/SVMonitor/forms/settingsPanel.ui b/src/SVMonitor/forms/settingsPanel.ui index e6d8033..6c6aadb 100644 --- a/src/SVMonitor/forms/settingsPanel.ui +++ b/src/SVMonitor/forms/settingsPanel.ui @@ -2,6 +2,20 @@ settingsPanelClass + + + 0 + 0 + 550 + 350 + + + + + 550 + 350 + + 550 @@ -331,71 +345,68 @@ Настройка измерений - - - - 10 - 20 - 362 - 27 - - - - - - - Период записи - - - - - - - мс - - - 5 - - - 5000 - - - 100 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Размер пакета - - - - - - - 1 - - - 10 - - - - - + + + + + + + Период записи + + + + + + + мс + + + 5 + + + 5000 + + + 100 + + + + + + + Размер пакета + + + + + + + 1 + + + 10 + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + diff --git a/src/SVMonitor/forms/ui_settingsPanel.h b/src/SVMonitor/forms/ui_settingsPanel.h index 961c113..ad74fa7 100644 --- a/src/SVMonitor/forms/ui_settingsPanel.h +++ b/src/SVMonitor/forms/ui_settingsPanel.h @@ -1,13 +1,13 @@ /******************************************************************************** ** Form generated from reading UI file 'settingsPanel.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.5.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ -#ifndef SETTINGSPANEL_H -#define SETTINGSPANEL_H +#ifndef UI_SETTINGSPANEL_H +#define UI_SETTINGSPANEL_H #include #include @@ -27,7 +27,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE @@ -58,13 +57,13 @@ class Ui_settingsPanelClass QPushButton *btnCopyPath; QLineEdit *txtCopyPath; QGroupBox *groupBox_2; - QWidget *widget; + QVBoxLayout *verticalLayout_4; QHBoxLayout *horizontalLayout_4; QLabel *label_4; QSpinBox *spinCycleRecMs; - QSpacerItem *horizontalSpacer_2; QLabel *label_7; QSpinBox *spinPacketSz; + QSpacerItem *horizontalSpacer_2; QHBoxLayout *horizontalLayout_6; QSpacerItem *horizontalSpacer_3; QLabel *lbChange; @@ -74,6 +73,8 @@ class Ui_settingsPanelClass { if (settingsPanelClass->objectName().isEmpty()) settingsPanelClass->setObjectName(QStringLiteral("settingsPanelClass")); + settingsPanelClass->resize(550, 350); + settingsPanelClass->setMinimumSize(QSize(550, 350)); settingsPanelClass->setMaximumSize(QSize(550, 350)); verticalLayout_3 = new QVBoxLayout(settingsPanelClass); verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3")); @@ -214,18 +215,16 @@ class Ui_settingsPanelClass sizePolicy.setHeightForWidth(groupBox_2->sizePolicy().hasHeightForWidth()); groupBox_2->setSizePolicy(sizePolicy); groupBox_2->setMinimumSize(QSize(0, 50)); - widget = new QWidget(groupBox_2); - widget->setObjectName(QStringLiteral("widget")); - widget->setGeometry(QRect(10, 20, 362, 27)); - horizontalLayout_4 = new QHBoxLayout(widget); + verticalLayout_4 = new QVBoxLayout(groupBox_2); + verticalLayout_4->setObjectName(QStringLiteral("verticalLayout_4")); + horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setObjectName(QStringLiteral("horizontalLayout_4")); - horizontalLayout_4->setContentsMargins(0, 0, 0, 0); - label_4 = new QLabel(widget); + label_4 = new QLabel(groupBox_2); label_4->setObjectName(QStringLiteral("label_4")); horizontalLayout_4->addWidget(label_4); - spinCycleRecMs = new QSpinBox(widget); + spinCycleRecMs = new QSpinBox(groupBox_2); spinCycleRecMs->setObjectName(QStringLiteral("spinCycleRecMs")); spinCycleRecMs->setMinimum(5); spinCycleRecMs->setMaximum(5000); @@ -233,22 +232,25 @@ class Ui_settingsPanelClass horizontalLayout_4->addWidget(spinCycleRecMs); - horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_4->addItem(horizontalSpacer_2); - - label_7 = new QLabel(widget); + label_7 = new QLabel(groupBox_2); label_7->setObjectName(QStringLiteral("label_7")); horizontalLayout_4->addWidget(label_7); - spinPacketSz = new QSpinBox(widget); + spinPacketSz = new QSpinBox(groupBox_2); spinPacketSz->setObjectName(QStringLiteral("spinPacketSz")); spinPacketSz->setMinimum(1); spinPacketSz->setValue(10); horizontalLayout_4->addWidget(spinPacketSz); + horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + horizontalLayout_4->addItem(horizontalSpacer_2); + + + verticalLayout_4->addLayout(horizontalLayout_4); + verticalLayout_3->addWidget(groupBox_2); @@ -279,39 +281,39 @@ class Ui_settingsPanelClass void retranslateUi(QDialog *settingsPanelClass) { - settingsPanelClass->setWindowTitle(QApplication::translate("settingsPanelClass", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("settingsPanelClass", "\320\237\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\260\320\275\320\275\321\213\321\205", Q_NULLPTR)); - rbtnConnectByEthernet->setText(QApplication::translate("settingsPanelClass", "\321\201\320\276\320\265\320\264\320\270\320\275\320\265\320\275\320\270\320\265 \320\277\320\276 Ethernet", Q_NULLPTR)); - label_5->setText(QApplication::translate("settingsPanelClass", "\320\277\320\276\321\200\321\202", Q_NULLPTR)); - label->setText(QApplication::translate("settingsPanelClass", "ip \320\260\320\264\321\200\320\265\321\201", Q_NULLPTR)); - label_2->setText(QApplication::translate("settingsPanelClass", "\320\277\320\276\321\200\321\202", Q_NULLPTR)); - rbtnConnectByCom->setText(QApplication::translate("settingsPanelClass", "\321\201\320\276\320\265\320\264\320\270\320\275\320\265\320\275\320\270\320\265 \320\277\320\276 COM/UART", Q_NULLPTR)); - label_6->setText(QApplication::translate("settingsPanelClass", "\321\201\320\272\320\276\321\200\320\276\321\201\321\202\321\214", Q_NULLPTR)); + settingsPanelClass->setWindowTitle(QApplication::translate("settingsPanelClass", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270", 0)); + groupBox->setTitle(QApplication::translate("settingsPanelClass", "\320\237\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\260\320\275\320\275\321\213\321\205", 0)); + rbtnConnectByEthernet->setText(QApplication::translate("settingsPanelClass", "\321\201\320\276\320\265\320\264\320\270\320\275\320\265\320\275\320\270\320\265 \320\277\320\276 Ethernet", 0)); + label_5->setText(QApplication::translate("settingsPanelClass", "\320\277\320\276\321\200\321\202", 0)); + label->setText(QApplication::translate("settingsPanelClass", "ip \320\260\320\264\321\200\320\265\321\201", 0)); + label_2->setText(QApplication::translate("settingsPanelClass", "\320\277\320\276\321\200\321\202", 0)); + rbtnConnectByCom->setText(QApplication::translate("settingsPanelClass", "\321\201\320\276\320\265\320\264\320\270\320\275\320\265\320\275\320\270\320\265 \320\277\320\276 COM/UART", 0)); + label_6->setText(QApplication::translate("settingsPanelClass", "\321\201\320\272\320\276\321\200\320\276\321\201\321\202\321\214", 0)); cbxComSpeed->clear(); cbxComSpeed->insertItems(0, QStringList() - << QApplication::translate("settingsPanelClass", "1200", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "2400", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "4800", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "9600", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "19200", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "38400", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "57600", Q_NULLPTR) - << QApplication::translate("settingsPanelClass", "115200", Q_NULLPTR) + << QApplication::translate("settingsPanelClass", "1200", 0) + << QApplication::translate("settingsPanelClass", "2400", 0) + << QApplication::translate("settingsPanelClass", "4800", 0) + << QApplication::translate("settingsPanelClass", "9600", 0) + << QApplication::translate("settingsPanelClass", "19200", 0) + << QApplication::translate("settingsPanelClass", "38400", 0) + << QApplication::translate("settingsPanelClass", "57600", 0) + << QApplication::translate("settingsPanelClass", "115200", 0) ); - cbxComSpeed->setCurrentText(QApplication::translate("settingsPanelClass", "1200", Q_NULLPTR)); - grbSaveData->setTitle(QApplication::translate("settingsPanelClass", "\320\241\320\276\321\205\321\200\320\260\320\275\320\265\320\275\320\270\320\265 \320\264\320\260\320\275\320\275\321\213\321\205", Q_NULLPTR)); + cbxComSpeed->setCurrentText(QApplication::translate("settingsPanelClass", "1200", 0)); + grbSaveData->setTitle(QApplication::translate("settingsPanelClass", "\320\241\320\276\321\205\321\200\320\260\320\275\320\265\320\275\320\270\320\265 \320\264\320\260\320\275\320\275\321\213\321\205", 0)); #ifndef QT_NO_TOOLTIP - rbtnCopyEna->setToolTip(QApplication::translate("settingsPanelClass", "\320\220\320\272\321\202\320\270\320\262\320\275\320\276", Q_NULLPTR)); + rbtnCopyEna->setToolTip(QApplication::translate("settingsPanelClass", "\320\220\320\272\321\202\320\270\320\262\320\275\320\276", 0)); #endif // QT_NO_TOOLTIP - rbtnCopyEna->setText(QApplication::translate("settingsPanelClass", "\320\220\320\272\321\202\320\270\320\262\320\275\320\276", Q_NULLPTR)); - label_3->setText(QApplication::translate("settingsPanelClass", "\320\277\321\203\321\202\321\214", Q_NULLPTR)); + rbtnCopyEna->setText(QApplication::translate("settingsPanelClass", "\320\220\320\272\321\202\320\270\320\262\320\275\320\276", 0)); + label_3->setText(QApplication::translate("settingsPanelClass", "\320\277\321\203\321\202\321\214", 0)); btnCopyPath->setText(QString()); - groupBox_2->setTitle(QApplication::translate("settingsPanelClass", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\260 \320\270\320\267\320\274\320\265\321\200\320\265\320\275\320\270\320\271", Q_NULLPTR)); - label_4->setText(QApplication::translate("settingsPanelClass", "\320\237\320\265\321\200\320\270\320\276\320\264 \320\267\320\260\320\277\320\270\321\201\320\270", Q_NULLPTR)); - spinCycleRecMs->setSuffix(QApplication::translate("settingsPanelClass", " \320\274\321\201", Q_NULLPTR)); - label_7->setText(QApplication::translate("settingsPanelClass", "\320\240\320\260\320\267\320\274\320\265\321\200 \320\277\320\260\320\272\320\265\321\202\320\260", Q_NULLPTR)); - lbChange->setText(QApplication::translate("settingsPanelClass", "*", Q_NULLPTR)); - btnSave->setText(QApplication::translate("settingsPanelClass", "\320\241\320\276\321\205\321\200\320\260\320\275\320\270\321\202\321\214", Q_NULLPTR)); + groupBox_2->setTitle(QApplication::translate("settingsPanelClass", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\260 \320\270\320\267\320\274\320\265\321\200\320\265\320\275\320\270\320\271", 0)); + label_4->setText(QApplication::translate("settingsPanelClass", "\320\237\320\265\321\200\320\270\320\276\320\264 \320\267\320\260\320\277\320\270\321\201\320\270", 0)); + spinCycleRecMs->setSuffix(QApplication::translate("settingsPanelClass", " \320\274\321\201", 0)); + label_7->setText(QApplication::translate("settingsPanelClass", "\320\240\320\260\320\267\320\274\320\265\321\200 \320\277\320\260\320\272\320\265\321\202\320\260", 0)); + lbChange->setText(QApplication::translate("settingsPanelClass", "*", 0)); + btnSave->setText(QApplication::translate("settingsPanelClass", "\320\241\320\276\321\205\321\200\320\260\320\275\320\270\321\202\321\214", 0)); } // retranslateUi }; @@ -322,4 +324,4 @@ namespace Ui { QT_END_NAMESPACE -#endif // SETTINGSPANEL_H +#endif // UI_SETTINGSPANEL_H diff --git a/src/SVMonitor/resources/svmonitor_en.qm b/src/SVMonitor/resources/svmonitor_en.qm index 833f153..20c9e55 100644 Binary files a/src/SVMonitor/resources/svmonitor_en.qm and b/src/SVMonitor/resources/svmonitor_en.qm differ diff --git a/src/SVMonitor/resources/svmonitor_en.ts b/src/SVMonitor/resources/svmonitor_en.ts index de9697d..062bfa6 100644 --- a/src/SVMonitor/resources/svmonitor_en.ts +++ b/src/SVMonitor/resources/svmonitor_en.ts @@ -545,7 +545,7 @@ соединение по COM/UART - Connect of COM/UART + connect of COM/UART diff --git a/src/SVMonitor/src/mainwin.cpp b/src/SVMonitor/src/mainwin.cpp index 1a7f4e6..5c4b7ce 100644 --- a/src/SVMonitor/src/mainwin.cpp +++ b/src/SVMonitor/src/mainwin.cpp @@ -170,8 +170,7 @@ void MainWin::Connect(){ this->setFont(ft); - for (auto p : this->graphPanels_) - p->setFont(ft); + QApplication::setFont(ft); }); connect(ui.actionDnFont, &QAction::triggered, [this]() { @@ -182,8 +181,7 @@ void MainWin::Connect(){ this->setFont(ft); - for (auto p : this->graphPanels_) - p->setFont(ft); + QApplication::setFont(ft); }); connect(ui.actionSaveWinState, &QAction::triggered, [this]() { @@ -496,7 +494,7 @@ bool MainWin::eventFilter(QObject *target, QEvent *event){ } void MainWin::sortSignalByModule(){ - + ui.treeSignals->clear(); auto mref = SV_Srv::getCopyModuleRef(); @@ -543,7 +541,7 @@ void MainWin::sortSignalByModule(){ ui.treeSignals->sortByColumn(1); ui.lbAllSignCnt->setText(QString::number(SV_Srv::getCopySignalRef().size())); - + } void MainWin::selSignalClick(QTreeWidgetItem* item, int column){ diff --git a/src/SVViewer/src/mainWin.cpp b/src/SVViewer/src/mainWin.cpp index e90f970..76b6d2e 100644 --- a/src/SVViewer/src/mainWin.cpp +++ b/src/SVViewer/src/mainWin.cpp @@ -251,9 +251,8 @@ void MainWin::Connect(){ ft.setPointSize(ft.pointSize() + 1); this->setFont(ft); - - for (auto p : this->graphPanels_) - p->setFont(ft); + + QApplication::setFont(ft); }); connect(ui.actionDnFont, &QAction::triggered, [this]() { @@ -261,11 +260,10 @@ void MainWin::Connect(){ QFont ft = this->font(); ft.setPointSize(ft.pointSize() - 1); - + this->setFont(ft); - for (auto p : this->graphPanels_) - p->setFont(ft); + QApplication::setFont(ft); }); connect(ui.btnSortByGroup, &QPushButton::clicked, [this]() {