diff --git a/MWTWIN.BAS b/MWTWIN.BAS index 2e161ab..aa850a3 100644 --- a/MWTWIN.BAS +++ b/MWTWIN.BAS @@ -29,8 +29,8 @@ Option Explicit ' version 6.35 ' *** Be sure to update version in Project | Properties also *** -Public Const PROGRAM_VERSION = "6.43" -Public Const PROGRAM_DATE = "February 23, 2007" +Public Const PROGRAM_VERSION = "6.44" +Public Const PROGRAM_DATE = "June 1, 2007" ' *** ' diff --git a/MWT_VALU.bak b/MWT_VALU.bak index d2aa675..5f5c85a 100644 --- a/MWT_VALU.bak +++ b/MWT_VALU.bak @@ -1,9 +1,9 @@ -; Values File for MWTWIN Program (v6.43) +; Values File for MWTWIN Program (v6.44) ; ; File Automatically Created -- Select Save Values and Formulas under the Options Menu ; Formula0=BrCH2(CH2)7CH2Br -Formula1=FeCl3-6H2O +Formula1=FeCl3-5.6H2O Formula2=Co(Bpy)(CO)4 Formula3=H5C7NO Formula4=D2C2O diff --git a/MsiSetup/MwtWinMsiSetup.cache b/MsiSetup/MwtWinMsiSetup.cache index 59ffc65..db56efb 100644 Binary files a/MsiSetup/MwtWinMsiSetup.cache and b/MsiSetup/MwtWinMsiSetup.cache differ diff --git a/MsiSetup/MwtWinMsiSetup.wip b/MsiSetup/MwtWinMsiSetup.wip index d1c7ddc..0eb4f6a 100644 Binary files a/MsiSetup/MwtWinMsiSetup.wip and b/MsiSetup/MwtWinMsiSetup.wip differ diff --git a/Mwtwin.vbp b/Mwtwin.vbp index 44cb5e2..fcf2845 100644 --- a/Mwtwin.vbp +++ b/Mwtwin.vbp @@ -1,7 +1,7 @@ Type=Exe Reference=*\G{ADB880A2-D8FF-11CF-9377-00AA003B7A11}#4.0#0#C:\WINDOWS\system32\hhctrl.ocx#HHCtrl 4.0 Type Library Reference=*\G{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}#1.0#0#C:\WINDOWS\system32\wshom.ocx#Windows Script Host Object Model -Reference=*\G{C4BE505F-B909-4F29-9F14-365325BDB989}#2c.0#0#C:\WINDOWS\system32\CWSpectrumDll.dll#CWSpectrumDLL +Reference=*\G{C4BE505F-B909-4F29-9F14-365325BDB989}#2c.0#0#..\CWSpectrumDLL\CWSpectrumDll.dll#CWSpectrumDLL Reference=*\G{62BB78DD-911F-4A36-9B08-7C035ACC541B}#1.0#0#MwtWinDll\MwtWindll.dll#Molecular Weight Calculator - Dll Version Object={5E9E78A0-531B-11CF-91F6-C2863C385E30}#1.0#0; MSFLXGRD.OCX Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; richtx32.ocx @@ -52,8 +52,8 @@ HelpContextID="0" Description="Molecular Weight Calculator for Windows, v6.41" CompatibleMode="0" MajorVer=6 -MinorVer=43 -RevisionVer=228 +MinorVer=44 +RevisionVer=229 AutoIncrementVer=1 ServerSupportFiles=0 VersionComments="by Matthew Monroe " diff --git a/Mwtwin.vbw b/Mwtwin.vbw index 118a3cd..e41a22c 100644 --- a/Mwtwin.vbw +++ b/Mwtwin.vbw @@ -1,5 +1,5 @@ frmMain = 77, 74, 885, 585, C, 0, 0, 778, 399, C -MwtWinProcedures = 83, 45, 472, 524, +MwtWinProcedures = 83, 45, 472, 524, Z frmAboutBox = 22, 22, 273, 284, C, 50, 10, 818, 658, C frmChangeFont = -77, 22, 565, 368, C, 0, 0, 318, 262, C frmChangeValue = 44, 44, 686, 390, C, 66, 66, 384, 328, C @@ -20,7 +20,7 @@ frmIntro = 0, 0, 658, 368, C, 154, 154, 758, 509, C frmMMConvert = 0, 0, 652, 348, C, 81, 54, 685, 409, C modSharedVBRoutines = 25, 25, 705, 372, C frmSetValue = 88, 88, 799, 416, C, 88, 88, 778, 407, C -frmFragmentationModelling = 69, 69, 366, 422, Z, -165, 120, 416, 486, C +frmFragmentationModelling = 69, 69, 366, 422, , -165, 120, 416, 486, C frmIonMatchOptions = 57, 37, 486, 405, C, 548, 10, 983, 391, C frmFinder = 44, 44, 717, 414, C, 22, 22, 695, 392, C frmIsotopicDistribution = 110, 110, 510, 480, , 88, 88, 713, 458, C diff --git a/RevisionHistory.txt b/RevisionHistory.txt index 7e5dc51..587971a 100644 --- a/RevisionHistory.txt +++ b/RevisionHistory.txt @@ -502,3 +502,6 @@ Revision 6.42 - November 5, 2006 Revision 6.43 - February 23, 2007 - Added option to display 3+ fragmentation ions on the Peptide Sequence Fragmentation module + +Revision 6.44 - June 1, 2007 + - Updated CWSpectrumDll.dll to fix a bug that caused the tick spacing to become fixed if the user zoomed in to a narrow range on the X or Y axis diff --git a/frmIsotopicAbundance.frm b/frmIsotopicAbundance.frm index 86bfa6d..0edc982 100644 --- a/frmIsotopicAbundance.frm +++ b/frmIsotopicAbundance.frm @@ -257,6 +257,7 @@ Begin VB.Form frmIsotopicDistribution _ExtentX = 5318 _ExtentY = 873 _Version = 393217 + Enabled = -1 'True MultiLine = 0 'False TextRTF = $"frmIsotopicAbundance.frx":08CA BeginProperty Font {0BE35203-8F91-11CE-9DE3-00AA004BB851} @@ -736,6 +737,9 @@ On Error GoTo PlotIsotopicDistributionErrorHandler .SetSpectrumFormCurrentSeriesNumber 1 + .SetCustomTicksXAxis 0, 0, True + .SetCustomTicksYAxis 0, 0, True + .ShowSpectrum End With diff --git a/mwt_elem.dat b/mwt_elem.dat index 8bec8fc..0ac8341 100644 --- a/mwt_elem.dat +++ b/mwt_elem.dat @@ -1,4 +1,4 @@ -; Elements File for MWTWIN program (v6.43) +; Elements File for MWTWIN program (v6.44) ; ; Comments may be added by preceding with a semicolon ; The heading [ELEMENTWEIGHTTYPE] 1 signifies that Average Elemental Weights are diff --git a/mwt_elem.dtt b/mwt_elem.dtt index 95daad2..0ac8341 100644 --- a/mwt_elem.dtt +++ b/mwt_elem.dtt @@ -1,4 +1,4 @@ -; Elements File for MWTWIN program (v6.42) +; Elements File for MWTWIN program (v6.44) ; ; Comments may be added by preceding with a semicolon ; The heading [ELEMENTWEIGHTTYPE] 1 signifies that Average Elemental Weights are diff --git a/mwt_valu.ini b/mwt_valu.ini index d2aa675..b0e2ed1 100644 --- a/mwt_valu.ini +++ b/mwt_valu.ini @@ -1,12 +1,12 @@ -; Values File for MWTWIN Program (v6.43) +; Values File for MWTWIN Program (v6.44) ; ; File Automatically Created -- Select Save Values and Formulas under the Options Menu ; Formula0=BrCH2(CH2)7CH2Br Formula1=FeCl3-6H2O Formula2=Co(Bpy)(CO)4 -Formula3=H5C7NO -Formula4=D2C2O +Formula3=^13C6H6-.1H2O +Formula4=HGlyLeuTyrOH Formula5=BrCH2(CH2)7CH2Br>CH8 AminoAcidConvertOneLetter=GLY AminoAcidConvertThreeLetter=Gly-Leu-Tyr @@ -62,7 +62,7 @@ CapillaryFlowOpenText7=0.4 CapillaryFlowPackedText7=0.4 CapillaryFlowOpenText8=1 CapillaryFlowPackedText8=1 -CapillaryFlowOpenText9=100 +CapillaryFlowOpenText9=924.07 CapillaryFlowPackedText9=100 CapillaryFlowOpenText10=30 CapillaryFlowPackedText10=30 @@ -205,8 +205,8 @@ FragModelModificationSymbol7=$,227.127,False,Cleavable ICAT [(^12C10)H17N3O3] FragModelModificationSymbol8=%,236.127,False,Cleavable ICAT [(^13C9)(^12C)H17N3O3] FragModelModificationSymbol9=~,442.225,False,ICAT D0 [C20H34N4O5S] FragModelModificationSymbol10=`,450.274,False,ICAT D8 [C20H26D8N4O5S] -FragModelNotationMode=0 -FragModelSequence=KFNGLSLIKQHQLVNR +FragModelNotationMode=1 +FragModelSequence=Arg-His-Pro-Glu-Tyr-Ala-Val FragModelNTerminus=0 FragModelCTerminus=0 FragModelIonType0=0 @@ -220,7 +220,7 @@ FragModelAmmoniaLoss=0 FragModelPhosphateLoss=0 FragModelDoubleCharge=0 FragModelDoubleChargeThreshold=8 -FragModelTripleCharge=0 +FragModelTripleCharge=1 FragModelTripleChargeThreshold=9 FragModelPrecursorIonRemove=1 FragModelPrecursorIonMass=300 diff --git a/mwt_valu.inn b/mwt_valu.inn index 73eba35..b0e2ed1 100644 --- a/mwt_valu.inn +++ b/mwt_valu.inn @@ -1,4 +1,4 @@ -; Values File for MWTWIN Program (v6.43) +; Values File for MWTWIN Program (v6.44) ; ; File Automatically Created -- Select Save Values and Formulas under the Options Menu ; diff --git a/mwtwin.exe b/mwtwin.exe index 646638b..ae75885 100644 Binary files a/mwtwin.exe and b/mwtwin.exe differ diff --git a/mwtwin.ini b/mwtwin.ini index 842a9b7..6290a4b 100644 --- a/mwtwin.ini +++ b/mwtwin.ini @@ -1,4 +1,4 @@ -; Options File for MWTWIN Program (v6.43) +; Options File for MWTWIN Program (v6.44) ; ; File Automatically Created -- Select Save Options As Defaults in Preferences under the Options Menu ; @@ -24,4 +24,3 @@ FinderWeightModeWarn=0 FinderBoundedSearch=0 Language=English LanguageFile=lang_english.ini -LastOpenSaveFolder=D:\My Documents\Projects\DataMining\MwtWin\ diff --git a/mwtwin.inn b/mwtwin.inn index 692ce38..6290a4b 100644 --- a/mwtwin.inn +++ b/mwtwin.inn @@ -1,4 +1,4 @@ -; Options File for MWTWIN Program (v6.43) +; Options File for MWTWIN Program (v6.44) ; ; File Automatically Created -- Select Save Options As Defaults in Preferences under the Options Menu ;