minor enhancements. fixed issues in microwave tools.

finished replacement of Get_Message (not very useful) by wxTextEntryDialog

eeschema/controle.cpp

@@ -175,6 +175,13 @@ SCH_ITEM* WinEDA_SchematicFrame::SchematicGeneralLocateAndDisplay( const wxPoint
         return DrawStruct;
     }
 
+    DrawStruct = (SCH_ITEM*) PickStruct( refpoint, GetScreen(), LABELITEM );
+    if( DrawStruct )
+    {
+        ClearMsgPanel();
+        return DrawStruct;
+    }
+
     /* search for a pin */
     Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint,
                         &LibItem );

eeschema/edit_component_in_schematic.cpp

@@ -132,6 +132,8 @@ modified!\nYou must create a new power"  ) );
     wxTextEntryDialog dlg( this, Field->m_Name, _( "Component field text" ), newtext );
     int diag = dlg.ShowModal();
     newtext = dlg.GetValue( );
+    newtext.Trim( true );
+    newtext.Trim( false );
 
     DrawPanel->MouseToCursorSchema();
     DrawPanel->m_IgnoreMouseEvents = FALSE;
@@ -306,6 +308,8 @@ void WinEDA_SchematicFrame::EditComponentReference( SCH_COMPONENT* Cmp, wxDC* DC
         return; // cancelled by user
 
     ref = dlg.GetValue( );
+    ref.Trim( true );
+    ref.Trim( false );
 
     if( !ref.IsEmpty() ) // New text entered
     {
@@ -351,6 +355,8 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
         return; // cancelled by user
 
     message = dlg.GetValue( );
+    message.Trim( true );
+    message.Trim( false );
 
     if( !message.IsEmpty() )
     {
@@ -390,6 +396,8 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
         return; // cancelled by user
 
     message = dlg.GetValue( );
+    message.Trim( true );
+    message.Trim( false );
 
     bool wasEmpty = false;
     if( TextField->m_Text.IsEmpty() )

kicad/tree_project_frame.cpp

@@ -858,6 +858,8 @@ void TREE_PROJECT_FRAME::OnRenameFile( wxCommandEvent& )
         return; // cancelled by user
 
     buffer = dlg.GetValue( );
+    buffer.Trim( true );
+    buffer.Trim( false );
     if( buffer.IsEmpty() )
         return;         // empty file name not allowed
 

pcbnew/dialog_design_rules.cpp

@@ -661,6 +661,8 @@ void DIALOG_DESIGN_RULES::OnAddNetclassClick( wxCommandEvent& event )
         return; // cancelled by user
 
     class_name = dlg.GetValue( );
+    class_name.Trim( true );
+    class_name.Trim( false );
     if( class_name.IsEmpty() )
         return;         // empty name not allowed
 

pcbnew/librairi.cpp

@@ -525,6 +525,7 @@ int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
         wxTextEntryDialog dlg( this, _( "Name:" ), _( "Save module" ), Name_Cmp );
         if( dlg.ShowModal() != wxID_OK )
             return 0; // cancelled by user
+        Name_Cmp = dlg.GetValue();
         Name_Cmp.Trim( true );
         Name_Cmp.Trim( false );
         if( Name_Cmp.IsEmpty() )
@@ -735,9 +736,9 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( const wxString& aModuleName )
     {
         wxTextEntryDialog dlg( this, _( "Module Reference:" ),
                          _( "Module Creation" ), moduleName );
-        int diag = dlg.ShowModal();
-        if( diag != wxID_OK )
+        if( dlg.ShowModal() != wxID_OK )
             return NULL;    //Aborted by user
+        moduleName = dlg.GetValue();
     }
     moduleName.Trim( true );
     moduleName.Trim( false );

pcbnew/modules.cpp

@@ -70,10 +70,10 @@ MODULE* WinEDA_BasePcbFrame::GetModuleByName()
     MODULE*           module = NULL;
 
     wxTextEntryDialog dlg( this, _( "Name:" ), _( "Search footprint" ), moduleName );
-
     if( dlg.ShowModal() != wxID_OK )
         return NULL;    //Aborted by user
 
+    moduleName = dlg.GetValue();
     moduleName.Trim( true );
     moduleName.Trim( false );
     if( !moduleName.IsEmpty() )

pcbnew/muonde.cpp

@@ -203,7 +203,7 @@ MODULE* WinEDA_PcbFrame::Genere_Self( wxDC* DC )
     if( dlg.ShowModal() != wxID_OK )
         return NULL; // cancelled by user
 
-    msg = dlg.GetValue( );
+    msg = dlg.GetValue();
     Mself.lng = ReturnValueFromString( g_UserUnit, msg, GetScreen()->GetInternalUnits() );
 
     /* Control values (ii = minimum length) */
@@ -313,7 +313,7 @@ static void gen_arc( std::vector <wxPoint>& aBuffer,
 {
     #define SEGM_COUNT_PER_360DEG 16
     wxPoint first_point = aStartPoint - aCenter;
-    int     seg_count = ( (abs( a_ArcAngle ) ) * SEGM_COUNT_PER_360DEG) / 3600;
+    int     seg_count   = ( ( abs( a_ArcAngle ) ) * SEGM_COUNT_PER_360DEG ) / 3600;
 
     if( seg_count == 0 )
         seg_count = 1;
@@ -440,8 +440,9 @@ int BuildCornersList_S_Shape( std::vector <wxPoint>& aBuffer,
 
     // Adjust len by adjusting segm_len:
     int delta_size = full_len - aLength;
+
     // reduce len of the segm_count segments + 2 half size segments (= 1 full size segment)
-    segm_len -= delta_size / (segm_count+1);
+    segm_len -= delta_size / (segm_count + 1);
 
     // Generate first line (the first stub) and first arc (90 deg arc)
     pt = aStartPoint;
@@ -524,15 +525,21 @@ MODULE* WinEDA_PcbFrame::Create_MuWaveBasicShape( const wxString& name,
     if( Module == NULL )
         return NULL;
 
+    #define DEFAULT_SIZE 30
     Module->m_TimeStamp           = GetTimeStamp();
-    Module->m_Value->m_Size       = wxSize( 30, 30 );
-    Module->m_Value->m_Pos0.y     = -30;
+    Module->m_Value->m_Size       = wxSize( DEFAULT_SIZE, DEFAULT_SIZE );
+    Module->m_Value->m_Pos0.y     = -DEFAULT_SIZE;
     Module->m_Value->m_Pos.y     += Module->m_Value->m_Pos0.y;
-    Module->m_Reference->m_Size   = wxSize( 30, 30 );
-    Module->m_Reference->m_Pos0.y = 30;
+    Module->m_Value->m_Width      = DEFAULT_SIZE / 4;
+    Module->m_Reference->m_Size   = wxSize( DEFAULT_SIZE, DEFAULT_SIZE );
+    Module->m_Reference->m_Pos0.y = DEFAULT_SIZE;
     Module->m_Reference->m_Pos.y += Module->m_Reference->m_Pos0.y;
+    Module->m_Reference->m_Width  = DEFAULT_SIZE / 4;
 
-    /* Create dots forming the gap. */
+    /* Create 2 pads used in gaps and stubs.
+     *  The gap is between these 2 pads
+     * the stub is the pad 2
+     */
     while( pad_count-- )
     {
         D_PAD* pad = new D_PAD( Module );
@@ -553,33 +560,6 @@ MODULE* WinEDA_PcbFrame::Create_MuWaveBasicShape( const wxString& name,
 }
 
 
-#if 0
-static void Exit_Muonde( WinEDA_DrawFrame* frame, wxDC* DC )
-{
-    MODULE* Module = (MODULE*) frame->GetScreen()->GetCurItem();
-
-    if( Module )
-    {
-        if( Module->m_Flags & IS_NEW )
-        {
-            Module->Draw( frame->DrawPanel, DC, GR_XOR );
-            Module->DeleteStructure();
-        }
-        else
-        {
-            Module->Draw( frame->DrawPanel, DC, GR_XOR );
-        }
-    }
-
-    frame->DrawPanel->ManageCurseur = NULL;
-    frame->DrawPanel->ForceCloseManageCurseur = NULL;
-    frame->SetCurItem( NULL );
-}
-
-
-#endif
-
-
 /* Create a module "GAP" or "STUB"
  *  This a "gap" or  "stub" used in micro wave designs
  *  This module has 2 pads:
@@ -622,24 +602,31 @@ MODULE* WinEDA_PcbFrame::Create_MuWaveComponent(  int shape_type )
         break;
     }
 
-    msg = ReturnStringFromValue( g_UserUnit, gap_size, GetScreen()->GetInternalUnits() );
-    wxTextEntryDialog dlg( this, msg, _( "Create microwave module" ), wxEmptyString );
+    wxString          value = ReturnStringFromValue( g_UserUnit, gap_size,
+                                                    GetScreen()->GetInternalUnits() );
+    wxTextEntryDialog dlg( this, msg, _( "Create microwave module" ), value );
     if( dlg.ShowModal() != wxID_OK )
     {
         DrawPanel->MouseToCursorSchema();
         return NULL; // cancelled by user
     }
 
-    msg = dlg.GetValue( );
-    gap_size = ReturnValueFromString( g_UserUnit, msg, GetScreen()->GetInternalUnits() );
+    value    = dlg.GetValue();
+    gap_size = ReturnValueFromString( g_UserUnit, value, GetScreen()->GetInternalUnits() );
 
     bool abort = false;
     if( shape_type == 2 )
     {
         double            fcoeff = 10.0, fval;
         msg.Printf( wxT( "%3.1f" ), angle / fcoeff );
-        wxTextEntryDialog angledlg( this, _( "Angle (0.1deg):" ), _( "Create microwave module" ), msg );
-        msg = angledlg.GetValue( );
+        wxTextEntryDialog angledlg( this, _( "Angle (0.1deg):" ), _(
+                                        "Create microwave module" ), msg );
+        if( angledlg.ShowModal() != wxID_OK )
+        {
+            DrawPanel->MouseToCursorSchema();
+            return NULL; // cancelled by user
+        }
+        msg = angledlg.GetValue();
         if( !msg.ToDouble( &fval ) )
         {
             DisplayError( this, _( "Incorrect number, abort" ) );
@@ -1105,7 +1092,7 @@ void WinEDA_PcbFrame::Edit_Gap( wxDC* DC, MODULE* Module )
     if( dlg.ShowModal() != wxID_OK )
         return; // cancelled by user
 
-    msg = dlg.GetValue( );
+    msg = dlg.GetValue();
     gap_size = ReturnValueFromString( g_UserUnit, msg, GetScreen()->GetInternalUnits() );
 
     /* Updating sizes of pads forming the gap. */