adding selection of vertex shapes in settings

Author: rostam

BasicDrawPane.cpp

@@ -115,7 +115,7 @@ void BasicDrawPane::paintEvent(wxPaintEvent & evt)
  * at any time. Using this generally does not free you from
  * catching paint events, since it is possible that e.g. the window
  * manager throws away your drawing when the window comes to the
- * background, and expects you will redraw it when the window comes
+ * background and expects you will redraw it when the window comes
  * back (by sending a paint event).
  *
  * In most cases, this will not be needed at all; simply handling
@@ -131,7 +131,7 @@ void BasicDrawPane::paintNow()
 /*
  * Here we do the actual rendering. I put it in a separate
  * method so that it can work no matter what type of DC
- * (e.g. wxPaintDC or wxClientDC) is used.
+ * (e.g., wxPaintDC or wxClientDC) is used.
  */
 void BasicDrawPane::render(wxPaintDC&  dc) {
 
@@ -145,7 +145,7 @@ void BasicDrawPane::render(wxPaintDC&  dc) {
         gc->SetPen(wxPen(wxColor(0, 0, 0), 1)); // black line, 3 pixels thick
         gc->DrawRectangle(0,0,dc.GetSize().GetWidth(),dc.GetSize().GetHeight());
         try {
-            const Graph& g = ((CGTeaFrame*)this->m_parent)->currentGraph;
+            const Graph& g = static_cast<CGTeaFrame*>(this->m_parent)->currentGraph;
             drawEdges(g, gc);
             drawVertices(g, gc);
         } catch (std::exception &e) {
@@ -194,7 +194,7 @@ void BasicDrawPane::drawEdges(const Graph &g, wxGraphicsContext* gc) {
 //     });
 // }
 
-void BasicDrawPane::drawShape(wxGraphicsContext* gc, VertexShape shape,
+void BasicDrawPane::drawShape(wxGraphicsContext* gc, const VertexShape shape,
                             const cgtea_geometry::Point& pos, double size) {
     switch(shape) {
         case VertexShape::Square:
@@ -248,7 +248,10 @@ void BasicDrawPane::drawVertices(const Graph &g, wxGraphicsContext* gc) {
     for_each_v_const(g, [&](Ver v) {
         const int color = boost::get(vertex_color, g, v);
         const cgtea_geometry::Point pos = boost::get(boost::vertex_distance, g, v);
-        auto shape = VertexShape::Diamond;
+        //auto shape = VertexShape::Diamond;
+        const auto frame = static_cast<CGTeaFrame*>(this->m_parent);
+        const auto shape = frame ? frame->getCurrentVertexShape() : VertexShape::Circle;
+
 
         // Draw a white background
         gc->SetPen(wxPen(wxColor(255, 0, 0), 1));

BasicDrawPane.h

@@ -8,11 +8,9 @@
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
-#include <wx/sizer.h>
 #include "datatypes.h"
 #include <string>
 #endif
-#include <exception>
 #include <wx/graphics.h>
 #include <map>
 

CGTeaFrame.cpp

@@ -40,8 +40,10 @@
 
 #include <memory>
 
+#include "SettingsDialog.h"
+
 wxBEGIN_EVENT_TABLE(CGTeaFrame, wxFrame)
-                EVT_MENU(wxID_ABOUT, CGTeaFrame::OnAbout)
+    EVT_MENU(wxID_ABOUT, CGTeaFrame::OnAbout)
 wxEND_EVENT_TABLE()
 
 CGTeaFrame::CGTeaFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
@@ -80,11 +82,14 @@ CGTeaFrame::CGTeaFrame(const wxString& title, const wxPoint& pos, const wxSize&
     auto menuFile = std::make_unique<wxMenu>();
     menuFile->Append(1000, "&Open");
     menuFile->Append(1001, "&Save");
+    menuFile->Append(1002, "&Settings");
     menuFile->AppendSeparator();
     menuFile->Append(wxID_EXIT);
 
     Connect(1000, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::Open));
     Connect(1001, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::Save));
+    Connect(1002, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::OnSettings));
+
     Connect(wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CGTeaFrame::OnExit));
 
     auto menuGenerate = std::make_unique<wxMenu>();
@@ -283,4 +288,12 @@ void CGTeaFrame::Save(wxCommandEvent& event) {
     out.flush();
     out.close();
     cerr << g6 << endl;
-}
+}
+
+void CGTeaFrame::OnSettings(wxCommandEvent& event) {
+    SettingsDialog dialog(this);
+    if (dialog.ShowModal() == wxID_OK) {
+        currentVertexShape = dialog.GetSelectedShape();
+        Refresh(); // Redraw the graph with the new vertex shape
+    }
+}

CGTeaFrame.h

@@ -25,6 +25,7 @@ class CGTeaFrame: public wxFrame {
     Graph currentGraph;
 
     CGTeaFrame(const wxString &title, const wxPoint &pos, const wxSize &size);
+    VertexShape getCurrentVertexShape() const { return currentVertexShape; }
 
     std::vector<std::unique_ptr<GeneratorInterface>> availableGenerators;
     std::vector<std::unique_ptr<ReportInterface>> availableReports;
@@ -44,6 +45,11 @@ class CGTeaFrame: public wxFrame {
     void Open(wxCommandEvent &event);
     void Save(wxCommandEvent &event);
 
+    void OnSettings(wxCommandEvent& event);
+
+    VertexShape currentVertexShape = VertexShape::Circle;
+
+
 wxDECLARE_EVENT_TABLE();
 };
 

CMakeLists.txt

@@ -13,7 +13,11 @@ file(GLOB ConjectureCheck "ConjectureCheck/*.cpp")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 #set( CMAKE_CXX_FLAGS "`wx-config --cxxflags --libs`")
 add_executable(CGTea CGTeaApp.cpp BasicDrawPane.cpp CGTeaFrame.cpp CGTeaSidebar.cpp  ${Reports} ${Generators} ${Actions}
-        const_values.h)
-add_executable(BoostTest ${Reports} ${Generators}  ${BoostTestSrc} ${ConjectureCheck} ${Actions})
+        const_values.h
+        SettingsDialog.cpp
+        SettingsDialog.h)
+add_executable(BoostTest ${Reports} ${Generators}  ${BoostTestSrc} ${ConjectureCheck} ${Actions}
+        SettingsDialog.cpp
+        SettingsDialog.h)
 target_link_libraries(CGTea ${wxWidgets_LIBRARIES} ${Boost_LIBRARIES})
 target_link_libraries(BoostTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})

SettingsDialog.cpp

@@ -0,0 +1,43 @@
+//
+// Created by rostam on 15.05.25.
+//
+
+#include "SettingsDialog.h"
+
+
+SettingsDialog::SettingsDialog(wxWindow* parent)
+    : wxDialog(parent, wxID_ANY, "Settings", wxDefaultPosition, wxDefaultSize)
+{
+    wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
+
+    wxArrayString shapeChoices;
+    shapeChoices.Add("Circle");
+    shapeChoices.Add("Square");
+    shapeChoices.Add("Triangle");
+    shapeChoices.Add("Diamond");
+
+    shapeRadioBox = new wxRadioBox(this, wxID_ANY, "Vertex Shape",
+                                  wxDefaultPosition, wxDefaultSize,
+                                  shapeChoices, 1, wxRA_SPECIFY_COLS);
+
+    mainSizer->Add(shapeRadioBox, 0, wxALL | wxEXPAND, 5);
+
+    wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer();
+    buttonSizer->AddButton(new wxButton(this, wxID_OK));
+    buttonSizer->AddButton(new wxButton(this, wxID_CANCEL));
+    buttonSizer->Realize();
+    mainSizer->Add(buttonSizer, 0, wxALL | wxEXPAND, 5);
+
+    SetSizer(mainSizer);
+    mainSizer->Fit(this);
+}
+
+VertexShape SettingsDialog::GetSelectedShape() const {
+    switch (shapeRadioBox->GetSelection()) {
+    case 0: return VertexShape::Circle;
+    case 1: return VertexShape::Square;
+    case 2: return VertexShape::Triangle;
+    case 3: return VertexShape::Diamond;
+    default: return VertexShape::Circle;
+    }
+}

SettingsDialog.h

@@ -0,0 +1,22 @@
+//
+// Created by rostam on 15.05.25.
+//
+
+#ifndef CGTEA_SETTINGSDIALOG_H
+#define CGTEA_SETTINGSDIALOG_H
+
+#include <wx/wx.h>
+#include <wx/radiobox.h>
+#include "const_values.h"
+
+class SettingsDialog : public wxDialog {
+public:
+    explicit SettingsDialog(wxWindow* parent);
+    VertexShape GetSelectedShape() const;
+
+private:
+    wxRadioBox* shapeRadioBox;
+};
+
+#endif //CGTEA_SETTINGSDIALOG_H
+