merge (e7b3ed2e) · Commits · Elphel / kicad-source-mirror

CHANGELOG.txt

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,32 @@ KiCad ChangeLog 2012
	Please add newer entries at the top, list the date and your name with		Please add newer entries at the top, list the date and your name with
	email address.		email address.

			2012-Feb-5 UPDATE Dick Hollenbeck <dick@softplc.com>
			================================================================================
			++pcbnew
			* Changed classs ZONE_SETTING to class ZONE_SETTINGS, better English.
			* Changed ZONE_SETTINGS::Import() to operator << ( ZONE_CONTAINER )
			* move globals into BOARD:
			bool g_Zone_45_Only, is now in BOARD::m_zoneSettings.m_Zone_45_Only
			ZONE_SETTINGS g_Zone_Default_Setting is now in BOARD::m_zoneSettings
			* Added BOARD::{Get,Set}ZoneSettings().
			* Added PCB_BASE_FRAME::{Get,Set}ZoneSettings().
			* Save/load BOARD::m_zoneSettings.m_Zone_45_Only to/from BOARD file.
			* Removed PCB_EDIT_FRAME::InstallDialogNonCopperZonesEditor() in favor of
			::InvokeNonCopperZonesEditor() declared in zones.h
			* Added ::InvokeCopperZonesEditor() declared in zones.h
			* Removed dialog_copper_zones.h since DIALOG class is now declared in *.cpp.
			* Renamed to enum ZONE_EDIT_T in zones.h
			* SetVisibleAlls() is not called as it was in two previous cases for several
			reasons. BOARD_DESIGN_SETTINGS constructor controls what is visible initially.
			and in the near future so will the *.brd file. I believe the user should
			have visibility setting rentention accross editing sessions of zones,
			fields, etc.
			* BOARD_DESIGN_SETTINGS constructor initializes hidden text as not visible.
			* Added PCB_EDIT_FRAME::SyncRenderStates() and PCB_LAYER_WIDGET::syncRenderStates()
			so the checkboxes can be set after loading a BOARD file containing previous
			visibility settings.

	2012-Feb-2 UPDATE Dick Hollenbeck <dick@softplc.com>		2012-Feb-2 UPDATE Dick Hollenbeck <dick@softplc.com>
	================================================================================		================================================================================
	++pcbnew		++pcbnew

common/CMakeLists.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ set(PCB_COMMON_SRCS
	../pcbnew/class_text_mod.cpp		../pcbnew/class_text_mod.cpp
	../pcbnew/class_track.cpp		../pcbnew/class_track.cpp
	../pcbnew/class_zone.cpp		../pcbnew/class_zone.cpp
	../pcbnew/class_zone_setting.cpp		../pcbnew/class_zone_settings.cpp
	../pcbnew/classpcb.cpp		../pcbnew/classpcb.cpp
	../pcbnew/collectors.cpp		../pcbnew/collectors.cpp
	../pcbnew/sel_layer.cpp		../pcbnew/sel_layer.cpp

common/pcbcommon.cpp

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@
	#include <plot_common.h>		#include <plot_common.h>

	#include <class_pad.h>		#include <class_pad.h>
	#include <class_zone_setting.h>		#include <class_zone_settings.h>
	#include <class_board_design_settings.h>		#include <class_board_design_settings.h>


	@@ -100,9 +100,6 @@ int g_PadCUColor = GREEN;
	int g_PadCMPColor = RED;		int g_PadCMPColor = RED;


	// Current design settings:
	class BOARD_DESIGN_SETTINGS g_DesignSettings;

	/**		/**
	* Used in track creation, a list of track segments currently being created,		* Used in track creation, a list of track segments currently being created,
	* with the newest track at the end of the list, sorted by new-ness. e.g. use		* with the newest track at the end of the list, sorted by new-ness. e.g. use
	@@ -111,9 +108,4 @@ class BOARD_DESIGN_SETTINGS g_DesignSettings;
	*/		*/
	DLIST<TRACK> g_CurrentTrackList;		DLIST<TRACK> g_CurrentTrackList;

	bool g_Zone_45_Only = false;

	// Default setting used when creating a new zone
	ZONE_SETTING g_Zone_Default_Setting;

	D_PAD g_Pad_Master( (MODULE*) NULL );		D_PAD g_Pad_Master( (MODULE*) NULL );

include/class_board_design_settings.h

+12 −14

Original line number	Original line	Diff line number	Diff line
	@@ -2,21 +2,14 @@
	/* class_board_design_settings.h : handle board options */		/* class_board_design_settings.h : handle board options */
	/**********************************************************/		/**********************************************************/

	#ifndef _BOARD_DESIGN_SETTING_H		#ifndef BOARD_DESIGN_SETTINGS_H_
	#define _BOARD_DESIGN_SETTING_H		#define BOARD_DESIGN_SETTINGS_H_

	#include <pcbstruct.h> // NB_COLORS		#include <pcbstruct.h> // NB_COLORS

	// Class for handle current printed board design settings		// Class for handle current printed board design settings
	class BOARD_DESIGN_SETTINGS		class BOARD_DESIGN_SETTINGS
	{		{
	protected:
	int m_CopperLayerCount; ///< Number of copper layers for this design
	int m_EnabledLayers; ///< Bit-mask for layer enabling
	int m_VisibleLayers; ///< Bit-mask for layer visibility
	int m_VisibleElements; ///< Bit-mask for element category visibility


	public:		public:
	bool m_MicroViasAllowed; ///< true to allow micro vias		bool m_MicroViasAllowed; ///< true to allow micro vias
	int m_CurrentViaType; ///< via type (VIA_BLIND_BURIED, VIA_TROUGHT VIA_MICROVIA)		int m_CurrentViaType; ///< via type (VIA_BLIND_BURIED, VIA_TROUGHT VIA_MICROVIA)
	@@ -57,7 +50,8 @@ public:

	/**		/**
	* Function SetVisibleAlls		* Function SetVisibleAlls
	* Set the bit-mask of all visible elements categories, including layers		* Set the bit-mask of all visible elements categories,
			* including enabled layers
	*/		*/
	void SetVisibleAlls();		void SetVisibleAlls();

	@@ -177,9 +171,13 @@ public:
	* @param aNewLayerCount = The new number of enabled copper layers		* @param aNewLayerCount = The new number of enabled copper layers
	*/		*/
	void SetCopperLayerCount( int aNewLayerCount );		void SetCopperLayerCount( int aNewLayerCount );
	};


	#endif		private:
			int m_CopperLayerCount; ///< Number of copper layers for this design
			int m_EnabledLayers; ///< Bit-mask for layer enabling
			int m_VisibleLayers; ///< Bit-mask for layer visibility
			int m_VisibleElements; ///< Bit-mask for element category visibility
			};

	// _BOARD_DESIGN_SETTING_H		#endif // BOARD_DESIGN_SETTINGS_H_

include/wxBasePcbFrame.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@
	#include <richio.h>		#include <richio.h>
	#include <class_pcb_screen.h>		#include <class_pcb_screen.h>


	#ifndef PCB_INTERNAL_UNIT		#ifndef PCB_INTERNAL_UNIT
	#define PCB_INTERNAL_UNIT 10000		#define PCB_INTERNAL_UNIT 10000
	#endif		#endif
	@@ -56,6 +57,7 @@ class EDA_3D_FRAME;
	class GENERAL_COLLECTOR;		class GENERAL_COLLECTOR;
	class GENERAL_COLLECTORS_GUIDE;		class GENERAL_COLLECTORS_GUIDE;
	class BOARD_DESIGN_SETTINGS;		class BOARD_DESIGN_SETTINGS;
			class ZONE_SETTINGS;

	/**		/**
	* class PCB_BASE_FRAME		* class PCB_BASE_FRAME
	@@ -130,6 +132,9 @@ public:
	virtual BOARD_DESIGN_SETTINGS& GetDesignSettings() const;		virtual BOARD_DESIGN_SETTINGS& GetDesignSettings() const;
	virtual void SetDesignSettings( const BOARD_DESIGN_SETTINGS& aSettings );		virtual void SetDesignSettings( const BOARD_DESIGN_SETTINGS& aSettings );

			const ZONE_SETTINGS& GetZoneSettings() const;
			void SetZoneSettings( const ZONE_SETTINGS& aSettings );

	/**		/**
	* Function SetBoard		* Function SetBoard
	* sets the m_Pcb member in such as way as to ensure deleting any previous		* sets the m_Pcb member in such as way as to ensure deleting any previous

Admin message