SF.net SVN: jazzplusplus:[1014] trunk/jazz/src

[<pst...@us...>]

Revision: 1014
          http://sourceforge.net/p/jazzplusplus/code/1014
Author:   pstieber
Date:     2013-04-07 22:09:22 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
Simplified the array control.

Modified Paths:
--------------
    trunk/jazz/src/ArrayControl.cpp
    trunk/jazz/src/ArrayControl.h

Modified: trunk/jazz/src/ArrayControl.cpp
===================================================================
--- trunk/jazz/src/ArrayControl.cpp	2013-04-07 22:07:59 UTC (rev 1013)
+++ trunk/jazz/src/ArrayControl.cpp	2013-04-07 22:09:22 UTC (rev 1014)
@@ -59,10 +59,8 @@
   const JZRndArray& RandomArray,
   const wxPoint& Position,
   const wxSize& Size,
-  long WindowStyle,
-  const wxValidator& Validator,
-  const wxString& Name)
-  : wxControl(),
+  long WindowStyle)
+  : wxControl(pParent, Id, Position, Size, wxNO_BORDER),
     mpRandomArray(0),
     mStyleBits(ARED_GAP | ARED_XTICKS),
     mEnabled(true),
@@ -77,15 +75,7 @@
 {
   mpRandomArray = new JZRndArray(RandomArray);
 
-  Create(
-    pParent,
-    Id,
-    RandomArray,
-    Position,
-    Size,
-    WindowStyle,
-    Validator,
-    Name);
+  SetInitialSize(Size);
 }
 
 //-----------------------------------------------------------------------------
@@ -97,32 +87,6 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZArrayControl::Create(
-  wxWindow* pParent,
-  wxWindowID Id,
-  const JZRndArray& RandomArray,
-  const wxPoint& Position,
-  const wxSize& Size,
-  long WindowStyle,
-  const wxValidator& Validator,
-  const wxString& Name)
-{
-  wxControl::Create(
-    pParent,
-    Id,
-    Position,
-    Size,
-    WindowStyle | wxNO_BORDER,
-    Validator,
-    Name);
-
-  SetInitialSize(Size);
-
-  *mpRandomArray = RandomArray;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 void JZArrayControl::SetLabel(const string& Label)
 {
   mLabel = Label;
@@ -138,27 +102,21 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZArrayControl::SetMeter(int StepsPerCount, int CountPerBar, int BarCount)
+void JZArrayControl::OnSize(wxSizeEvent& SizeEvent)
 {
-//  mStepsPerCount = StepsPerCount;
-//  mCountPerBar = CountPerBar;
-//  mpRandomArray->Resize(StepsPerCount * CountPerBar * BarCount);
-//  SetXMinMax(1, StepsPerCount * CountPerBar * BarCount);
+  Refresh();
 }
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZArrayControl::OnSize(wxSizeEvent& SizeEvent)
+void JZArrayControl::OnPaint(wxPaintEvent& Event)
 {
-  mWidth = SizeEvent.GetSize().GetWidth();
-  mHeight = SizeEvent.GetSize().GetHeight();
+  wxSize Size = GetClientSize();
+  mWidth = Size.GetWidth();
+  mHeight = Size.GetHeight();
 
-  SizeEvent.Skip();
+  wxPaintDC Dc(this);
 
-  wxClientDC Dc(this);
-
-  Dc.SetFont(*wxSMALL_FONT);
-
   int TextWidth, TextHeight;
   Dc.GetTextExtent("123", &TextWidth, &TextHeight);
 
@@ -179,14 +137,7 @@
     mY + mHeight -
     mHeight * (mpRandomArray->GetNull() - mpRandomArray->GetMin()) /
     (mpRandomArray->GetMax() - mpRandomArray->GetMin());
-}
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-void JZArrayControl::OnPaint(wxPaintEvent& Event)
-{
-  wxPaintDC Dc(this);
-
   int i;
 
   // surrounding rectangle
@@ -201,6 +152,7 @@
   }
 
   Dc.SetPen(*wxBLACK_PEN);
+
   if (mWidth && mHeight)
   {
     Dc.DrawRectangle(0, 0, mWidth, mHeight);

Modified: trunk/jazz/src/ArrayControl.h
===================================================================
--- trunk/jazz/src/ArrayControl.h	2013-04-07 22:07:59 UTC (rev 1013)
+++ trunk/jazz/src/ArrayControl.h	2013-04-07 22:09:22 UTC (rev 1014)
@@ -38,28 +38,14 @@
       const JZRndArray& RandomArray,
       const wxPoint& Position = wxDefaultPosition,
       const wxSize& Size = wxSize(40, 40),
-      long WindowStyle = wxNO_BORDER,
-      const wxValidator& Validator = wxDefaultValidator,
-      const wxString& Name = wxT("arraycontrol"));
+      long WindowStyle = wxNO_BORDER);
 
     virtual ~JZArrayControl();
 
-    void Create(
-      wxWindow* pParent,
-      wxWindowID Id,
-      const JZRndArray& RandomArray,
-      const wxPoint& Position = wxDefaultPosition,
-      const wxSize& Size = wxSize(40, 40),
-      long WindowStyle = wxNO_BORDER,
-      const wxValidator& Validator = wxDefaultValidator,
-      const wxString& Name = wxT("arraycontrol"));
-
     void SetLabel(const std::string& Label);
 
     void SetXMinMax(int XMin, int XMax);
 
-    void SetMeter(int StepsPerCount, int CountPerBar, int BarCount);
-
   private:
 
     void OnSize(wxSizeEvent& Event);
@@ -70,13 +56,17 @@
 
     void DrawLabel(wxDC& Dc);
 
-    void DrawXTicks(wxDC& Dc);
+  protected:
 
+    virtual void DrawXTicks(wxDC& Dc);
+
+  private:
+
     void DrawYTicks(wxDC& Dc);
 
     void DrawNull(wxDC& Dc);
 
-  private:
+  protected:
 
     JZRndArray* mpRandomArray;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.