Changeset 71

Timestamp:

20/04/07 13:10:41 (6 years ago)

Author:

guyru

Message:

Make the dice look grayscale when the "keep" checkbox is ticked.
-Added SetGrayScale?() to wxDynamicBitmap
-Added event-handler for clicking on the "keep" checkboxes

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (1 diff)
• src/MainFrame.cpp (modified) (3 diffs)
• src/MainFrame.h (modified) (1 diff)
• src/wxDynamicBitmap.cpp (modified) (4 diffs)
• src/wxDynamicBitmap.h (modified) (1 diff)

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="7" >
+ <DocsAndViews NumberOfDocuments="8" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" >
    <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="332" Type="Source" />
+   <View0 line="786" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 Type="Source" />
+   <View0 line="64" Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.cpp" >
-   <View0 Type="Source" />
+   <View0 line="63" Type="Source" />
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.h" >
-   <View0 line="52" Type="Source" />
+   <View0 line="48" Type="Source" />
   </Doc6>
+  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
+   <View0 line="50" Type="Source" />
+  </Doc7>
  </DocsAndViews>
  <pluginList>

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -269 +269 @@
         Connect(ID_CHANCE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::OnChanceButton));
         Connect(ID_DICE1,ID_DICE5, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::OnDiceClick));
+        Connect(ID_DICE1KEEP,ID_DICE5KEEP, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (MainFrame::OnKeepClick));
         //END connecting the scoreboard buttons to the event
 
@@ -738 +739 @@
 void MainFrame::OnDiceClick (wxCommandEvent& event)
 {
+        //tick the checkbox
         if (((wxCheckBox*) FindWindow(event.GetId()-ID_DICE1 + ID_DICE1KEEP))->IsEnabled()){
                 bool newvalue = (((wxCheckBox*) FindWindow(event.GetId()-ID_DICE1 + ID_DICE1KEEP))->GetValue())?false:true;
                 ((wxCheckBox*) FindWindow(event.GetId()-ID_DICE1 + ID_DICE1KEEP)) -> SetValue(newvalue);
         }
+
+        //dispatch a click event on the checkbox
+        wxCommandEvent clickevent((event.GetId()-ID_DICE1 + ID_DICE1KEEP),wxEVT_COMMAND_CHECKBOX_CLICKED);
+        clickevent.SetEventObject( this );
+        clickevent.SetId(event.GetId()-ID_DICE1 + ID_DICE1KEEP);
+        this->OnKeepClick(clickevent); ///\todo find a better way to call the event handler.
+}
+
+void MainFrame::OnKeepClick (wxCommandEvent& event)
+{
+        wxCheckBox *temp = (wxCheckBox*) FindWindow(event.GetId());
+        ((wxDynamicBitmap*) FindWindow(event.GetId()-ID_DICE1KEEP + ID_DICE1))->SetGrayScale(temp->GetValue());
 }
 
@@ -770 +784 @@
                 ((wxCheckBox*) FindWindow(i + ID_DICE1KEEP)) -> SetValue(false);
                 ((wxCheckBox*) FindWindow(i + ID_DICE1KEEP)) -> Enable(false);
+                ((wxDynamicBitmap*) FindWindow(i+ID_DICE1)) -> SetGrayScale(false);
         }
 }

trunk/OpenYahtzee/src/MainFrame.h

@@ -63 +63 @@
         void OnChanceButton (wxCommandEvent& event);
         void OnDiceClick (wxCommandEvent& event);
-
-        
+        void OnKeepClick (wxCommandEvent& event);       
 
 private:

trunk/OpenYahtzee/src/wxDynamicBitmap.cpp

@@ -32 +32 @@
         wxControl::Create(parent,id,pos,size,style,wxDefaultValidator,name);
         Connect(id, wxEVT_PAINT, wxPaintEventHandler(wxDynamicBitmap::OnPaint));
+        Connect(id, wxEVT_LEFT_UP,wxMouseEventHandler(wxDynamicBitmap::OnClick));
         SetBitmap( bitmap);
-        Connect(id, wxEVT_LEFT_UP,wxMouseEventHandler(wxDynamicBitmap::OnClick));
+        m_grayscale=false;
+        
 }
 
@@ -50 +52 @@
 {
         m_bitmap = bitmap;
+        SetGrayScale(m_grayscale);
         wxWindow::Refresh();
         wxWindow::Update();
@@ -65 +68 @@
         dc.DrawRectangle(windowRect);
 
-        dc.DrawBitmap(m_bitmap , 0 , 0, true);
+        dc.DrawBitmap((m_grayscale?m_graybitmap:m_bitmap) , 0 , 0, true);
+        
 }
 
@@ -81 +85 @@
         GetEventHandler()->ProcessEvent( newevent );
 }
+
+void wxDynamicBitmap::SetGrayScale(bool grayscale)
+{
+        m_grayscale = grayscale;
+        
+        //regenerate the grayscale bitmap;
+        if (grayscale) {
+                wxImage tempimage;
+                tempimage = m_bitmap.ConvertToImage();
+                ConvertToGrayScale(tempimage);
+                m_graybitmap = wxBitmap(tempimage);
+        }
+        wxWindow::Refresh();
+        wxWindow::Update();
+}
+
+void wxDynamicBitmap::ConvertToGrayScale(wxImage& image) const
+{
+        double red2Gray    = 0.297;
+        double green2Gray = 0.589;
+        double blue2Gray = 0.114;
+        int w = image.GetWidth(), h = image.GetHeight();
+        unsigned char *data = image.GetData();
+        int x,y;
+        for (y = 0; y < h; y++)
+                for (x = 0; x < w; x++)
+                {
+                        long pos = (y * w + x) * 3;
+                        char g = (char) (data[pos]*red2Gray +
+                                data[pos+1]*green2Gray +
+                                data[pos+2]*blue2Gray);
+                        data[pos] = data[pos+1] = data[pos+2] = g;
+                }
+}
+

trunk/OpenYahtzee/src/wxDynamicBitmap.h

@@ -47 +47 @@
         void OnClick(wxMouseEvent& event);
         wxSize DoGetBestSize() const;
+        void SetGrayScale(bool grayscale=true);
+        void ConvertToGrayScale(wxImage& image) const;
 private:
         void PaintBitmap(wxDC& dc);
         wxBitmap m_bitmap;
+        wxBitmap m_graybitmap;
+        bool m_grayscale;
 };