#pragma hdrstop
#endif
-// for all others, include the necessary headers wxWidgets headers)
+#include "autocapture.h"
+
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
-#include <ctime>
-#include <wx/notebook.h>
+#include "wx/bitmap.h"
+#include "wx/filename.h"
+#include "wx/notebook.h"
-#include "autocapture.h"
+#include <ctime>
#ifdef __WXMAC__
#include <cstring>
// AutoCaptureMechanism
// ----------------------------------------------------------------------------
+AutoCaptureMechanism::AutoCaptureMechanism(wxNotebook *notebook,
+ int flag, int margin)
+: m_notebook(notebook),
+ m_flag(flag),
+ m_margin(margin),
+ m_grid(NULL)
+{
+}
+
/* static */
wxString AutoCaptureMechanism::default_dir = _T("screenshots");
/* static */
void AutoCaptureMechanism::Delay(int seconds)
{
- // TODO: Switch this to use wxTimer.
+ // TODO: Switch this to use wxTimer.
// Wait for 3 seconds
clock_t start = clock();
}
/* static */
-wxBitmap AutoCaptureMechanism::Capture(int x, int y, int width, int height, int delay)
+bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, int x, int y,
+ int width, int height, int delay)
{
// Somehow wxScreenDC.Blit() doesn't work under Mac for now. Here is a trick.
#ifdef __WXMAC__
// wxExecute(_T("screencapture -x ") + tempfile, wxEXEC_SYNC);
char captureCommand[80] =""; // a reasonable max size is 80
-
sprintf(captureCommand, "sleep %d;%s", delay, "screencapture -x /tmp/wx_screen_capture.png");
-
system(captureCommand);
- wxBitmap fullscreen;
-
if(delay) Delay(delay);
+ wxBitmap fullscreen;
do
{
fullscreen = wxBitmap(_T("/tmp/wx_screen_capture.png"), wxBITMAP_TYPE_PNG);
}
while(!fullscreen.IsOk());
- wxBitmap screenshot = fullscreen.GetSubBitmap(wxRect(x,y,width,height));
+ bitmap = fullscreen.GetSubBitmap(wxRect(x,y,width,height));
// to prevent loading the old screenshot next time
system("rm /tmp/wx_screen_capture.png");
+ return true;
+
#else // Under other paltforms, take a real screenshot
if(delay) Delay(delay);
// Create a DC for the whole screen area
wxScreenDC dcScreen;
- // Create a Bitmap that will later on hold the screenshot image
- // Note that the Bitmap must have a size big enough to hold the screenshot
- // -1 means using the current default colour depth
- wxBitmap screenshot(width, height, -1);
+ bitmap->Create(width, height);
// Create a memory DC that will be used for actually taking the screenshot
wxMemoryDC memDC;
-
- // Tell the memory DC to use our Bitmap
- // all drawing action on the memory DC will go to the Bitmap now
- memDC.SelectObject(screenshot);
+ memDC.SelectObject((*bitmap));
+ memDC.Clear();
// Blit (in this case copy) the actual screen on the memory DC
// and thus the Bitmap
memDC.SelectObject(wxNullBitmap);
#endif // #ifdef __WXMAC__
- return screenshot;
+ return true;
}
/* static */
-wxBitmap AutoCaptureMechanism::Capture(wxRect rect, int delay)
+bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, wxRect rect, int delay)
{
wxPoint origin = rect.GetPosition();
- return Capture(origin.x, origin.y, rect.GetWidth(), rect.GetHeight(), delay);
+ return Capture(bitmap, origin.x, origin.y, rect.GetWidth(), rect.GetHeight(), delay);
}
/* static */
-void AutoCaptureMechanism::Save(wxBitmap screenshot, wxString fileName)
+void AutoCaptureMechanism::Save(wxBitmap* screenshot, const wxString& fileName)
{
// make sure default_dir exists
if (!wxDirExists(default_dir))
fullFileName.SetName(fullFileName.GetName() + "_");
// save the screenshot as a PNG
- screenshot.SaveFile(fullFileName.GetFullPath(), wxBITMAP_TYPE_PNG);
+ screenshot->SaveFile(fullFileName.GetFullPath(), wxBITMAP_TYPE_PNG);
}
void AutoCaptureMechanism::CaptureAll()
}
// create the screenshot
- wxBitmap screenshot = Capture(ctrl);
+ wxBitmap screenshot(0, 0);
+ Capture(&screenshot, ctrl);
if(ctrl.flag & AJ_Union)
{
{
++it;
it->name = ctrl.name; //preserving the name
- screenshot = Union(screenshot, Capture(*it));
+ wxBitmap screenshot2(0, 0);
+ Capture(&screenshot2, *it);
+ wxBitmap combined(0, 0);
+ Union(&screenshot, &screenshot2, &combined);
+ screenshot = combined;
}
while(!(it->flag & AJ_UnionEnd));
}
// and save it
- Save(screenshot, ctrl.name);
+ Save(&screenshot, ctrl.name);
}
}
-wxBitmap AutoCaptureMechanism::Capture(Control& ctrl)
+bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, Control& ctrl)
{
// no manual specification for the control name
// or name adjustment is disabled globally
ctrl.name.MakeLower();
// take the screenshot
- wxBitmap screenshot = Capture(rect, (choice == wxYES)?5:0);
+ Capture(bitmap, rect, (choice == wxYES)?5:0);
if (choice == wxYES) ctrl.ctrl->SetCursor(wxNullCursor);
if (ctrl.flag & AJ_RegionAdjust)
PutBack(ctrl.ctrl);
- return screenshot;
+ return true;
}
-wxBitmap AutoCaptureMechanism::Union(wxBitmap pic1, wxBitmap pic2)
+/* static */
+bool AutoCaptureMechanism::Union(wxBitmap* top, wxBitmap* bottom, wxBitmap* result)
{
int w1, w2, h1, h2, w, h;
- w1 = pic1.GetWidth();
- w2 = pic2.GetWidth();
- h1 = pic1.GetHeight();
- h2 = pic2.GetHeight();
+ w1 = top->GetWidth();
+ w2 = bottom->GetWidth();
+ h1 = top->GetHeight();
+ h2 = bottom->GetHeight();
const int gap_between = 20;
w = (w1 >= w2) ? w1 : w2;
h = h1 + h2 + gap_between;
- wxBitmap result(w, h, -1);
+ result->Create(w, h);
wxMemoryDC dstDC;
- dstDC.SelectObject(result);
+ dstDC.SelectObject((*result));
- dstDC.SetPen(*wxTRANSPARENT_PEN);
dstDC.SetBrush(*wxWHITE_BRUSH);
- dstDC.DrawRectangle(-1, -1, w + 1, h + 1);
- dstDC.DrawBitmap(pic1, 0, 0, false);
- dstDC.DrawBitmap(pic2, 0, h1 + gap_between, false);
+ dstDC.Clear();
+ dstDC.DrawBitmap((*top), 0, 0);
+ dstDC.DrawBitmap((*bottom), 0, h1 + gap_between);
dstDC.SelectObject(wxNullBitmap);
- return result;
+ return true;
}
wxRect AutoCaptureMechanism::GetRect(wxWindow* ctrl, int flag)
#define _AUTOCAPTURE_H_
#include <vector>
-#include "wx/filename.h"
+#include "wx/gdicmn.h"
+
+class wxBitmap;
+class wxFlexGridSizer;
+class wxWindow;
class wxNotebook;
/**
*/
AutoCaptureMechanism(wxNotebook *notebook,
int flag = AJ_NormalAll,
- int margin = 5)
- : m_notebook(notebook), m_flag(flag),
- m_margin(margin), m_grid(NULL) {}
+ int margin = 5);
- ~AutoCaptureMechanism(){}
+ ~AutoCaptureMechanism() { }
/**
Register a control and perform specifid auto adjustments.
/**
Take a screenshot for the given region.
- @param rect is the given rectangular region.
-
- @param delay is only useful for Mac, for fixing a delay bug. It seems that it didn't
- fix the bug, so it might be removed soon.
+ @param bitmap
+ Bitmap to save the screenshot to.
+ @param rect
+ Given rectangular region.
+ @param delay
+ Only useful for Mac, for fixing a delay bug. It seems that it
+ didn't fix the bug, so it might be removed soon.
*/
- static wxBitmap Capture(wxRect rect, int delay = 0);
+ static bool Capture(wxBitmap* bitmap, wxRect rect, int delay = 0);
/**
Take a screenshot for the given region.
- @see Capture(wxRect rect, int delay)
+ @see Capture(wxBitmap*,wxRect,int)
*/
- static wxBitmap Capture(int x, int y, int width, int height, int delay = 0);
+ static bool Capture(wxBitmap* bitmap, int x, int y, int width, int height, int delay = 0);
/**
Save the screenshot as the name of @a fileName in the default directory.
@a fileName should be without ".png".
*/
- static void Save(wxBitmap screenshot, wxString fileName);
+ static void Save(wxBitmap* screenshot, const wxString& fileName);
/**
Set the default directory where the screenshots will be generated.
*/
- static void SetDefaultDirectory(wxString dir) { default_dir = dir; }
+ static void SetDefaultDirectory(const wxString& dir) { default_dir = dir; }
/**
Get the default directory where the screenshots will be generated.
/*
Capture and auto adjust the control. Used by CaptureAll().
*/
- wxBitmap Capture(Control & ctrl);
+ bool Capture(wxBitmap* bitmap, Control& ctrl);
/*
Get the correct rectangular region that the control occupies. Used by
The gap is 20 pixels by default. Currently it isn't configurable.
*/
- static wxBitmap Union(wxBitmap pic1, wxBitmap pic2);
+ static bool Union(wxBitmap* top, wxBitmap* bottom, wxBitmap* result);
/*
Delay a few seconds without blocking GUI.
projects / wxWidgets.git / commitdiff
