Skip to content

Commit

Permalink
Added menu item "Reset to Defaults" to the Capillary Flower Calculato…
Browse files Browse the repository at this point in the history
…r window

Now auto-changing the interparticle porosity value to 0.4 if it is 0 when the Capillary Flower Calculator window loads
  • Loading branch information
alchemistmatt committed Nov 21, 2014
1 parent 6f9b285 commit fb83af7
Show file tree
Hide file tree
Showing 15 changed files with 382 additions and 4,310 deletions.
9 changes: 5 additions & 4 deletions MWTWIN.BAS
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Option Explicit

' *** Be sure to update version in Project | Properties also ***
Public Const PROGRAM_VERSION = "6.49"
Public Const PROGRAM_DATE = "February 19, 2014"
Public Const PROGRAM_DATE = "November 21, 2014"
' ***

'
Expand Down Expand Up @@ -276,7 +276,7 @@ Public Sub AddToIntro(strAdd As String, Optional blnUseMsgBoxInstead As Boolean
frmIntro.lblLoadStatus.Caption = frmIntro.lblLoadStatus.Caption & vbCrLf & strAdd
If blnErrorMessage Then
gBlnLoadStatusOK = False
frmIntro.cmdOK.Visible = True
frmIntro.CmdOK.Visible = True
End If
End If

Expand Down Expand Up @@ -1830,7 +1830,7 @@ Public Sub Main()

If Not gNonSaveExitApp Then
If Not gBlnLoadStatusOK Then
frmIntro.cmdOK.SetFocus
frmIntro.CmdOK.SetFocus
End If
Else
If gCommandLineInstructionsDisplayed Then
Expand Down Expand Up @@ -1924,6 +1924,7 @@ Private Sub MemoryLoadMenuCaptions()
' frmCapillaryFlow
FlexGridAddItems .grdMenuInfo, "7900", "mnuLoadCapValues", "&Load Values"
FlexGridAddItems .grdMenuInfo, "7910", "mnuSaveCapValues", "&Save Values"
FlexGridAddItems .grdMenuInfo, "7920", "mnuResetToDefaults", "Reset to &Defaults"
FlexGridAddItems .grdMenuInfo, "7950", "mnuCapillaryFlowHelp", "&Capillary Flow Calculations"

' frmFragmentationModelling
Expand Down Expand Up @@ -2620,7 +2621,7 @@ SetDefaultsErrorHandler:

End Sub

Private Sub SetDefaultCapillaryFlowValues()
Public Sub SetDefaultCapillaryFlowValues()

gCapFlowComputationTypeSave = 3 ' cptVolFlowRate = 3
gCapFlowLinkMassRateFlowRateSave = 1 ' Link Flow Rate
Expand Down
Loading

0 comments on commit fb83af7

Please sign in to comment.