support cloud

3 files changed, 104 insertions, 3 deletions

diff --git a/dev/demo/cloud.tex b/dev/demo/cloud.tex
new file mode 100644
index 0000000..0b44bf6
--- /dev/null
+++ b/dev/demo/cloud.tex
@@ -0,0 +1,3 @@
+\begin{tikzpicture}
+  \pie[cloud]{10/A, 20/B, 30/C, 40/D}
+\end{tikzpicture}
\ No newline at end of file
diff --git a/dev/pgf-pie-manual.tex b/dev/pgf-pie-manual.tex
index 77a87f1..955334d 100644
--- a/dev/pgf-pie-manual.tex
+++ b/dev/pgf-pie-manual.tex
@@ -102,6 +102,10 @@ the center of the circle.
 
 \demo[0.6]{square}
 
+\subsubsection{Cloud}
+
+\demo[0.6]{cloud}
+
 \subsection{Position, Rotation, Size}
 
 The center of chart can be set by \texttt{pos}, default is
diff --git a/dev/pgf-pie.sty b/dev/pgf-pie.sty
index 1651e6f..549b521 100644
--- a/dev/pgf-pie.sty
+++ b/dev/pgf-pie.sty
@@ -75,9 +75,28 @@ chart by using PGF/Tikz package.]
 % #2: size
 % #3: number
 % #4: color
-\newcommand{\pgfpie@square}[4]
+% #5: style
+\newcommand{\pgfpie@square}[5]
 {
-  \draw[fill=#4] (#1) rectangle node {#3} ++(#2);
+  \draw[fill=#4, #5] (#1) rectangle node {#3} ++(#2);
+}
+
+% #1: pos
+% #2: radius
+% #3: number
+% #4: color
+% $5: style
+% $6: label
+\newcommand{\pgfpie@cloud}[6]
+{
+  \draw[fill=#4, #5] (#1) circle[radius=#2];
+  \ifthenelse{\equal{\text}{inside}}
+  {
+    \node at (#1) {\shortstack{#6 \\ #3}};
+  }
+  {
+    \node at (#1) {#3};
+  }
 }
 
 \newcounter{pgfpie@angleBegin}
@@ -124,6 +143,9 @@ chart by using PGF/Tikz package.]
 \newif\ifsquare
 \pgfkeys{/square/.is if=square}
 
+\newif\ifcloud
+\pgfkeys{/cloud/.is if=cloud}
+
 \newcommand{\pie}[2][]
 {
   % load default parameters
@@ -136,15 +158,22 @@ chart by using PGF/Tikz package.]
     pos={0,0},
     style={thick},
     before number=,
-    after number=\%,
+    after number=,
     text=label,
     sum=100,
     rotate=0,
     polar=false,
     square=false,
+    cloud=false,
   }
   % load user's parameters
   \pgfkeys{#1}
+  % add percentage automatically
+  \ifthenelse{\equal{\sum}{100}}
+  {
+    \pgfkeys{after number=\%}
+    \pgfkeys{#1}
+  }{}
 
   % legend or not
   \ifthenelse{\equal{\text}{legend}}
@@ -198,6 +227,7 @@ chart by using PGF/Tikz package.]
       \pgfpie@square{start}{\horizontalLength,\height}
       {\beforenumber \p \afternumber}
       {\thecolor}
+      {\style}
       \iflegend
       \else
       %label
@@ -216,6 +246,7 @@ chart by using PGF/Tikz package.]
       \pgfpie@square{start}{\width,\verticalLength}
       {\beforenumber \p \afternumber}
       {\thecolor}
+      {\style}
       \iflegend
       \else
       %label
@@ -231,6 +262,68 @@ chart by using PGF/Tikz package.]
   
   %%%%%%%%%% SQUARE PIE END %%%%%%%%%%%
   \else
+  \ifcloud
+  %%%%%%%%%% CLOUD PIE BGEIN %%%%%%%%%%%
+  \xdef\cloudGap{0.1}
+  % drawing loop
+  \foreach \p/\t [count=\i from 0] in {#2}
+  {
+    \pgfmathparse{sqrt(\p / \sum) * \radius}
+    \let\cloudR\pgfmathresult
+    \ifnum \i = 0
+    % first cloud
+    \coordinate (O) at (\pos);
+    \xdef\cloudRone{\cloudR}
+    \xdef\cloudExtendDir{180+\rotate}
+    \else
+    \ifnum \i = 1
+    % second cloud
+    \xdef\cloudRtwo{\cloudR}
+    \xdef\cloudExtendDir{45+\rotate}
+    \path (O) -- ++(\cloudExtendDir:\cloudRone+\cloudGap+\cloudRtwo) coordinate (O);
+    \else
+    % next cloud
+    \pgfmathparse{\cloudRone+\cloudGap+\cloudRtwo}
+    \let\la\pgfmathresult
+    \pgfmathparse{\cloudRone+\cloudGap+\cloudR}
+    \let\lb\pgfmathresult
+    \pgfmathparse{\cloudRtwo+\cloudGap+\cloudR}
+    \let\lc\pgfmathresult
+    \pgfmathparse{\la^2+\lc^2-\lb^2}
+    \let\tmp\pgfmathresult
+    \pgfmathparse{180 - acos(\tmp / 2 / \la / \lc)}
+    \let\cloudRot\pgfmathresult
+    \ifodd \i
+    \pgfmathparse{-\cloudRot}
+    \let\cloudRot\pgfmathresult
+    \fi
+    \pgfmathparse{\cloudExtendDir - \cloudRot}
+    \xdef\cloudExtendDir{\pgfmathresult}
+    \path (O) -- ++(\cloudExtendDir:\lc) coordinate (O);
+    \xdef\cloudRone{\cloudRtwo}
+    \xdef\cloudRtwo{\cloudR}
+    \fi
+    \fi
+
+    % find color
+    \pgfpie@findColor{\i}
+
+    \pgfpie@cloud{O}{\cloudR}{\beforenumber \p \afternumber}
+    {\thecolor}{\style}{\t}
+
+    % label
+    \iflegend
+    \else
+    \ifthenelse{\equal{\text}{inside}}
+    {}
+    {
+      \path (O) -- ++(\cloudExtendDir:\cloudR)
+      node[inner sep=0, \text=\cloudExtendDir:\t] {};
+    }
+    \fi
+  }
+  %%%%%%%%%% CLOUD PIE BGEIN %%%%%%%%%%%
+  \else
   %%%%%%%%%% CIRCLE PIE BGEIN %%%%%%%%%%%
   \ifpolar
   \xdef\maxValue{0}
@@ -286,6 +379,7 @@ chart by using PGF/Tikz package.]
   }
   %%%%%%%%%% CIRCLE PIE END %%%%%%%%%%%
   \fi
+  \fi
 
   % legend
   \iflegend