Skip to content

Commit

Permalink
Merge pull request #1962 from maxwellfundi/Savegraphreset
Browse files Browse the repository at this point in the history
Savegraphreset and TestOkEnabled
  • Loading branch information
dannyparsons authored Oct 27, 2016
2 parents a5dbb40 + fcd764c commit aac6d3b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
6 changes: 5 additions & 1 deletion instat/dlgBoxPlot.vb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Public Class dlgBoxplot
ucrSelectorBoxPlot.Focus()
ucrVariablesAsFactorForBoxplot.ResetControl()
chkHorizontalBoxplot.Checked = False
ucrSaveBoxplot.Reset()
sdgPlots.Reset()
TestOkEnabled()
SetXParameter()
Expand Down Expand Up @@ -86,7 +87,6 @@ Public Class dlgBoxplot
End Sub

Private Sub TestOkEnabled()

If ucrVariablesAsFactorForBoxplot.IsEmpty Or (ucrSaveBoxplot.chkSaveGraph.Checked And ucrSaveBoxplot.ucrInputGraphName.IsEmpty) Then
ucrBase.OKEnabled(False)
Else
Expand Down Expand Up @@ -170,4 +170,8 @@ Public Class dlgBoxplot
End If
TestOkEnabled()
End Sub

Private Sub ucrSaveBoxplot_ContentsChanged() Handles ucrSaveBoxplot.ContentsChanged
TestOkEnabled()
End Sub
End Class
9 changes: 7 additions & 2 deletions instat/ucrSaveGraph.vb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Public Class ucrSaveGraph
Public Event SaveGraphCheckedChanged()
Public Event GraphNameChanged()
Public Event ContentsChanged()
Public bFirstLoad As Boolean

Public Sub New()
Expand Down Expand Up @@ -43,8 +44,12 @@
If chkSaveGraph.Checked Then
RaiseEvent GraphNameChanged()
End If
End Sub

End Sub

Private Sub ucrInputGraphName_ContentsChanged() Handles ucrInputGraphName.ContentsChanged
RaiseEvent ContentsChanged()
End Sub

Public ReadOnly Property bSaveGraph() As Boolean
Get
Return chkSaveGraph.Checked
Expand Down

0 comments on commit aac6d3b

Please sign in to comment.