Add ctrl image viewer

Author: volatilflerovium

CMakeLists.txt

@@ -1,5 +1,3 @@
-# --------------------------------------------------------------------
-
 cmake_minimum_required(VERSION 3.13)
 project("K_and_M_recorder_player")
 
@@ -14,22 +12,15 @@ find_package(Threads REQUIRED)
 #--------------------------------------------------------------------- 
 ## Please set your wxWidgets configuration here
 #--------------------------------------------------------------------- 
- 
-# Here you can define what libraries of wxWidgets you need for your
-# application. You can figure out what libraries you need here;
-# https://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
-# We need the Find package for wxWidgets to work
-# NOTE: if you're using aui, include aui in this required components list.
-
-# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
-find_package(wxWidgets COMPONENTS core base REQUIRED)
- 
-#---------------------------------------------------------------------
-## Actual config file starts here
-#---------------------------------------------------------------------
- 
-# wxWidgets include (this will do all the magic to configure everything)
-include("${wxWidgets_USE_FILE}")
+if(DEFINED "ENV{WXWIDGETS_PATH}")
+	find_package(wxWidgets REQUIRED 
+		PATHS "$ENV{WXWIDGETS_PATH}" NO_DEFAULT_PATH
+		COMPONENTS core base
+	)
+else()
+	find_package(wxWidgets COMPONENTS core base REQUIRED)
+	include("${wxWidgets_USE_FILE}")
+endif()
 
 #--------------------------------------------------------------------- 
 
@@ -104,6 +95,7 @@ set(SOURCES1
 	src/key_conversion.cpp
 	src/progress_bar.cpp
 	src/wx_worker.cpp
+	src/light_image_panel.cpp
 )
 
 add_executable(

README.md

@@ -88,7 +88,8 @@ kmRecorderAndPlayer:
 - [Startup](https://odysee.com/@volatilflerovium:3/Quick_start_setup:c)
 - [Claudflare turnstile](https://odysee.com/@volatilflerovium:3/captchat_example:f)
 - [Image comparison tool](https://odysee.com/@volatilflerovium:3/image_comparison_tool_example:7)
-- [GUI testing](https://odysee.com/@volatilflerovium:3/GUI_testing:4)
+- [GUI testing](https://odysee.com/@volatilflerovium:3/testing_gui:6)
+- [Another GUI testing](https://odysee.com/@volatilflerovium:3/GUI_testing:4)
 - [Download images](https://odysee.com/@volatilflerovium:3/download_imgs:c)
 
 ## Interface Method

include/command_wrapper.h

@@ -66,6 +66,9 @@ class BasePanel : public wxPanel
 		virtual bool isPanel(PanelType panelType) const=0;
 
 		virtual int getHeight() const=0;
+		
+		virtual void reset()
+		{}
 
 		virtual void enableStatus()
 		{}
@@ -184,7 +187,7 @@ class CommandPanel : public WrapperPanel<CommandPanel, 10, 2, WX::DELETE_CMD, Ba
 {
 	public:
 		CommandPanel(wxWindow* parent, uint posY, uint width, BaseCommand* cmd)
-		:WrapperPanel<CommandPanel, 10, 2, WX::DELETE_CMD, BasePanel>(parent, posY, width)
+		: WrapperPanel<CommandPanel, 10, 2, WX::DELETE_CMD, BasePanel>(parent, posY, width)
 		{
 			m_baseCommandPtr=cmd;
 		}
@@ -223,7 +226,13 @@ class CommandPanel : public WrapperPanel<CommandPanel, 10, 2, WX::DELETE_CMD, Ba
 		}
 
 		virtual void enableStatus() override;
-
+		
+		virtual void reset() override
+		{
+			m_statusBtn->SetBackgroundColour(wxColour("#FFFFFF"));
+			SetBackgroundColour(wxColour("#FFFFFF"));
+		}
+		
 	protected:
 		BaseCommand* m_baseCommandPtr{nullptr};
 		wxBoxSizer* m_mainCol;
@@ -237,15 +246,16 @@ class CommandPanel : public WrapperPanel<CommandPanel, 10, 2, WX::DELETE_CMD, Ba
 
 		bool m_isIndented{false};
 
-		virtual void setSelected() override
+		/*virtual void setSelected() override
 		{
 			s_lastSelected=this;
-		}
+		}// */
 
 		static constexpr int c_padding=30;
 
 		virtual void setTimeoutCtrl()=0;
 		virtual void OnCheck(wxCommandEvent& event);
+		virtual void OnCheckStatus(wxCommandEvent& event);
 
 		DECLARE_EVENT_TABLE()
 
@@ -270,10 +280,13 @@ class InputCommandWrapper : public CommandPanel
 		static wxFloatingPointValidator<float> s_floatValidator;
 		static bool s_isValidatorSet;
 
+	DECLARE_EVENT_TABLE()
 };
 
 //====================================================================
 
+class ResultPopup;
+
 class ControlCommandWrapper : public CommandPanel
 {
 	public:
@@ -283,18 +296,18 @@ class ControlCommandWrapper : public CommandPanel
 
 		virtual void init(bool indentation=false);
 
-		virtual void enableCommand(bool enable);
-
 		void updateTimeout(int timeout)
 		{
 			m_timeoutInput->ChangeValue(wxString::Format("%i", timeout));
 		}
 
 	protected:
 		virtual void setTimeoutCtrl() override;
+		virtual void OnCheckStatus(wxCommandEvent& event) override;
+		virtual void mkContextMenu();
 
 	private:
-		wxButton* m_edit;
+		ResultPopup* m_imgCtrlViewrPtr;
 
 		DECLARE_EVENT_TABLE()
 };

include/dedicated_popups.h

@@ -23,11 +23,13 @@
 #include "utilities.h"
 
 #include <wx/wx.h>
+#include <string>
 
 class CtrlCommand;
 class WX_TextCtrl;
 class wxSpinCtrl;
 class ImagePanel;
+class LightImagePanel;
 
 //====================================================================
 
@@ -50,7 +52,7 @@ class AddCmdPopup : public ExtendedPopup
 
 		wxSpinCtrl* m_timeoutInput;
 		wxRadioBox* m_ctrlCmdModeSetRadio;
-		ImagePanel* m_previewPanel;
+		LightImagePanel* m_previewPanel;
 		wxCheckBox* m_strictRunCheck;
 
 		wxStaticText* m_instructions;
@@ -210,4 +212,26 @@ class FileListPopup : public WX_Popup
 
 //====================================================================
 
+class ResultPopup : public ExtendedPopup
+{
+	public:
+		ResultPopup(wxWindow* parent, const char* title, const std::string& baseImg);
+		virtual ~ResultPopup()=default;
+
+		void loadBaseImg(const std::string& baseImg);
+
+	protected:
+		std::string m_baseImg;
+		std::string m_sampleImg;
+		wxRadioBox* m_swapScreenshotRadio;
+		ImagePanel* m_previewPanel;
+		wxBoxSizer* m_bodySizer;
+		wxBoxSizer* m_row;
+		uint m_perc;
+
+		void setLayout();
+};
+
+//====================================================================
+
 #endif

include/enumerations.h

@@ -52,6 +52,8 @@ namespace WX
 		SETTINGS,
 		DELETE_FILE,
 		PROGRESS_TIMER,
+		CMD_STATUS,
+		CTRL_CMD_MENU_EDIT,
 		_LAST,
 	};
 

include/extended_popup.h

@@ -89,7 +89,7 @@ class BasicPopup : public wxFrame
 inline void BasicPopup::setSizer(wxBoxSizer* box, bool deleteOld)
 {
 	wxBoxSizer* boxWrapper = new wxBoxSizer(wxHORIZONTAL);
-	boxWrapper->Add(box, 0, wxALL, FromDIP(10));
+	boxWrapper->Add(box, 1, wxEXPAND | wxALL, FromDIP(10));
 	this->SetSizerAndFit(boxWrapper, deleteOld);
 }
 

include/file_scrolled_window.h

@@ -45,11 +45,6 @@ class FilePanel : public WrapperPanel<FilePanel, 10, 2, WX::DELETE_FILE>
 		wxString m_fileName;
 		WX_TextCtrl* m_fileNameInput;
 
-		virtual void setSelected() override
-		{
-			s_lastSelected=this;
-		}
-
 		DECLARE_EVENT_TABLE()
 
 		friend class FileScrolledWindow;

include/image_panel.h

@@ -47,11 +47,16 @@ class wxBackgroundBitmap : public wxEvtHandler
 		 * the bitmap explicitly, the bitmap will be destroyed automatically 
 		 * by wxWidgets when the application exits.
 		 * */
-		virtual ~wxBackgroundBitmap()=default;
+		virtual ~wxBackgroundBitmap()
+		{
+			delete m_bitmap;
+		}
+		
 		virtual bool ProcessEvent(wxEvent& Event);
 
 		void loadImage(wxBitmap* bitmap);
 		void loadImage(const char* imagePath, wxBitmapType bitmapType, uint rWidth, uint rHeight);
+		void loadImage(const char* imagePath, wxBitmapType bitmapType, uint perc);
 		void loadImage(const char* imagePath, wxBitmapType bitmapType);
 		int getWidth() const;
 		int getHeight() const;
@@ -208,6 +213,7 @@ class ImagePanel : public BaseBackground<wxPanel>
 		virtual ~ImagePanel()=default;
 
 		virtual void loadBackground(const char* imagePath, wxBitmapType bitmapType=wxBITMAP_TYPE_PNG);
+		virtual void loadBackground(const char* imagePath, wxBitmapType bitmapType, uint percent);
 
 	protected:
 		wxString m_path;

include/input_command.h

@@ -93,7 +93,7 @@ class ExitCode
 			BASE_IMAGE_MISSING=1<<3,
 			TARGET_WINDOW_CLOSED=1<<4,
 			CV_EXCEPTION=1<<5,
-			OUT_OF_BOUND=1<<6,// when pointer is trying to get to a position outside of the screen
+			OUT_OF_BOUND=1<<6,// when mouse pointer is trying to get to a position outside of the screen
 			SYSTEM_FAILED=1<<7,
 			UNKNOWN=1<<8,
 			LAST=1<<9

include/light_image_panel.h

@@ -0,0 +1,86 @@
+/*********************************************************************
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE. 
+* 
+* LightImagePanel class                                   				      *
+*                                                                    *
+* Version: 1.0                                                       *
+* Date:    22-06-2021   (Reviewed 03/2015)                           *
+* Author:  Dan Machado                                               *
+* Note: partially taken from https://wiki.wxwidgets.org/An_image_panel *
+**********************************************************************/
+#ifndef LIGHT_IMAGE_PANEL_H
+#define LIGHT_IMAGE_PANEL_H
+
+#include <wx/panel.h>
+#include <wx/string.h>
+
+//====================================================================
+
+class wxBitmap;
+
+class LightImagePanel : public wxPanel
+{
+	public:
+		LightImagePanel(wxWindow* parent, const char* file, const wxPoint& pos, int width);
+
+		LightImagePanel(wxWindow* parent, const wxSize& size=wxDefaultSize);
+
+		virtual ~LightImagePanel();
+
+		void loadImage(const wxString& file, bool nativeSize=false);
+		void replaceImage(const wxString& file);
+		void loadAndFit(const wxString& file, uint width, uint height);
+		void reSize(uint width, uint height);
+		void fitToWidth(uint newWidth);
+		void fitToHeight(uint newHeight);
+
+	private:
+		wxString m_file;
+		wxBitmap* m_bitmap;	
+		uint m_width;
+		uint m_height;
+
+		void fitToSize(uint rWidth, uint rHeight);
+		bool reloadImage();
+		void paintNow();
+		
+		void render(wxDC& dc);
+		void paintEvent(wxPaintEvent& evt);
+		
+		void OnDoubleClick(wxMouseEvent& event);
+
+		DECLARE_EVENT_TABLE()	
+};
+
+//----------------------------------------------------------------------
+
+inline void LightImagePanel::fitToWidth(uint newWidth)
+{
+	reSize(newWidth, 0);
+}
+
+//----------------------------------------------------------------------
+
+inline void LightImagePanel::fitToHeight(uint newHeight)
+{
+	reSize(0, newHeight);
+}
+
+//--------------------------------------------------------------------
+
+inline void LightImagePanel::OnDoubleClick(wxMouseEvent& event)
+{
+	std::string str("xdg-open ");
+	str.append(m_file.mb_str());
+	system(str.c_str());
+}
+
+//----------------------------------------------------------------------
+
+#endif