Commit c5cd8502 authored by lifekidyeaa's avatar lifekidyeaa
Browse files

2008-Feb-12 UPDATE Tim Hanson sideskate@gmail.com

================================================================================
+eeschema
        * commiting my changes to allow multiple instances of a given schematic file within 
a hierarchy:
        ** internally, m_currentScreen has been replaced with m_currentSheet,
                which is a list or 'path' of screens.  The path of screens is used to 
generate
                a series of timestamps, which is converted to flat component reference via 
a look-up
                table in the schematic files.
        ** this means that m_currentScreen is no longer used -- use GetScreen().
        ** GetScreen is virtual, as some of the dialogs keep around a WinEDA_BaseScreen 
pointer.
        ** all sub-sheets in a given schematic must have different names to generate a 
meaningful netlist.
parent 27bd742a
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@
#
#
# CMAKE_VERBOSE_MAKEFILE ON/OFF (OPTIONAL)
# CMAKE_VERBOSE_MAKEFILE ON/OFF (OPTIONAL)
#   Turns ON/OFF verbose build messages.
#   Turns ON/OFF verbose build messages.
# 	you can also pass VERBOSE=1 to make for the same effect.
#
#
# CMAKE_INSTALL_PREFIX (OPTIONAL)
# CMAKE_INSTALL_PREFIX (OPTIONAL)
#   
#   
+13 −1
Original line number Original line Diff line number Diff line
@@ -6,6 +6,19 @@ Please add newer entries at the top, list the date and your name with
email address.
email address.




2008-Feb-12 UPDATE   Tim Hanson sideskate@gmail.com
================================================================================
+eeschema
	* commiting my changes to allow multiple instances of a given schematic file within a hierarchy: 
	** internally, m_currentScreen has been replaced with m_currentSheet, 
		which is a list or 'path' of screens.  The path of screens is used to generate 
		a series of timestamps, which is converted to flat component reference via a look-up
		table in the schematic files. 
	** this means that m_currentScreen is no longer used -- use GetScreen(). 
	** GetScreen is virtual, as some of the dialogs keep around a WinEDA_BaseScreen pointer. 
	** all sub-sheets in a given schematic must have different names to generate a meaningful netlist. 

=======
2008-Feb-12 UPDATE Igor Plyatov <plyatov@mail.ru>
2008-Feb-12 UPDATE Igor Plyatov <plyatov@mail.ru>
================================================================================
================================================================================
+eeschema
+eeschema
@@ -13,7 +26,6 @@ email address.
+all
+all
    Russian translation update.
    Russian translation update.



2008-Feb-11 UPDATE   Dick Hollenbeck <dick@softplc.com>
2008-Feb-11 UPDATE   Dick Hollenbeck <dick@softplc.com>
================================================================================
================================================================================
+pcbnew
+pcbnew
+7 −7
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ BASE_SCREEN::~BASE_SCREEN()
void BASE_SCREEN::InitDatas()
void BASE_SCREEN::InitDatas()
/*******************************/
/*******************************/
{
{
    m_SheetNumber = m_NumberOfSheet = 1;    /* gestion hierarchie: Root: SheetNumber = 1 */
    m_ScreenNumber = m_NumberOfScreen = 1;    /* gestion hierarchie: Root: ScreenNumber = 1 */
    m_Zoom            = 32;
    m_Zoom            = 32;
    m_Grid            = wxSize( 50, 50 );   /* pas de la grille */
    m_Grid            = wxSize( 50, 50 );   /* pas de la grille */
    m_UserGrid        = g_UserGrid;         /* pas de la grille "utilisateur" */
    m_UserGrid        = g_UserGrid;         /* pas de la grille "utilisateur" */
@@ -63,18 +63,18 @@ void BASE_SCREEN::InitDatas()
    {
    {
    case SCHEMATIC_FRAME:
    case SCHEMATIC_FRAME:
        m_Center = FALSE;
        m_Center = FALSE;
        m_CurrentSheet = &g_Sheet_A4;
        m_CurrentSheetDesc = &g_Sheet_A4;
        break;
        break;


    default:
    default:
    case CVPCB_DISPLAY_FRAME:
    case CVPCB_DISPLAY_FRAME:
    case MODULE_EDITOR_FRAME:
    case MODULE_EDITOR_FRAME:
    case PCB_FRAME:
    case PCB_FRAME:
        m_CurrentSheet = &g_Sheet_A4;
        m_CurrentSheetDesc = &g_Sheet_A4;
        break;
        break;


    case GERBER_FRAME:
    case GERBER_FRAME:
        m_CurrentSheet = &g_Sheet_GERBER;
        m_CurrentSheetDesc = &g_Sheet_GERBER;
        break;
        break;
    }
    }


@@ -158,15 +158,15 @@ wxSize BASE_SCREEN::ReturnPageSize()
    {
    {
    default:
    default:
    case SCHEMATIC_FRAME:
    case SCHEMATIC_FRAME:
        PageSize = m_CurrentSheet->m_Size;
        PageSize = m_CurrentSheetDesc->m_Size;
        break;
        break;


    case GERBER_FRAME:
    case GERBER_FRAME:
    case CVPCB_DISPLAY_FRAME:
    case CVPCB_DISPLAY_FRAME:
    case MODULE_EDITOR_FRAME:
    case MODULE_EDITOR_FRAME:
    case PCB_FRAME:
    case PCB_FRAME:
        PageSize.x = m_CurrentSheet->m_Size.x * (PCB_INTERNAL_UNIT / 1000);
        PageSize.x = m_CurrentSheetDesc->m_Size.x * (PCB_INTERNAL_UNIT / 1000);
        PageSize.y = m_CurrentSheet->m_Size.y * (PCB_INTERNAL_UNIT / 1000);
        PageSize.y = m_CurrentSheetDesc->m_Size.y * (PCB_INTERNAL_UNIT / 1000);
        break;
        break;
    }
    }


+5 −3
Original line number Original line Diff line number Diff line
@@ -186,7 +186,9 @@ std::ostream& operator<<( std::ostream& out, const wxPoint& pt )
void EDA_BaseStruct::Show( int nestLevel, std::ostream& os )
void EDA_BaseStruct::Show( int nestLevel, std::ostream& os )
{
{
    // for now, make it look like XML:
    // for now, make it look like XML:
    NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() << ">\n";
	wxString s = GetClass();
	s = s + wxT(" ");  
    NestedSpace( nestLevel, os ) << '<' << s.Lower().mb_str() << ">\n";


    /*
    /*
    EDA_BaseStruct* kid = m_Son;
    EDA_BaseStruct* kid = m_Son;
@@ -195,9 +197,9 @@ void EDA_BaseStruct::Show( int nestLevel, std::ostream& os )
        kid->Show( nestLevel+1, os );
        kid->Show( nestLevel+1, os );
    }
    }
    */
    */
    NestedSpace( nestLevel+1, os ) << "Need ::Show() override, shown class is using EDA_BaseStruct::Show()\n";
    NestedSpace( nestLevel+1, os ) << "Need ::Show() override\n";
    
    
    NestedSpace( nestLevel, os ) << "</" << GetClass().Lower().mb_str() << ">\n";
    NestedSpace( nestLevel, os ) << "</" << s.Lower().mb_str() << ">\n";
}
}


    
    
+3 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,9 @@ void WinEDA_BasicFrame::PrintMsg(const wxString & text)
/******************************************************/
/******************************************************/
{
{
	SetStatusText(text);
	SetStatusText(text);
#ifdef DEBUG
	printf("%s\n", (const char*)text.mb_str() ); 
#endif
}
}


/*************************************************************************/
/*************************************************************************/
Loading