Commit c86da05a authored by lifekidyeaa's avatar lifekidyeaa
Browse files

fixed error in eeschema: when loading a new sub-sheet, it incorrectly asked if the user wanted 

to change the sheet.  there is no 'change' since the sheet is new, and the associated screen 
should either be loaded from the hierarchy or from a file.
parent 81b6cbcb

eeschema/class_drawsheet.cpp

+12 −9
Original line number Original line Diff line number Diff line
@@ -467,7 +467,7 @@ void DrawSheetStruct::SetFileName( const wxString& aFilename ) 
 * Set a new filename and manage data and associated screen

 * Set a new filename and manage data and associated screen

 * The main difficulty is the filename change in a complex hierarchy.

 * The main difficulty is the filename change in a complex hierarchy.

 * - if new filename is not already used: change to the new name (and if an existing file is found, load it on request)

 * - if new filename is not already used: change to the new name (and if an existing file is found, load it on request)

 * - if new filename is already used (a complex hierarchy) : add the sheet to the complex hierarchy.

 * - if new filename is already used (a complex hierarchy) : reference the sheet. 

 */

 */





bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame * aFrame, const wxString& aFileName )

bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame * aFrame, const wxString& aFileName )
@@ -481,6 +481,8 @@ bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame * aFrame, const wxSt 








    if( g_RootSheet->SearchHierarchy( aFileName, &Screen_to_use ) ) //do we reload the data from the existing hierarchy

    if( g_RootSheet->SearchHierarchy( aFileName, &Screen_to_use ) ) //do we reload the data from the existing hierarchy

    {

		if(m_AssociatedScreen) //upon initial load, this will be null.

		{

		{

			msg.Printf( _(

			msg.Printf( _(

						"A Sub Hierarchy named %s exists, Use it (The data in this sheet will be replaced)?" ),

						"A Sub Hierarchy named %s exists, Use it (The data in this sheet will be replaced)?" ),
@@ -491,6 +493,7 @@ bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame * aFrame, const wxSt 
				return false;

				return false;

			}

			}

		}

		}

    }





    else if( wxFileExists( aFileName ) )         //do we reload the data from an existing file

    else if( wxFileExists( aFileName ) )         //do we reload the data from an existing file

    {

    {

eeschema/sheet.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -300,13 +300,14 @@ void WinEDA_SheetPropertiesFrame::SheetPropertiesAccept( wxCommandEvent& event ) 
    }

    }





    ChangeFileNameExt( FileName, g_SchExtBuffer );

    ChangeFileNameExt( FileName, g_SchExtBuffer );

	if ( (FileName != m_CurrentSheet->GetFileName()) && m_CurrentSheet->m_AssociatedScreen )

	if ( (FileName != m_CurrentSheet->GetFileName()) )

	{

	{

        msg = _("Changing a Filename can change all the schematic structure and cannot be undone" );

        msg = _("Changing a Filename can change all the schematic structure and cannot be undone" );

		msg << wxT("\n");

		msg << wxT("\n");

		msg << _("Ok to continue renaming?");

		msg << _("Ok to continue renaming?");

        if( IsOK( NULL, msg) )

        if( m_CurrentSheet->m_AssociatedScreen == 0 || IsOK( NULL, msg) )

		{

		{ //do not prompt on a new sheet. in fact, we should not allow a sheet to be created 

		 //without a valid associated filename to be read from.

			m_Parent->GetScreen()->ClearUndoRedoList();

			m_Parent->GetScreen()->ClearUndoRedoList();

			m_CurrentSheet->ChangeFileName(m_Parent, FileName);

			m_CurrentSheet->ChangeFileName(m_Parent, FileName);

		}

		}