Fixed initial aspect ratio of plot in wxPLViewer

philrosenberg · philrosenberg · commit 0a1ff58feede · 2015-02-22T10:12:06.000Z
diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp
@@ -113,8 +113,8 @@ wxPLDevice::wxPLDevice( PLStream *pls, char * mfo, PLINT text, PLINT hrshsym )
     else
         //assume we will be outputting to the default
         //memory map until we are given a dc to draw to
-        //strcpy(m_mfo, "plplotMemoryMap");
-        strcpy( m_mfo, "plplotMemoryMap??????????" );
+        strcpy(m_mfo, "plplotMemoryMap");
+        //strcpy( m_mfo, "plplotMemoryMap??????????" );
 
     // be verbose and write out debug messages
 #ifdef _DEBUG
diff --git a/utils/wxplframe.cpp b/utils/wxplframe.cpp
@@ -184,10 +184,31 @@ void wxPlFrame::OnCheckTimer( wxTimerEvent &event )
 }
 void wxPlFrame::OnToggleFixAspect( wxCommandEvent &event )
 {
-    m_stream.SetFixedAspectRatio( event.IsChecked() );
-    if ( !event.IsChecked() )
+	fixAspect( event.IsChecked() );
+}
+
+void wxPlFrame::fixAspect( bool fix )
+{
+	m_stream.SetFixedAspectRatio( fix );
+    if ( !fix )
         this->Refresh();
 }
+void wxPlFrame::SetClientSize ( int width, int height )
+{
+	wxFrame::SetClientSize( width, height );
+	m_stream.SetSize( width, height );
+}
+
+void wxPlFrame::SetClientSize ( const wxSize &size )
+{
+	SetClientSize( size.GetWidth(), size.GetHeight() );
+}
+
+void wxPlFrame::SetClientSize ( const wxRect &rect )
+{
+	SetClientSize( rect.GetWidth(), rect.GetHeight() );
+}
+
 void wxPlFrame::OnNextPage( wxCommandEvent& event )
 {
     SetPageAndUpdate( m_viewingPage + 1 );
diff --git a/utils/wxplframe.h b/utils/wxplframe.h
@@ -45,6 +45,12 @@ class wxPlFrame : public wxPLplotwindow<wxFrame>
                const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE,
                const wxString &name = wxFrameNameStr );
     ~wxPlFrame();
+	void fixAspect( bool fix );
+	//overloads of SetClientSize that ensure the wxStream size is changed
+	//immediately
+	void SetClientSize ( int width, int height );
+	void SetClientSize ( const wxSize &size );
+	void SetClientSize ( const wxRect &rect );
 private:
     void setupMenus();
     void OnExit( wxCommandEvent& event );
diff --git a/utils/wxplviewer.cpp b/utils/wxplviewer.cpp
@@ -59,7 +59,9 @@ bool wxPlViewerApp::OnInit()
 #endif
     wxPlFrame* frame = new wxPlFrame( NULL, wxID_ANY, wxT( "wxPlViewer" ), file,
         PLINT( fileSize ), wxDefaultPosition, wxDefaultSize );
+	frame->fixAspect( false );
     frame->SetClientSize( width, height );
+	frame->fixAspect( true );
     frame->Show();
     return true;
 }
