Mesh Scaling

Apply fix affecting Windows OS

Mesh Scaling
Apply fix affecting Windows OS
Steve Greedy
1 parent 2ccd78e5
Showing 17 changed files with 99 additions and 27 deletions Show diff stats
GUI/SW1/SRC/BUNDLEBLDR.cpp
GUI/SW1/SRC/BUNDLEBLDR.h
GUI/SW1/SRC/DCONN.cpp
GUI/SW1/SRC/DCONN.h
GUI/SW1/SRC/MESH_LAPLACE.cpp
GUI/SW1/SRC/MESH_LAPLACE.h
GUI/SW1/SRC/SPACEWIRE.cpp
GUI/SW1/SRC/SPACEWIRE.h
GUI/SW1/SRC/SW1_GUIApp.h
GUI/SW1/SRC/TP.cpp
GUI/SW1/SRC/TP.h
GUI/SW1/SRC/TWINAX.cpp
GUI/SW1/SRC/TWINAX.h
GUI/SW1/SRC/UTP.cpp
GUI/SW1/SRC/UTP.h
GUI/SW1/SRC/resources/Build
version_information.inc
@@ -334,7 +334,7 @@ void BUNDLEBLDR::OnListboxRDown(wxMouseEvent&amp; event)
         wxString strMessage;
         wxString strItem = ListBox1->GetString(item);
-        strMessage = "Are you sure you wish to delete: ";
+        strMessage = "Are you sure you w    DrawBundleCsection();ish to delete: ";
         strMessage = strMessage << strItem;
         // Confirm cable component deletion?
         wxMessageDialog bb_ConfirmDelete (this, strMessage, _("Please confirm delete") ,wxYES_NO|wxCENTRE,wxDefaultPosition );
@@ -355,7 +355,7 @@ void BUNDLEBLDR::PopulateListControl(void)
 {
     ListBox1->Clear();
-    Button1->Enable();
+    Button1->Enable();    DrawBundleCsection();
     Bundle *Current = bundle_root;
@@ -485,8 +485,11 @@ void BUNDLEBLDR::OnCheckListBox1Toggled(wxCommandEvent&amp; event)
 void BUNDLEBLDR::OnPanel1Paint(wxPaintEvent& event)
 {
+
     DrawPanel();
-    DrawBundleCsection();
+    //DrawBundleCsection();
+
+
 }
 void BUNDLEBLDR::DrawPanel()
@@ -667,7 +670,7 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
         dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
         dc.DrawCircle( wxPoint(size_h/2+scaledxCoord,size_v/2+scaledyCoord), inner_conductor_Scaledradius );
-    DrawBundleCsection();
+
     }
    if (str.compare("Twinax") == 0 ){
@@ -1302,6 +1305,15 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         }
     }
+    if(CheckBox1->GetValue())
+    {
+    // Ground Plane
+        int size_hl, size_vl;
+        Panel1->GetSize(&size_hl, &size_vl );
+        dc.SetPen( wxPen( (*wxBLACK) ,5 , wxSOLID) );
+        dc.DrawLine( 0, size_vl/2, size_hl,size_vl/2 );
+    }
+
 }
 void BUNDLEBLDR::OnButton1Click(wxCommandEvent& event)
@@ -1471,7 +1483,8 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event)
             meshfile  = meshfile.substr(0, extindex);
             extindex = meshfile.find_last_of (".");
-
+    int size_h, size_v;
+    Panel1->GetSize(&size_h, &size_v );
             meshfile  = meshfile.substr(0, extindex);
             meshfile = meshfile.substr(2,meshfile.length());
@@ -1523,9 +1536,11 @@ void BUNDLEBLDR::OnComboBox1Selected(wxCommandEvent&amp; event)
 {
     wxString meshToView;
     meshToView<<ComboBox1->GetValue();
-    draw_mesh(Panel1,meshToView);
+    draw_mesh(Panel1,meshToView, scale);
     MeshSelected = 1;
+
+    TextCtrl8->Disable();
 }
 void BUNDLEBLDR::OnTextCtrl4Text(wxCommandEvent& event)
@@ -1557,9 +1572,11 @@ void BUNDLEBLDR::OnSpinButton1Change(wxSpinEvent&amp; event)
     maxXY.ToDouble(&maxDimension);
-    FormatPanel(maxDimension);
-
-    DrawBundleCsection();
+    if (MeshSelected == 0)
+    {
+        FormatPanel(maxDimension);
+        DrawBundleCsection();
+    }
 }
@@ -1573,7 +1590,20 @@ void BUNDLEBLDR::OnTextCtrl8TextEnter(wxCommandEvent&amp; event)
     FormatPanel(maxDimension);
-    DrawBundleCsection();
+
+    if (MeshSelected == 1)
+    {
+        scale = scale + 0.1;
+
+        wxString meshToView;
+        meshToView<<ComboBox1->GetValue();
+        draw_mesh(Panel1,meshToView, scale);
+    }
+
+    else
+    {
+            DrawBundleCsection();
+    }
 }
@@ -1595,7 +1625,20 @@ void BUNDLEBLDR::OnSpinButton1ChangeUp(wxSpinEvent&amp; event)
     FormatPanel(maxDimension);
-    DrawBundleCsection();
+    if (MeshSelected == 1)
+    {
+        scale = scale + 0.05;
+
+        wxString meshToView;
+        meshToView<<ComboBox1->GetValue();
+        draw_mesh(Panel1,meshToView, scale);
+    }
+
+    else
+    {
+            DrawBundleCsection();
+    }
+
 }
 void BUNDLEBLDR::OnSpinButton1ChangeDown(wxSpinEvent& event)
@@ -1618,6 +1661,21 @@ void BUNDLEBLDR::OnSpinButton1ChangeDown(wxSpinEvent&amp; event)
     FormatPanel(maxDimension);
-    DrawBundleCsection();
+
+    if (MeshSelected == 1)
+    {
+        scale = scale - 0.05;
+
+        if (scale <= 0.05) scale = 0.05;
+
+        wxString meshToView;
+        meshToView<<ComboBox1->GetValue();
+        draw_mesh(Panel1,meshToView, scale);
+    }
+
+    else
+    {
+            DrawBundleCsection();
+    }
 }
@@ -148,7 +148,9 @@ class BUNDLEBLDR: public wxDialog
         wxString MESH_PARAM1;
         wxString MESH_PARAM2;
-        int MeshSelected;
+        int MeshSelected = 0;
+
+        float scale = 1.0;
 		//(*Declarations(BUNDLEBLDR)
@@ -576,7 +576,7 @@ void DCONN::OnComboBox1Selected(wxCommandEvent&amp; event)
 {
     wxString meshToView;
     meshToView<<ComboBox1->GetValue();
-    draw_mesh(Panel1,meshToView);
+    draw_mesh(Panel1,meshToView, scale);
 }
 void DCONN::OnCheckBox2Click(wxCommandEvent& event)
@@ -94,6 +94,8 @@ class DCONN: public wxDialog
         wxString MESH_PARAM1;
         wxString MESH_PARAM2;
+        float scale = 1.0;
+
 		//(*Declarations(DCONN)
 		wxTextCtrl* TextCtrl4;
 		wxStaticText* StaticText2;
@@ -41,7 +41,7 @@
 #include "MESH_LAPLACE.h"
-void draw_mesh(wxPanel *Panel, wxString mesh_to_draw)
+void draw_mesh(wxPanel *Panel, wxString mesh_to_draw, float zoom)
 {
     wxClientDC dc(Panel);
     dc.Clear();
@@ -108,6 +108,8 @@ void draw_mesh(wxPanel *Panel, wxString mesh_to_draw)
     dc.SetPen( wxPen( *wxBLUE));
+    scale = scale * zoom;
+
     int i, polygon_edges, v1, v2, v3;
     v1 = 0;
@@ -135,7 +137,7 @@ void draw_mesh(wxPanel *Panel, wxString mesh_to_draw)
     meshFile.close();
 }
-void zoom_mesh(wxPanel *Panel, wxString mesh_to_draw)
+void zoom_mesh(wxPanel *Panel, wxString mesh_to_draw, float zoom)
 {
     wxClientDC dc(Panel);
@@ -87,8 +87,8 @@ using namespace std;
 //    DECLARE_EVENT_TABLE()
 //};
-void draw_mesh(wxPanel *Panel, wxString mesh_to_draw);
-void zoom_mesh(wxPanel *Panel, wxString mesh_to_draw);
+void draw_mesh(wxPanel *Panel, wxString mesh_to_draw, float scale);
+void zoom_mesh(wxPanel *Panel, wxString mesh_to_draw, float scale);
 //class MESH_LAPLACE: public wxDialog
 //{
@@ -1624,7 +1624,7 @@ void SPACEWIRE::OnComboBox1Selected(wxCommandEvent&amp; event)
 {
     wxString meshToView;
     meshToView<<ComboBox1->GetValue();
-    draw_mesh(Panel1,meshToView);
+    draw_mesh(Panel1,meshToView, scale);
 }
 void SPACEWIRE::OnCheckBox3Click(wxCommandEvent& event)
@@ -90,6 +90,8 @@ class SPACEWIRE: public wxDialog
         void spacewireSchematic();
         void OnHighlightSchematic(wxCommandEvent & event);
+        float scale = 1.0;
+
         wxString FD_ESR1;
         wxString FD_ESR2;
         wxString FD_ESR3;
@@ -68,7 +68,7 @@ class SW1_GUIApp : public wxApp
         wxBitmap splashimage;
         std::string SACAMOS_V_NUMBER = "SPICE_CABLE_MODEL_BUILDER_version=\"v4.0.0\"";
-        std::string SACAMOS_V_DATE   = "SPICE_CABLE_MODEL_BUILDER_date=\"27th September 2018\"";
+        std::string SACAMOS_V_DATE   = "SPICE_CABLE_MODEL_BUILDER_date=\"5th October 2018\"";
@@ -1158,7 +1158,7 @@ void TP::OnPanel4MouseWheel(wxMouseEvent&amp; event)
     wxClientDC dc(Panel4);
     dc.Clear();
-    zoom_mesh(Panel4,fileName);
+    zoom_mesh(Panel4,fileName,scale);
 }
@@ -1166,7 +1166,7 @@ void TP::OnComboBox1Selected(wxCommandEvent&amp; event)
 {
     wxString meshToView;
     meshToView<<ComboBox1->GetValue();
-    draw_mesh(Panel4,meshToView);
+    draw_mesh(Panel4,meshToView, scale);
 }
 void TP::OnCheckBox4Click(wxCommandEvent& event)
@@ -91,6 +91,8 @@ class TP: public wxDialog
         void tpSchematic();
         void OnHighlightSchematic(wxCommandEvent & event);
+        float scale = 1.0;
+
         wxString FD_ESR1;
         wxString FD_ESR2;
         wxString FD_ESR3;
@@ -1140,7 +1140,7 @@ void TWINAX::OnComboBox1Selected(wxCommandEvent&amp; event)
 {
     wxString meshToView;
     meshToView<<ComboBox1->GetValue();
-    draw_mesh(Panel1,meshToView);
+    draw_mesh(Panel1,meshToView, scale);
 }
 void TWINAX::OnCheckBox3Click(wxCommandEvent& event)
@@ -91,6 +91,8 @@ class TWINAX: public wxDialog
         void twinaxSchematic();
         void OnHighlightSchematic(wxCommandEvent & event);
+        float scale = 1.0;
+
         wxString FD_ESR1;
         wxString FD_ESR2;
         wxString FD_ESR3;
@@ -688,14 +688,14 @@ void UTP::OnPanel1MouseWheel(wxMouseEvent&amp; event)
     wxClientDC dc(Panel1);
     dc.Clear();
-    zoom_mesh(Panel1,fileName);
+    zoom_mesh(Panel1,fileName, scale);
 }
 void UTP::OnComboBox1Selected(wxCommandEvent& event)
 {
     wxString meshToView;
     meshToView<<ComboBox1->GetValue();
-    draw_mesh(Panel1,meshToView);
+    draw_mesh(Panel1,meshToView, scale);
 }
 void UTP::EditExistingCable()
@@ -92,6 +92,8 @@ class UTP: public wxDialog
         void utpSchematic();
         void OnHighlightSchematic(wxCommandEvent & event);
+        float scale = 1.0;
+
         wxString FD_ESR1;
         wxString FD_ESR2;
         wxString FD_ESR3;
 GUI:
 Version: v4.0.0
-Date: 27th September 2018
+Date: 5th October 2018
 SPICE_CABLE_MODEL_BUILDER
 Version: v4.0.0
 SPICE_CABLE_MODEL_BUILDER_version="v4.0.0"
-SPICE_CABLE_MODEL_BUILDER_date="27th September 2018"
+SPICE_CABLE_MODEL_BUILDER_date="5th October 2018"