Skip to content

S
sdkjs
Commit b1e1d834 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin
Browse files
Options

Аспекты для автофигур 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65237 954022d7-b5bf-4e40-9824-e11837661b57
parent ee95bde3
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 30 deletions
Common/Drawings/States.js
View file @ b1e1d834
......@@ -66,24 +66,22 @@ StartAddNewShape.prototype =
if(!this.bMoved && this instanceof StartAddNewShape)
{
var ext_x, ext_y;
if(typeof SHAPE_EXT[this.preset] === "number")
{
ext_x = SHAPE_EXT[this.preset];
}
else
{
ext_x = 25.4;
}
if(typeof SHAPE_ASPECTS[this.preset] === "number")
{
var _aspect = SHAPE_ASPECTS[this.preset];
if(_aspect >= 1)
{
ext_y = 25.4;
ext_x = ext_y*_aspect;
}
else
{
ext_x = 25.4;
ext_y = ext_x/_aspect;
}
ext_y = ext_x/_aspect;
}
else
{
ext_x = 25.4;
ext_y = 25.4;
ext_y = ext_x;
}
this.onMouseMove({IsLocked: true}, this.startX + ext_x, this.startY + ext_y);
}
......
Common/Drawings/TrackObjects/ResizeTracks.js
View file @ b1e1d834
......@@ -51,12 +51,166 @@ TRANSLATE_HANDLE_FLIP_H_AND_FLIP_V[7] = 3;
var SHAPE_ASPECTS = {};
SHAPE_ASPECTS["can"] = 3616635/4810125;
SHAPE_ASPECTS["moon"] = 0.5;
SHAPE_ASPECTS["leftBracket"] = 0.08;
SHAPE_ASPECTS["rightBracket"] = 0.08;
SHAPE_ASPECTS["leftBrace"] = 0.17;
SHAPE_ASPECTS["rightBrace"] = 0.17;
//TODO:
SHAPE_ASPECTS["moon"] = 457200/914400;
SHAPE_ASPECTS["leftBracket"] = 73152/914400;
SHAPE_ASPECTS["rightBracket"] = 73152/914400;
SHAPE_ASPECTS["leftBrace"] = 155448/914400;
SHAPE_ASPECTS["rightBrace"] = 155448/914400;
SHAPE_ASPECTS["triangle"] = 1060704/914400;
SHAPE_ASPECTS["parallelogram"] = 1216152/914400;
SHAPE_ASPECTS["trapezoid"] = 914400/1216152;
SHAPE_ASPECTS["pentagon"] = 960120/914400;
SHAPE_ASPECTS["hexagon"] = 1060704/914400;
SHAPE_ASPECTS["bracePair"] = 1069848/914400;
SHAPE_ASPECTS["rightArrow"] = 978408/484632;
SHAPE_ASPECTS["leftArrow"] = 978408/484632;
SHAPE_ASPECTS["upArrow"] = 484632/978408;
SHAPE_ASPECTS["downArrow"] = 484632/978408;
SHAPE_ASPECTS["leftRightArrow"] = 1216152/484632;
SHAPE_ASPECTS["upDownArrow"] = 484632/1216152;
SHAPE_ASPECTS["bentArrow"] = 813816/868680;
SHAPE_ASPECTS["uturnArrow"] = 886968/877824;
SHAPE_ASPECTS["bentUpArrow"] = 850392/731520;
SHAPE_ASPECTS["curvedRightArrow"] = 731520/1216152;
SHAPE_ASPECTS["curvedLeftArrow"] = 731520/1216152;
SHAPE_ASPECTS["curvedUpArrow"] = 1216152/731520;
SHAPE_ASPECTS["curvedDownArrow"] = 1216152/731520;
SHAPE_ASPECTS["stripedRightArrow"] = 978408/484632;
SHAPE_ASPECTS["notchedRightArrow"] = 978408/484632;
SHAPE_ASPECTS["homePlate"] = 978408/484632;
SHAPE_ASPECTS["leftRightArrowCallout"] = 1216152/576072;
SHAPE_ASPECTS["flowChartProcess"] = 914400/612648;
SHAPE_ASPECTS["flowChartAlternateProcess"] = 914400/612648;
SHAPE_ASPECTS["flowChartDecision"] = 914400/612648;
SHAPE_ASPECTS["flowChartInputOutput"] = 914400/612648;
SHAPE_ASPECTS["flowChartPredefinedProcess"] = 914400/612648;
SHAPE_ASPECTS["flowChartDocument"] = 914400/612648;
SHAPE_ASPECTS["flowChartMultidocument"] = 1060704/758952;
SHAPE_ASPECTS["flowChartTerminator"] = 914400/301752;
SHAPE_ASPECTS["flowChartPreparation"] = 1060704/612648;
SHAPE_ASPECTS["flowChartManualInput"] = 914400/457200;
SHAPE_ASPECTS["flowChartManualOperation"] = 914400/612648;
SHAPE_ASPECTS["flowChartPunchedCard"] = 914400/804672;
SHAPE_ASPECTS["flowChartPunchedTape"] = 914400/804672;
SHAPE_ASPECTS["flowChartPunchedTape"] = 457200/914400;
SHAPE_ASPECTS["flowChartSort"] = 457200/914400;
SHAPE_ASPECTS["flowChartOnlineStorage"] = 914400/612648;
SHAPE_ASPECTS["flowChartMagneticDisk"] = 914400/612648;
SHAPE_ASPECTS["flowChartMagneticDrum"] = 914400/685800;
SHAPE_ASPECTS["flowChartDisplay"] = 914400/612648;
SHAPE_ASPECTS["ribbon2"] = 1216152/612648;
SHAPE_ASPECTS["ribbon"] = 1216152/612648;
SHAPE_ASPECTS["ellipseRibbon2"] = 1216152/758952;
SHAPE_ASPECTS["ellipseRibbon"] = 1216152/758952;
SHAPE_ASPECTS["verticalScroll"] = 1033272/1143000;
SHAPE_ASPECTS["horizontalScroll"] = 1143000/1033272;
SHAPE_ASPECTS["wedgeRectCallout"] = 914400/612648;
SHAPE_ASPECTS["wedgeRoundRectCallout"] = 914400/612648;
SHAPE_ASPECTS["wedgeEllipseCallout"] = 914400/612648;
SHAPE_ASPECTS["cloudCallout"] = 914400/612648;
SHAPE_ASPECTS["borderCallout1"] = 914400/612648;
SHAPE_ASPECTS["borderCallout2"] = 914400/612648;
SHAPE_ASPECTS["borderCallout3"] = 914400/612648;
SHAPE_ASPECTS["accentCallout1"] = 914400/612648;
SHAPE_ASPECTS["accentCallout2"] = 914400/612648;
SHAPE_ASPECTS["accentCallout3"] = 914400/612648;
SHAPE_ASPECTS["callout1"] = 914400/612648;
SHAPE_ASPECTS["callout2"] = 914400/612648;
SHAPE_ASPECTS["callout3"] = 914400/612648;
SHAPE_ASPECTS["accentBorderCallout1"] = 914400/612648;
SHAPE_ASPECTS["accentBorderCallout2"] = 914400/612648;
SHAPE_ASPECTS["accentBorderCallout3"] = 914400/612648;
var SHAPE_EXT = {};
SHAPE_EXT["can"] = 3616635/36000;
SHAPE_EXT["moon"] = 457200/36000;
SHAPE_EXT["leftBracket"] = 73152/36000;
SHAPE_EXT["rightBracket"] = 73152/36000;
SHAPE_EXT["leftBrace"] = 155448/36000;
SHAPE_EXT["rightBrace"] = 155448/36000;
SHAPE_EXT["triangle"] = 1060704/36000;
SHAPE_EXT["parallelogram"] = 1216152/36000;
SHAPE_EXT["trapezoid"] = 914400/36000;
SHAPE_EXT["pentagon"] = 960120/36000;
SHAPE_EXT["hexagon"] = 1060704/36000;
SHAPE_EXT["bracePair"] = 1069848/36000;
SHAPE_EXT["rightArrow"] = 978408/36000;
SHAPE_EXT["leftArrow"] = 978408/36000;
SHAPE_EXT["upArrow"] = 484632/36000;
SHAPE_EXT["downArrow"] = 484632/36000;
SHAPE_EXT["leftRightArrow"] = 1216152/36000;
SHAPE_EXT["upDownArrow"] = 484632/36000;
SHAPE_EXT["bentArrow"] = 813816/36000;
SHAPE_EXT["uturnArrow"] = 886968/36000;
SHAPE_EXT["bentUpArrow"] = 850392/36000;
SHAPE_EXT["curvedRightArrow"] = 731520/36000;
SHAPE_EXT["curvedLeftArrow"] = 731520/36000;
SHAPE_EXT["curvedUpArrow"] = 1216152/36000;
SHAPE_EXT["curvedDownArrow"] = 1216152/36000;
SHAPE_EXT["stripedRightArrow"] = 978408/36000;
SHAPE_EXT["notchedRightArrow"] = 978408/36000;
SHAPE_EXT["homePlate"] = 978408/36000;
SHAPE_EXT["leftRightArrowCallout"] = 1216152/36000;
SHAPE_EXT["flowChartProcess"] = 914400/36000;
SHAPE_EXT["flowChartAlternateProcess"] = 914400/36000;
SHAPE_EXT["flowChartDecision"] = 914400/36000;
SHAPE_EXT["flowChartInputOutput"] = 914400/36000;
SHAPE_EXT["flowChartPredefinedProcess"] = 914400/36000;
SHAPE_EXT["flowChartDocument"] = 914400/36000;
SHAPE_EXT["flowChartMultidocument"] = 1060704/36000;
SHAPE_EXT["flowChartTerminator"] = 914400/36000;
SHAPE_EXT["flowChartPreparation"] = 1060704/36000;
SHAPE_EXT["flowChartManualInput"] = 914400/36000;
SHAPE_EXT["flowChartManualOperation"] = 914400/36000;
SHAPE_EXT["flowChartPunchedCard"] = 914400/36000;
SHAPE_EXT["flowChartPunchedTape"] = 914400/36000;
SHAPE_EXT["flowChartPunchedTape"] = 457200/36000;
SHAPE_EXT["flowChartSort"] = 457200/36000;
SHAPE_EXT["flowChartOnlineStorage"] = 914400/36000;
SHAPE_EXT["flowChartMagneticDisk"] = 914400/36000;
SHAPE_EXT["flowChartMagneticDrum"] = 914400/36000;
SHAPE_EXT["flowChartDisplay"] = 914400/36000;
SHAPE_EXT["ribbon2"] = 1216152/36000;
SHAPE_EXT["ribbon"] = 1216152/36000;
SHAPE_EXT["ellipseRibbon2"] = 1216152/36000;
SHAPE_EXT["ellipseRibbon"] = 1216152/36000;
SHAPE_EXT["verticalScroll"] = 1033272/36000;
SHAPE_EXT["horizontalScroll"] = 1143000/36000;
SHAPE_EXT["wedgeRectCallout"] = 914400/36000;
SHAPE_EXT["wedgeRoundRectCallout"] = 914400/36000;
SHAPE_EXT["wedgeEllipseCallout"] = 914400/36000;
SHAPE_EXT["cloudCallout"] = 914400/36000;
SHAPE_EXT["borderCallout1"] = 914400/36000;
SHAPE_EXT["borderCallout2"] = 914400/36000;
SHAPE_EXT["borderCallout3"] = 914400/36000;
SHAPE_EXT["accentCallout1"] = 914400/36000;
SHAPE_EXT["accentCallout2"] = 914400/36000;
SHAPE_EXT["accentCallout3"] = 914400/36000;
SHAPE_EXT["callout1"] = 914400/36000;
SHAPE_EXT["callout2"] = 914400/36000;
SHAPE_EXT["callout3"] = 914400/36000;
SHAPE_EXT["accentBorderCallout1"] = 914400/36000;
SHAPE_EXT["accentBorderCallout2"] = 914400/36000;
SHAPE_EXT["accentBorderCallout3"] = 914400/36000;
SHAPE_EXT["cube"] = 1216152/36000;
SHAPE_EXT["bevel"] = 1042416/36000;
SHAPE_EXT["quadArrow"] = 1216152/36000;
SHAPE_EXT["leftUpArrow"] = 850392/36000;
SHAPE_EXT["chevron"] = 484632/36000;
SHAPE_EXT["quadArrowCallout"] = 1216152/36000;
SHAPE_EXT["circularArrow"] = 978408/36000;
SHAPE_EXT["flowChartInternalStorage"] = 612648/36000;
SHAPE_EXT["flowChartConnector"] = 457200/36000;
SHAPE_EXT["flowChartOffpageConnector"] = 612648/36000;
SHAPE_EXT["flowChartSummingJunction"] = 612648/36000;
SHAPE_EXT["flowChartOr"] = 612648/36000;
SHAPE_EXT["flowChartExtract"] = 685800/36000;
SHAPE_EXT["flowChartMerge"] = 685800/36000;
SHAPE_EXT["flowChartDelay"] = 612648/36000;
SHAPE_EXT["flowChartMagneticTape"] = 612648/36000;
SHAPE_EXT["actionButtonHome"] = 1042416/36000;
var MIN_SHAPE_SIZE = 1.27;//размер меньше которого нельзя уменшить автофигуру или картинку по горизонтали или вертикали
var MIN_SHAPE_SIZE_DIV2 = MIN_SHAPE_SIZE/2.0;
......
Word/Editor/GraphicObjects/DrawingStates.js
View file @ b1e1d834
......@@ -69,24 +69,22 @@ StartAddNewShape.prototype =
if(!this.bMoved && this instanceof StartAddNewShape)
{
var ext_x, ext_y;
if(typeof SHAPE_EXT[this.preset] === "number")
{
ext_x = SHAPE_EXT[this.preset];
}
else
{
ext_x = 25.4;
}
if(typeof SHAPE_ASPECTS[this.preset] === "number")
{
var _aspect = SHAPE_ASPECTS[this.preset];
if(_aspect >= 1)
{
ext_y = 25.4;
ext_x = ext_y*_aspect;
}
else
{
ext_x = 25.4;
ext_y = ext_x/_aspect;
}
ext_y = ext_x/_aspect;
}
else
{
ext_x = 25.4;
ext_y = 25.4;
ext_y = ext_x;
}
this.onMouseMove({IsLocked: true}, this.startX + ext_x, this.startY + ext_y, this.pageIndex);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7