lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-28 10:51:55 +02:00
parent b2576305c1
commit c5a68d2462
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/core/class/commonstickergenerator.class.php
View File

@ -218,26 +218,26 @@ abstract class CommonStickerGenerator
$pdf->SetDrawColor(0,0,0); $pdf->SetDrawColor(0,0,0);
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/** /**
* protected Convert units (in to mm, mm to in) * protected Convert units (in to mm, mm to in)
* $src and $dest must be 'in' or 'mm' * $src and $dest must be 'in' or 'mm'
* *
* @param int $value value * @param int $value value
* @param string $src from * @param string $src from ('in' or 'mm')
* @param string $dest to * @param string $dest to ('in' or 'mm')
* @return float value value after conversion * @return float value value after conversion
*/ */
function _Convert_Metric($value, $src, $dest) private function convertMetric($value, $src, $dest)
{ {
// phpcs:enable
if ($src != $dest) { if ($src != $dest) {
$tab['in'] = 39.37008; $tab = array(
$tab['mm'] = 1000; 'in'=>39.37008,
'mm'=>1000
);
return $value * $tab[$dest] / $tab[$src]; return $value * $tab[$dest] / $tab[$src];
} else {
return $value;
} }
return $value;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@ -273,14 +273,14 @@ abstract class CommonStickerGenerator
$this->_Metric = $format['metric']; $this->_Metric = $format['metric'];
$this->_Avery_Name = $format['name']; $this->_Avery_Name = $format['name'];
$this->_Avery_Code = $format['code']; $this->_Avery_Code = $format['code'];
$this->_Margin_Left = $this->_Convert_Metric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc); $this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
$this->_Margin_Top = $this->_Convert_Metric($format['marginTop'], $this->_Metric, $this->_Metric_Doc); $this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
$this->_X_Space = $this->_Convert_Metric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc); $this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
$this->_Y_Space = $this->_Convert_Metric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc); $this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
$this->_X_Number = $format['NX']; $this->_X_Number = $format['NX'];
$this->_Y_Number = $format['NY']; $this->_Y_Number = $format['NY'];
$this->_Width = $this->_Convert_Metric($format['width'], $this->_Metric, $this->_Metric_Doc); $this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
$this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc); $this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
$this->Set_Char_Size($pdf, $format['font-size']); $this->Set_Char_Size($pdf, $format['font-size']);
} }
} }