electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FreeCAD:master' into patch-5

Browse Source
This commit is contained in:
mosfet80
2023-06-30 08:04:30 +02:00
committed by GitHub
parent c82a0f79c7 35cedd6270
commit af2253f16e
185 changed files with 9655 additions and 5220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/sub_buildWindows.yml
+1 -1
View File
@@ -118,7 +118,7 @@ jobs:
-DFREECAD_COPY_LIBPACK_BIN_TO_BUILD=OFF
-DFREECAD_COPY_PLUGINS_BIN_TO_BUILD=ON
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v1.3
- name: Compiling sources
run: |
cd $env:builddir
cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
+1 -1
View File
@@ -54,7 +54,7 @@ macro(InitializeFreeCADBuildOptions)
endif()
else()
message("Libpack NOT found.\nIf you intend to use a Windows libpack, set the FREECAD_LIBPACK_DIR to the libpack directory.")
message(STATUS "Visit: https://github.com/apeltauer/FreeCAD/releases/ for Windows libpack downloads.")
message(STATUS "Visit: https://github.com/FreeCAD/FreeCAD-Libpack/releases/ for Windows libpack downloads.")
endif()
else(MSVC)
option(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." OFF)
src/Doc/CONTRIBUTORS
+1
View File
@@ -50,6 +50,7 @@ Eric Trombly (etrombly)
Ettore Atalan
fandaL
flachyjoe
Francesco Conti (Pesc0)
Федір
Gabriel Wicke (gwicke)
George Shuklin
src/Gui/Action.cpp
+7 -6
View File
@@ -1051,15 +1051,16 @@ void RecentMacrosAction::setFiles(const QStringList& files)
if (!existingCommands.isEmpty()) {
auto msgMain = QStringLiteral("Recent macros : keyboard shortcut(s)");
for (int index = 0; index < accel_col.count(); index++) {
msgMain = msgMain + QStringLiteral(" %1").arg(accel_col[index]);
msgMain += QStringLiteral(" %1").arg(accel_col[index]);
}
msgMain = msgMain + QStringLiteral(" disabled because of conflicts with");
msgMain += QStringLiteral(" disabled because of conflicts with");
for (int index = 0; index < existingCommands.count(); index++) {
msgMain = msgMain + QStringLiteral(" %1").arg(existingCommands[index]);
msgMain += QStringLiteral(" %1").arg(existingCommands[index]);
}
msgMain = msgMain + QStringLiteral(" respectively.\nHint: In Preferences -> Macros -> Recent Macros -> Keyboard Modifiers"
" this should be Ctrl+Shift+ by default, if this is now blank then you should revert"
" it back to Ctrl+Shift+ by pressing both keys at the same time.");
msgMain += QStringLiteral(" respectively.\nHint: In Preferences -> Python -> Macro ->"
" Recent Macros menu -> Keyboard Modifiers this should be Ctrl+Shift+"
" by default, if this is now blank then you should revert it back to"
" Ctrl+Shift+ by pressing both keys at the same time.");
Base::Console().Warning("%s\n", qPrintable(msgMain));
}
}
src/Gui/Language/FreeCAD_be.ts
+1 -1
View File
@@ -4731,7 +4731,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Асноўны колер для ўсіх элементаў</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_de.ts
+1 -1
View File
@@ -4732,7 +4732,7 @@ Sie können auch das Formular verwenden: John Doe &lt;[email protected]&gt;</translat
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Grundfarbe für alle Elemente</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_es-AR.ts
+2 -2
View File
@@ -4740,7 +4740,7 @@ También puede utilizar el formulario: John Doe &lt;[email protected]&gt;</translatio
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Color base para todos los elementos</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
@@ -8042,7 +8042,7 @@ Do you want to specify another directory?</source>
<message>
<location filename="../Tree.cpp" line="911"/>
<source>Show an extra tree view column for item description. The item's description can be set by pressing F2 (or your OS's edit button) or by editing the 'label2' property.</source>
<translation>Mostrar una columna extra de vista de árbol para la descripción del elemento. La descripción del elemento se puede establecer pulsando F2 (o el botón de edición de tu sistema operativo) o editando la propiedad 'label2'.</translation>
<translation>Muestra una columna extra de vista de árbol para la descripción del artículo. La descripción del elemento se puede establecer pulsando F2 (o el botón de edición de tu sistema operativo) o editando la propiedad 'label2'.</translation>
</message>
<message>
<location filename="../Tree.cpp" line="952"/>
src/Gui/Language/FreeCAD_es-ES.ts
+1 -1
View File
@@ -4742,7 +4742,7 @@ También puede utilizar el formulario: John Doe &lt;[email protected]&gt;</translatio
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Color base para todos los elementos</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_eu.ts
+1 -1
View File
@@ -4748,7 +4748,7 @@ Honako forma ere erabili dezakezu: Jon Inor &lt;[email protected]&gt;</translation>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Elementu guztietarako oinarri-kolorea</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_fr.ts
+1 -1
View File
@@ -4738,7 +4738,7 @@ Vous pouvez également utiliser la forme : John Doe &lt;[email protected]&gt;</transl
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Couleur de base pour tous les éléments</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_hu.ts
+1 -1
View File
@@ -4744,7 +4744,7 @@ Használhatja az űrlapot is: Gipsz Jakab &lt;[email protected]&gt;</translation>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Alapszín minden elemnek</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_ja.ts
+34 -34
View File
@@ -85,7 +85,7 @@
<location filename="../CommandTest.cpp" line="718"/>
<location filename="../CommandTest.cpp" line="719"/>
<source>Run test cases to verify console messages</source>
<translation type="unfinished">Run test cases to verify console messages</translation>
<translation>コンソールメッセージを確認するためのテストケースを実行</translation>
</message>
</context>
<context>
@@ -98,7 +98,7 @@
<message>
<location filename="../CommandView.cpp" line="3303"/>
<source>Clear all visible measurements</source>
<translation type="unfinished">Clear all visible measurements</translation>
<translation>表示されているすべての測定値をクリア</translation>
</message>
</context>
<context>
@@ -111,7 +111,7 @@
<message>
<location filename="../CommandView.cpp" line="3333"/>
<source>Turn on or off the display of all measurements</source>
<translation type="unfinished">Turn on or off the display of all measurements</translation>
<translation>すべての測定値の表示をオンまたはオフにする</translation>
</message>
</context>
<context>
@@ -228,7 +228,7 @@
<location filename="../TaskView/TaskImage.cpp" line="258"/>
<location filename="../TaskView/TaskOrientation.cpp" line="65"/>
<source>Edit image</source>
<translation type="unfinished">Edit image</translation>
<translation>画像の編集</translation>
</message>
</context>
<context>
@@ -2033,12 +2033,12 @@ dot/period will always be printed.</translation>
<message>
<location filename="../DlgGeneral.ui" line="20"/>
<source>Language and number format</source>
<translation type="unfinished">Language and number format</translation>
<translation>言語と数値形式</translation>
</message>
<message>
<location filename="../DlgGeneral.ui" line="41"/>
<source>Language:</source>
<translation type="unfinished">Language:</translation>
<translation>言語:</translation>
</message>
<message>
<location filename="../DlgGeneral.ui" line="55"/>
@@ -2048,7 +2048,7 @@ dot/period will always be printed.</translation>
<message>
<location filename="../DlgGeneral.ui" line="62"/>
<source>Unit system that should be used for all parts of the application</source>
<translation type="unfinished">Unit system that should be used for all parts of the application</translation>
<translation>アプリケーションのすべての部品で使用される単位系</translation>
</message>
<message>
<location filename="../DlgGeneral.ui" line="71"/>
@@ -2073,7 +2073,7 @@ dot/period will always be printed.</translation>
<message>
<location filename="../DlgGeneral.ui" line="180"/>
<source>Substitute decimal separator</source>
<translation type="unfinished">Substitute decimal separator</translation>
<translation>小数点以下の区切り文字</translation>
</message>
<message>
<location filename="../DlgGeneral.ui" line="196"/>
@@ -2118,7 +2118,7 @@ this according to your screen size or personal taste</source>
<message>
<location filename="../DlgGeneral.ui" line="264"/>
<source>Size of recent file list:</source>
<translation type="unfinished">Size of recent file list:</translation>
<translation>最近使用したファイル一覧のサイズ:</translation>
</message>
<message>
<location filename="../DlgGeneral.ui" line="287"/>
@@ -2882,7 +2882,7 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgPreferencesImp.cpp" line="493"/>
<source>Restart required</source>
<translation type="unfinished">Restart required</translation>
<translation>再起動が必要です。</translation>
</message>
<message>
<location filename="../DlgPreferencesImp.cpp" line="494"/>
@@ -3059,12 +3059,12 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgProjectUtility.cpp" line="106"/>
<source>Failed to extract project</source>
<translation type="unfinished">Failed to extract project</translation>
<translation>プロジェクトの展開に失敗しました。</translation>
</message>
<message>
<location filename="../DlgProjectUtility.cpp" line="123"/>
<source>Failed to create project</source>
<translation type="unfinished">Failed to create project</translation>
<translation>プロジェクトの作成に失敗しました。</translation>
</message>
</context>
<context>
@@ -6963,7 +6963,7 @@ How do you want to proceed?</source>
<message>
<location filename="../ManualAlignment.cpp" line="1262"/>
<source>&amp;Align</source>
<translation type="unfinished">&amp;Align</translation>
<translation>整列(&amp;A)</translation>
</message>
<message>
<location filename="../ManualAlignment.cpp" line="1263"/>
@@ -8823,12 +8823,12 @@ Do you want to continue?</source>
<location filename="../NotificationArea.cpp" line="553"/>
<location filename="../NotificationArea.cpp" line="1022"/>
<source>Message</source>
<translation type="unfinished">Message</translation>
<translation>メッセージ</translation>
</message>
<message>
<location filename="../NotificationArea.cpp" line="963"/>
<source>Notifier: </source>
<translation type="unfinished">Notifier: </translation>
<translation>通知: </translation>
</message>
<message>
<location filename="../NotificationArea.cpp" line="965"/>
@@ -9386,7 +9386,7 @@ the current copy will be lost.
<message>
<location filename="../ViewProviderImagePlane.cpp" line="147"/>
<source>Change image...</source>
<translation type="unfinished">Change image...</translation>
<translation>画像を変更...</translation>
</message>
<message>
<location filename="../SoFCColorGradient.cpp" line="89"/>
@@ -11824,7 +11824,7 @@ the current copy will be lost.
<message>
<location filename="../CommandView.cpp" line="1811"/>
<source>Save image...</source>
<translation type="unfinished">Save image...</translation>
<translation>画像を保存...</translation>
</message>
<message>
<location filename="../CommandView.cpp" line="1812"/>
@@ -12083,7 +12083,7 @@ Do you still want to proceed?</source>
<message>
<location filename="../Workbench.cpp" line="531"/>
<source>Clipboard</source>
<translation type="unfinished">Clipboard</translation>
<translation>クリップボード</translation>
</message>
<message>
<location filename="../Workbench.cpp" line="532"/>
@@ -12200,7 +12200,7 @@ Do you still want to proceed?</source>
<location filename="../DlgSettingsNotificationArea.ui" line="14"/>
<location filename="../DlgSettingsNotificationArea.cpp" line="57"/>
<source>Notification Area</source>
<translation type="unfinished">Notification Area</translation>
<translation>通知領域</translation>
</message>
<message>
<location filename="../DlgSettingsNotificationArea.ui" line="20"/>
@@ -12240,7 +12240,7 @@ Do you still want to proceed?</source>
<message>
<location filename="../DlgSettingsNotificationArea.ui" line="76"/>
<source>Debug errors</source>
<translation type="unfinished">Debug errors</translation>
<translation>デバッグエラー</translation>
</message>
<message>
<location filename="../DlgSettingsNotificationArea.ui" line="92"/>
@@ -12486,27 +12486,27 @@ after FreeCAD launches</source>
<message>
<location filename="../TaskView/TaskImage.ui" line="103"/>
<source>X distance:</source>
<translation type="unfinished">X distance:</translation>
<translation>X 距離:</translation>
</message>
<message>
<location filename="../TaskView/TaskImage.ui" line="123"/>
<source>Y distance:</source>
<translation type="unfinished">Y distance:</translation>
<translation>Y 距離:</translation>
</message>
<message>
<location filename="../TaskView/TaskImage.ui" line="143"/>
<source>Rotation :</source>
<translation type="unfinished">Rotation :</translation>
<translation>回転 :</translation>
</message>
<message>
<location filename="../TaskView/TaskImage.ui" line="159"/>
<source>Transparency :</source>
<translation type="unfinished">Transparency :</translation>
<translation>透明度 :</translation>
</message>
<message>
<location filename="../TaskView/TaskImage.ui" line="191"/>
<source>Image size</source>
<translation type="unfinished">Image size</translation>
<translation>画像サイズ</translation>
</message>
<message>
<location filename="../TaskView/TaskImage.ui" line="197"/>
@@ -12521,7 +12521,7 @@ after FreeCAD launches</source>
<message>
<location filename="../TaskView/TaskImage.ui" line="237"/>
<source>Keep aspect ratio</source>
<translation type="unfinished">Keep aspect ratio</translation>
<translation>アスペクト比を維持</translation>
</message>
<message>
<location filename="../TaskView/TaskImage.ui" line="247"/>
@@ -12569,7 +12569,7 @@ after FreeCAD launches</source>
<message>
<location filename="../DlgSettingsWorkbenchesImp.cpp" line="127"/>
<source>Auto-load</source>
<translation type="unfinished">Auto-load</translation>
<translation>自動読み込み</translation>
</message>
<message>
<location filename="../DlgSettingsWorkbenchesImp.cpp" line="128"/>
@@ -12625,12 +12625,12 @@ after FreeCAD launches</source>
<message>
<location filename="../NotificationArea.cpp" line="585"/>
<source>Delete user notifications</source>
<translation type="unfinished">Delete user notifications</translation>
<translation>ユーザー通知を削除</translation>
</message>
<message>
<location filename="../NotificationArea.cpp" line="592"/>
<source>Delete All</source>
<translation type="unfinished">Delete All</translation>
<translation>すべて削除</translation>
</message>
</context>
<context>
@@ -12638,12 +12638,12 @@ after FreeCAD launches</source>
<message>
<location filename="../NotificationArea.cpp" line="861"/>
<source>Delete user notifications</source>
<translation type="unfinished">Delete user notifications</translation>
<translation>ユーザー通知を削除</translation>
</message>
<message>
<location filename="../NotificationArea.cpp" line="871"/>
<source>Delete All</source>
<translation type="unfinished">Delete All</translation>
<translation>すべて削除</translation>
</message>
</context>
<context>
@@ -12661,7 +12661,7 @@ after FreeCAD launches</source>
<message>
<location filename="../ImageView.cpp" line="182"/>
<source>Fit to window</source>
<translation type="unfinished">Fit to window</translation>
<translation>ウィンドウに合わせる</translation>
</message>
<message>
<location filename="../ImageView.cpp" line="187"/>
@@ -12679,13 +12679,13 @@ after FreeCAD launches</source>
<message>
<location filename="../CommandView.cpp" line="1982"/>
<source>Load image...</source>
<translation type="unfinished">Load image...</translation>
<translation>画像を読み込み...</translation>
</message>
<message>
<location filename="../CommandView.cpp" line="1983"/>
<location filename="../CommandView.cpp" line="1985"/>
<source>Loads an image</source>
<translation type="unfinished">Loads an image</translation>
<translation>画像を読み込み</translation>
</message>
</context>
<context>
src/Gui/Language/FreeCAD_ka.ts
+1 -1
View File
@@ -4737,7 +4737,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>ყველა ელემენტის ძირითადი ფერი</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_nl.ts
+1 -1
View File
@@ -4747,7 +4747,7 @@ U kunt ook het formulier gebruiken: John Doe &lt;[email protected]&gt;</translation>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Basiskleur voor alle elementen</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_pl.ts
+2 -2
View File
@@ -4746,7 +4746,7 @@ Możesz również skorzystać z formatki: John Doe &lt;[email protected]&gt;</transla
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Podstawowy kolor dla wszystkich elementów</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
@@ -12729,7 +12729,7 @@ po uruchomieniu FreeCAD</translation>
<message>
<location filename="../NaviCube.cpp" line="1092"/>
<source>Movable navigation cube</source>
<translation>Ruchoma Kostka nawigacyjna</translation>
<translation>Ruchoma kostka nawigacyjna</translation>
</message>
<message>
<location filename="../NaviCube.cpp" line="1093"/>
src/Gui/Language/FreeCAD_ru.ts
+1 -1
View File
@@ -4737,7 +4737,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Основной цвет для всех элементов</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_sl.ts
+1 -1
View File
@@ -4750,7 +4750,7 @@ Lahko uporabite tudi obliko: Neznanec &lt;[email protected]&gt;</translation>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Osnovna barva vseh predmetov</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_sr-CS.ts
+1 -1
View File
@@ -4744,7 +4744,7 @@ Takođe možete koristiti obrazac: Pera Perić &lt;[email protected]&gt;</translati
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Osnovna boja za sve elemente</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_sr.ts
+1 -1
View File
@@ -4744,7 +4744,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Основна боја за све елементе</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
src/Gui/Language/FreeCAD_uk.ts
+37 -40
View File
@@ -34,7 +34,7 @@
<message>
<location filename="../ViewProviderOrigin.cpp" line="55"/>
<source>The displayed size of the origin</source>
<translation>Відображається розмір оригінала</translation>
<translation>Розмір початку координат, що відображується на екрані</translation>
</message>
<message>
<location filename="../ViewProviderOriginFeature.cpp" line="51"/>
@@ -79,7 +79,7 @@
<message>
<location filename="../CommandTest.cpp" line="717"/>
<source>Test console output</source>
<translation>Вивід тестової консолі</translation>
<translation>Тест виводу консолі</translation>
</message>
<message>
<location filename="../CommandTest.cpp" line="718"/>
@@ -334,7 +334,7 @@
<message>
<location filename="../DlgCustomizeSpNavSettings.ui" line="72"/>
<source>Enable Translations</source>
<translation>Ввімкнути переміщення</translation>
<translation>Ввімкнути перетворення</translation>
</message>
<message>
<location filename="../DlgCustomizeSpNavSettings.ui" line="82"/>
@@ -443,7 +443,7 @@
<message>
<location filename="../Application.h" line="264"/>
<source>Cutting</source>
<translation>Перерізання</translation>
<translation>Переріз</translation>
</message>
<message>
<location filename="../Application.h" line="265"/>
@@ -622,7 +622,7 @@ while doing a left or right click and move the mouse up or down</source>
<message>
<location filename="../WidgetFactory.cpp" line="369"/>
<source>&amp;Cancel</source>
<translation>&amp;Скасування</translation>
<translation>&amp;Скасувати</translation>
</message>
</context>
<context>
@@ -687,7 +687,7 @@ while doing a left or right click and move the mouse up or down</source>
<message>
<location filename="../AboutApplication.ui" line="177"/>
<source>Word size</source>
<translation>Розмір слова</translation>
<translation>Розрядність</translation>
</message>
<message>
<location filename="../AboutApplication.ui" line="225"/>
@@ -1277,30 +1277,27 @@ If this is not ticked, then the property must be uniquely named, and it is acces
<message>
<location filename="../DlgKeyboard.ui" line="119"/>
<source>&amp;New shortcut:</source>
<translation>&amp;Новий ярлик:</translation>
<translation>&amp;Нова комбінація клавіш:</translation>
</message>
<message>
<location filename="../DlgKeyboard.ui" line="137"/>
<source>Multi-key sequence delay: </source>
<translation type="unfinished">Multi-key sequence delay: </translation>
<translation>Затримка послідовності з мультиклавішами: </translation>
</message>
<message>
<location filename="../DlgKeyboard.ui" line="156"/>
<source>Time in milliseconds to wait for the next key stroke of the current key sequence.
For example, pressing 'F' twice in less than the time delay setting here will be
be treated as shorctcut key sequence 'F, F'.</source>
<translation type="unfinished">Time in milliseconds to wait for the next key stroke of the current key sequence.
For example, pressing 'F' twice in less than the time delay setting here will be
be treated as shorctcut key sequence 'F, F'.</translation>
<translation>Час очікування в мілісекундах наступного натискання клавіші поточної послідовності клавіш.
Наприклад, натискання 'F' двічі за час, менший за встановлену тут затримку, буде розцінюватиметься як скорочена послідовність клавіш 'F, F'.</translation>
</message>
<message>
<location filename="../DlgKeyboard.ui" line="186"/>
<source>This list shows commands having the same shortcut in the priority from high
to low. If more than one command with the same shortcut are active at the
same time. The one with the highest priority will be triggered.</source>
<translation type="unfinished">This list shows commands having the same shortcut in the priority from high
to low. If more than one command with the same shortcut are active at the
same time. The one with the highest priority will be triggered.</translation>
<translation>У цьому списку показані команди, що мають однакову комбінацію клавіш з пріоритетом від високого до низького. Якщо декілька команд з однаковою комбінацією будуть активні одночасно, то спрацює та, що має найвищий пріоритет.</translation>
</message>
<message>
<location filename="../DlgKeyboard.ui" line="191"/>
@@ -1362,7 +1359,7 @@ same time. The one with the highest priority will be triggered.</translation>
<message>
<location filename="../DlgKeyboardImp.cpp" line="141"/>
<source>Type to search...</source>
<translation>Введіть для пошуку...</translation>
<translation>Введіть текст для пошуку...</translation>
</message>
<message>
<location filename="../DlgKeyboardImp.cpp" line="218"/>
@@ -2867,7 +2864,7 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgPreferencesImp.cpp" line="364"/>
<source>Clear user settings</source>
<translation>Очищення настроюань користувача</translation>
<translation>Скинути налаштування користувача</translation>
</message>
<message>
<location filename="../DlgPreferencesImp.cpp" line="365"/>
@@ -2920,7 +2917,7 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgProjectInformation.ui" line="47"/>
<source>&amp;Name:</source>
<translation>Назва:</translation>
<translation>&amp;Назва:</translation>
</message>
<message>
<location filename="../DlgProjectInformation.ui" line="73"/>
@@ -2940,27 +2937,27 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgProjectInformation.ui" line="142"/>
<source>Created &amp;by:</source>
<translation>Створено:</translation>
<translation>Створен&amp;ий:</translation>
</message>
<message>
<location filename="../DlgProjectInformation.ui" line="165"/>
<source>Creation &amp;date:</source>
<translation>Дата створення:</translation>
<translation>Дата ств&amp;орення:</translation>
</message>
<message>
<location filename="../DlgProjectInformation.ui" line="191"/>
<source>&amp;Last modified by:</source>
<translation>І останні зміни внесені:</translation>
<translation>&amp;Останні зміни внесені:</translation>
</message>
<message>
<location filename="../DlgProjectInformation.ui" line="214"/>
<source>Last &amp;modification date:</source>
<translation>Дата останньої зміни:</translation>
<translation>Дата ре&amp;дагування:</translation>
</message>
<message>
<location filename="../DlgProjectInformation.ui" line="240"/>
<source>Com&amp;pany:</source>
<translation>Компанія:</translation>
<translation>Комп&amp;анія:</translation>
</message>
<message>
<location filename="../DlgProjectInformation.ui" line="263"/>
@@ -2992,7 +2989,7 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgProjectUtility.ui" line="14"/>
<source>Project utility</source>
<translation>Утиліта проєкту</translation>
<translation>Утиліта роботи з проєктом</translation>
</message>
<message>
<location filename="../DlgProjectUtility.ui" line="22"/>
@@ -3003,13 +3000,13 @@ Specify another directory, please.</source>
<location filename="../DlgProjectUtility.ui" line="28"/>
<location filename="../DlgProjectUtility.ui" line="78"/>
<source>Source</source>
<translation>Вихідний файл</translation>
<translation>З файлу</translation>
</message>
<message>
<location filename="../DlgProjectUtility.ui" line="42"/>
<location filename="../DlgProjectUtility.ui" line="92"/>
<source>Destination</source>
<translation>Тека Призначення</translation>
<translation>У теку</translation>
</message>
<message>
<location filename="../DlgProjectUtility.ui" line="65"/>
@@ -3040,13 +3037,13 @@ Specify another directory, please.</source>
<location filename="../DlgProjectUtility.cpp" line="65"/>
<location filename="../DlgProjectUtility.cpp" line="82"/>
<source>Empty source</source>
<translation>Порожній вихідний файл</translation>
<translation>Файл не заданий</translation>
</message>
<message>
<location filename="../DlgProjectUtility.cpp" line="65"/>
<location filename="../DlgProjectUtility.cpp" line="82"/>
<source>No source is defined.</source>
<translation>Немає визначеного джерела.</translation>
<translation>Файл не заданий.</translation>
</message>
<message>
<location filename="../DlgProjectUtility.cpp" line="70"/>
@@ -3058,7 +3055,7 @@ Specify another directory, please.</source>
<location filename="../DlgProjectUtility.cpp" line="70"/>
<location filename="../DlgProjectUtility.cpp" line="86"/>
<source>No destination is defined.</source>
<translation>Не визначено теки призначення.</translation>
<translation>Тека призначення відсутня.</translation>
</message>
<message>
<location filename="../DlgProjectUtility.cpp" line="106"/>
@@ -3091,7 +3088,7 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgPropertyLink.ui" line="56"/>
<source>Sync sub-object selection</source>
<translation>Синхронізувати вибір субоб’єкту</translation>
<translation>Синхронізувати вибір підоб’єкту</translation>
</message>
<message>
<location filename="../DlgPropertyLink.ui" line="88"/>
@@ -3412,7 +3409,7 @@ in the corner -- in % of height/width of viewport</source>
<location filename="../DlgSettings3DView.ui" line="101"/>
<source>Axis cross will be shown by default at file
opening or creation</source>
<translation>Під час відкриття або створення файлу за замовчуванням буде зображатися перетин осей</translation>
<translation>Під час відкриття або створення файлу за замовчуванням буде зображено перетин осей</translation>
</message>
<message>
<location filename="../DlgSettings3DView.ui" line="105"/>
@@ -3453,7 +3450,7 @@ Changing this option requires a restart of the application.</source>
<message>
<location filename="../DlgSettings3DView.ui" line="177"/>
<source>Use OpenGL VBO (Vertex Buffer Object)</source>
<translation>Використовувати OpenGL VBO (Vertex Buffer Object)</translation>
<translation>Використати OpenGL VBO (Vertex Buffer Object)</translation>
</message>
<message>
<location filename="../DlgSettings3DView.ui" line="192"/>
@@ -3533,7 +3530,7 @@ but slower response to any scene changes.</translation>
<message>
<location filename="../DlgSettings3DView.ui" line="264"/>
<source>Line Smoothing</source>
<translation>Згладжування лінії</translation>
<translation>Згладжування ліній</translation>
</message>
<message>
<location filename="../DlgSettings3DView.ui" line="269"/>
@@ -3553,7 +3550,7 @@ but slower response to any scene changes.</translation>
<message>
<location filename="../DlgSettings3DView.ui" line="290"/>
<source>Transparent objects:</source>
<translation>Прозорі обʼєкти:</translation>
<translation>Обчислення прозорості об'єктів:</translation>
</message>
<message>
<location filename="../DlgSettings3DView.ui" line="303"/>
@@ -3628,7 +3625,7 @@ bounding box size of the 3D object that is currently displayed.</source>
<message>
<location filename="../DlgSettings3DView.ui" line="535"/>
<source>Perspective renderin&amp;g</source>
<translation>Пе&amp;рспективна візуалізація</translation>
<translation>Пе&amp;рспективна проєкція</translation>
</message>
<message>
<location filename="../DlgSettings3DView.ui" line="548"/>
@@ -3638,7 +3635,7 @@ bounding box size of the 3D object that is currently displayed.</source>
<message>
<location filename="../DlgSettings3DView.ui" line="551"/>
<source>Or&amp;thographic rendering</source>
<translation>Ор&amp;тогональна візуалізація</translation>
<translation>Ор&amp;тогональна проєкція</translation>
</message>
<message>
<source/>
@@ -4746,7 +4743,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>Базовий колір для всіх елементів</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
@@ -6996,7 +6993,7 @@ How do you want to proceed?</source>
<message>
<location filename="../ManualAlignment.cpp" line="1265"/>
<source>&amp;Cancel</source>
<translation>&amp;Скасування</translation>
<translation>&amp;Скасувати</translation>
</message>
<message>
<location filename="../ManualAlignment.cpp" line="1269"/>
@@ -11008,7 +11005,7 @@ the current copy will be lost.
<message>
<location filename="../CommandWindow.cpp" line="316"/>
<source>Tool&amp;bars</source>
<translation>Панелі інструментів</translation>
<translation>П&amp;анелі інструментів</translation>
</message>
<message>
<location filename="../CommandWindow.cpp" line="317"/>
@@ -12747,12 +12744,12 @@ after FreeCAD launches</source>
<message>
<location filename="../View3DSettings.cpp" line="533"/>
<source>FRONT</source>
<translation type="unfinished">FRONT</translation>
<translation>ПОПЕРЕДУ</translation>
</message>
<message>
<location filename="../View3DSettings.cpp" line="535"/>
<source>TOP</source>
<translation type="unfinished">TOP</translation>
<translation>ВЕРХ</translation>
</message>
<message>
<location filename="../View3DSettings.cpp" line="537"/>
src/Gui/Language/FreeCAD_zh-TW.ts
+60 -71
View File
@@ -85,7 +85,7 @@
<location filename="../CommandTest.cpp" line="718"/>
<location filename="../CommandTest.cpp" line="719"/>
<source>Run test cases to verify console messages</source>
<translation type="unfinished">Run test cases to verify console messages</translation>
<translation>請執行測試案例以驗證主控台訊息。</translation>
</message>
</context>
<context>
@@ -428,7 +428,7 @@
<message>
<location filename="../Application.h" line="255"/>
<source>The object will be edited using the mode defined internally to be the most appropriate for the object type</source>
<translation type="unfinished">The object will be edited using the mode defined internally to be the most appropriate for the object type</translation>
<translation>此物件將被使用內部定義模式來編輯，這會是最適合的物件類型。</translation>
</message>
<message>
<location filename="../Application.h" line="259"/>
@@ -438,7 +438,7 @@
<message>
<location filename="../Application.h" line="260"/>
<source>The object will have its placement editable with the Std TransformManip command</source>
<translation type="unfinished">The object will have its placement editable with the Std TransformManip command</translation>
<translation>此物件的位置將可透過 Std TransformManip 指令進行編輯</translation>
</message>
<message>
<location filename="../Application.h" line="264"/>
@@ -448,7 +448,7 @@
<message>
<location filename="../Application.h" line="265"/>
<source>This edit mode is implemented as available but currently does not seem to be used by any object</source>
<translation type="unfinished">This edit mode is implemented as available but currently does not seem to be used by any object</translation>
<translation>此編輯模式已實作為可用，但目前似乎沒有被任何物件使用</translation>
</message>
<message>
<location filename="../Application.h" line="269"/>
@@ -458,7 +458,7 @@
<message>
<location filename="../Application.h" line="270"/>
<source>The object will have the color of its individual faces editable with the Part FaceColors command</source>
<translation type="unfinished">The object will have the color of its individual faces editable with the Part FaceColors command</translation>
<translation>該物件的個別面的顏色將可透過 Part FaceColors 指令進行編輯</translation>
</message>
</context>
<context>
@@ -1958,10 +1958,7 @@ same time. The one with the highest priority will be triggered.</source>
will be substituted with locale separator, except
in Python Console and Macro Editor where a
dot/period will always be printed.</source>
<translation>如果啟用，數字鍵盤小數點分隔符
將替換為語系環境分隔符，除了
在 Python 控制台和巨集編輯器中
點/句點將始終顯示.</translation>
<translation>如果啟用，數字鍵盤的小數點分隔符號將會被替換為區域設定的分隔符號，但在 Python 主控台和巨集編輯器中，將始終顯示一個點/句號。</translation>
</message>
<message>
<location filename="../DlgGeneral.ui" line="341"/>
@@ -3111,7 +3108,7 @@ Specify another directory, please.</source>
<message>
<location filename="../DlgReportView.ui" line="14"/>
<source>Report view</source>
<translation>報表檢視</translation>
<translation>報告檢視</translation>
</message>
<message>
<location filename="../DlgReportView.ui" line="20"/>
@@ -3270,8 +3267,8 @@ on-screen while displaying the log message</source>
<location filename="../DlgReportView.ui" line="507"/>
<source>Internal Python output will be redirected
from Python console to Report view panel</source>
<translation>內部 Python 輸出將從 Python 控制台
重新指向到報告視窗面板</translation>
<translation>內部 Python 輸出將從 Python 主控台
轉向到報告視窗面板</translation>
</message>
<message>
<location filename="../DlgReportView.ui" line="511"/>
@@ -4587,7 +4584,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsMacro.ui" line="192"/>
<source>Commands executed by macro scripts are shown in Python console</source>
<translation>巨集腳本執行的指令會顯示在 Python 控制台中</translation>
<translation>巨集腳本執行的指令會顯示在 Python 主控台中</translation>
</message>
<message>
<location filename="../DlgSettingsMacro.ui" line="195"/>
@@ -4736,7 +4733,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</source>
<message>
<location filename="../DlgSettingsNavigation.ui" line="212"/>
<source>Base color for all elements</source>
<translation type="unfinished">Base color for all elements</translation>
<translation>所有元件之基底顏色</translation>
</message>
<message>
<location filename="../DlgSettingsNavigation.ui" line="244"/>
@@ -4955,7 +4952,7 @@ Mouse tilting is not disabled by this setting.</source>
<message>
<location filename="../DlgSettingsPythonConsole.ui" line="14"/>
<source>Python console</source>
<translation>Python 控制台</translation>
<translation>Python 主控台</translation>
</message>
<message>
<location filename="../DlgSettingsPythonConsole.ui" line="20"/>
@@ -4966,7 +4963,7 @@ Mouse tilting is not disabled by this setting.</source>
<location filename="../DlgSettingsPythonConsole.ui" line="26"/>
<source>Words will be wrapped when they exceed available
horizontal space in Python console</source>
<translation>當字詞超出 Python 控制台中的可用水平空間時，字詞將會換行</translation>
<translation>當字詞在 Python 主控台中超過可用的水平空間時，它們將被換行。</translation>
</message>
<message>
<location filename="../DlgSettingsPythonConsole.ui" line="30"/>
@@ -5038,7 +5035,7 @@ Larger value eases to pick things, but can make small features impossible to sel
<message>
<location filename="../DlgSettingsSelection.ui" line="91"/>
<source>Add checkboxes for selection in document tree</source>
<translation>在文件樹中增加複選框以供選擇</translation>
<translation>在文件樹中添加複選框以進行選擇</translation>
</message>
</context>
<context>
@@ -5999,7 +5996,7 @@ The 'Status' column shows whether the document could be recovered.</source>
<message>
<location filename="../SceneInspector.cpp" line="69"/>
<source>Inventor Tree</source>
<translation>發明歷程</translation>
<translation>建立者樹</translation>
</message>
<message>
<location filename="../SceneInspector.cpp" line="71"/>
@@ -6281,7 +6278,7 @@ originally selected prior to opening this dialog</source>
<location filename="../ReportView.cpp" line="83"/>
<location filename="../ReportView.cpp" line="108"/>
<source>Python console</source>
<translation>Python 控制台</translation>
<translation>Python 主控台</translation>
</message>
</context>
<context>
@@ -7248,7 +7245,7 @@ Do you want to exit without saving your data?</source>
<location filename="../PythonConsole.cpp" line="879"/>
<location filename="../PythonConsole.cpp" line="882"/>
<source>Python console</source>
<translation>Python 控制台</translation>
<translation>Python 主控台</translation>
</message>
<message>
<location filename="../PythonConsole.cpp" line="873"/>
@@ -7313,7 +7310,7 @@ Do you want to exit without saving your data?</source>
<message>
<location filename="../PythonConsole.cpp" line="1347"/>
<source>Clear console</source>
<translation>清除控制台</translation>
<translation>清除主控台</translation>
</message>
<message>
<location filename="../PythonConsole.cpp" line="1351"/>
@@ -8009,7 +8006,7 @@ Do you want to specify another directory?</source>
<message>
<location filename="../Tree.cpp" line="461"/>
<source>Search for objects</source>
<translation>搜尋物體</translation>
<translation>搜尋物件</translation>
</message>
<message>
<location filename="../Tree.cpp" line="887"/>
@@ -8024,12 +8021,12 @@ Do you want to specify another directory?</source>
<message>
<location filename="../Tree.cpp" line="906"/>
<source>Tree settings</source>
<translation type="unfinished">Tree settings</translation>
<translation>樹狀設定</translation>
</message>
<message>
<location filename="../Tree.cpp" line="910"/>
<source>Show description column</source>
<translation type="unfinished">Show description column</translation>
<translation>顯示說明欄</translation>
</message>
<message>
<location filename="../Tree.cpp" line="911"/>
@@ -8105,12 +8102,12 @@ Do you want to specify another directory?</source>
<message>
<location filename="../Tree.cpp" line="2808"/>
<source>Add dependent objects to selection</source>
<translation>將依賴物體增加到選擇</translation>
<translation>將相依物件增加到選擇</translation>
</message>
<message>
<location filename="../Tree.cpp" line="2809"/>
<source>Adds all dependent objects to the selection</source>
<translation>將所有依賴物體增加到選擇</translation>
<translation>將所有相依物件增加到選擇</translation>
</message>
<message>
<location filename="../Tree.cpp" line="2811"/>
@@ -8150,7 +8147,7 @@ Do you want to specify another directory?</source>
<message>
<location filename="../Tree.cpp" line="2822"/>
<source>Enable or disable recomputating editing object when 'skip recomputation' is enabled</source>
<translation>啟用'跳過重新計算'時啟用或禁用重新計算編輯物體</translation>
<translation>啟用'跳過重新計算'時啟用或禁用重新計算編輯物件</translation>
</message>
<message>
<location filename="../Tree.cpp" line="2824"/>
@@ -8165,12 +8162,12 @@ Do you want to specify another directory?</source>
<message>
<location filename="../Tree.cpp" line="2828"/>
<source>Recompute object</source>
<translation>重新計算物體</translation>
<translation>重新計算物件</translation>
</message>
<message>
<location filename="../Tree.cpp" line="2829"/>
<source>Recompute the selected object</source>
<translation>重新計算所選的物體</translation>
<translation>重新計算所選的物件</translation>
</message>
<message>
<location filename="../Tree.cpp" line="4911"/>
@@ -8422,12 +8419,12 @@ Do you want to specify another directory?</source>
<message>
<location filename="../MainWindow.cpp" line="619"/>
<source>Report view</source>
<translation>報表檢視</translation>
<translation>報告檢視</translation>
</message>
<message>
<location filename="../MainWindow.cpp" line="639"/>
<source>Python console</source>
<translation>Python 控制台</translation>
<translation>Python 主控台</translation>
</message>
<message>
<location filename="../DlgDisplayPropertiesImp.cpp" line="52"/>
@@ -8838,7 +8835,7 @@ Do you want to continue?</source>
<message>
<location filename="../NotificationArea.cpp" line="965"/>
<source>Do you want to skip confirmation of further critical message notifications while loading the file?</source>
<translation type="unfinished">Do you want to skip confirmation of further critical message notifications while loading the file?</translation>
<translation>當載入檔案時，您是否想要跳過進一步重要訊息通知的確認？</translation>
</message>
<message>
<location filename="../NotificationArea.cpp" line="969"/>
@@ -8855,9 +8852,7 @@ Do you want to continue?</source>
<source>Identical physical path detected. It may cause unwanted overwrite of existing document!
</source>
<translation type="unfinished">Identical physical path detected. It may cause unwanted overwrite of existing document!
</translation>
<translation>偵測到相同的實體路徑。這可能會導致現有文件被不必要地覆寫！</translation>
</message>
<message>
<location filename="../Document.cpp" line="1052"/>
@@ -8903,11 +8898,9 @@ Do you want to continue?</source>
"%1"
Would you like to save the file with a different name?</source>
<translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
<translation>儲存檔案時發生問題。這可能是因為一些上層資料夾不存在、您沒有足夠的權限，或其他原因所造成的。錯誤詳情：
"%1"
Would you like to save the file with a different name?</translation>
"%1"</translation>
</message>
<message>
<location filename="../Document.cpp" line="1112"/>
@@ -8924,7 +8917,7 @@ Would you like to save the file with a different name?</translation>
<message>
<location filename="../Document.cpp" line="1160"/>
<source>The file contains external dependencies. Do you want to save the dependent files, too?</source>
<translation type="unfinished">The file contains external dependencies. Do you want to save the dependent files, too?</translation>
<translation>該檔案包含外部相依性。您是否也要一併儲存相依的檔案？</translation>
</message>
<message>
<location filename="../Document.cpp" line="1194"/>
@@ -8957,7 +8950,7 @@ Would you like to save the file with a different name?</translation>
<message>
<location filename="../Document.cpp" line="1258"/>
<source>Documents contains cyclic dependencies. Do you still want to save them?</source>
<translation type="unfinished">Documents contains cyclic dependencies. Do you still want to save them?</translation>
<translation>文件包含循環相依性。您是否仍然要儲存它們？</translation>
</message>
<message>
<location filename="../Document.cpp" line="1309"/>
@@ -8987,7 +8980,7 @@ Would you like to save the file with a different name?</translation>
<message>
<location filename="../Document.cpp" line="2002"/>
<source>The document%1 could not be saved. Do you want to cancel closing it?</source>
<translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
<translation>文件%1無法被儲存。請問您是否要關閉它？</translation>
</message>
<message>
<location filename="../Document.cpp" line="2330"/>
@@ -9002,16 +8995,16 @@ Would you like to save the file with a different name?</translation>
<message>
<location filename="../Document.cpp" line="2332"/>
<source>There are grouped transactions in the following documents with other preceding transactions</source>
<translation type="unfinished">There are grouped transactions in the following documents with other preceding transactions</translation>
<translation>以下文件中存在與其他前置交易進行分組的交易。</translation>
</message>
<message>
<location filename="../Document.cpp" line="2335"/>
<source>Choose 'Yes' to roll back all preceding transactions.
Choose 'No' to roll back in the active document only.
Choose 'Abort' to abort</source>
<translation type="unfinished">Choose 'Yes' to roll back all preceding transactions.
Choose 'No' to roll back in the active document only.
Choose 'Abort' to abort</translation>
<translation>選擇「是」以回滾所有前置交易。
選擇「否」僅回滾活動文件中的交易。
選擇「中止」以中止操作。</translation>
</message>
<message>
<location filename="../EditorView.cpp" line="347"/>
@@ -9135,7 +9128,7 @@ Please open a browser window and type in: http://localhost:%1.</source>
<message>
<location filename="../MainWindow.cpp" line="697"/>
<source>Do you want to save your changes to document before closing?</source>
<translation type="unfinished">Do you want to save your changes to document before closing?</translation>
<translation>您是否在關閉前要儲存改變至此文件？</translation>
</message>
<message>
<location filename="../MainWindow.cpp" line="699"/>
@@ -9155,7 +9148,7 @@ Please open a browser window and type in: http://localhost:%1.</source>
<message>
<location filename="../MainWindow.cpp" line="795"/>
<source>Some documents could not be saved. Do you want to cancel closing?</source>
<translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
<translation>某些文件無法被儲存。請問您是否要關閉它？</translation>
</message>
<message>
<location filename="../DlgMacroExecuteImp.cpp" line="440"/>
@@ -9265,8 +9258,7 @@ Please open a browser window and type in: http://localhost:%1.</source>
<location filename="../DlgAddProperty.cpp" line="103"/>
<source>The property name or group name must only contain alpha numericals,
underscore, and must not start with a digit.</source>
<translation type="unfinished">The property name or group name must only contain alpha numericals,
underscore, and must not start with a digit.</translation>
<translation>屬性名稱或群組名稱只能包含字母、數字、底線，且不能以數字開頭。</translation>
</message>
<message>
<location filename="../DlgAddProperty.cpp" line="116"/>
@@ -9297,12 +9289,12 @@ underscore, and must not start with a digit.</translation>
<message>
<location filename="../ViewProviderLink.cpp" line="2422"/>
<source>Select which object to copy or exclude when configuration changes. All external linked objects are excluded by default.</source>
<translation type="unfinished">Select which object to copy or exclude when configuration changes. All external linked objects are excluded by default.</translation>
<translation>當設定變更時，請選擇什麼物件要複製或排除。預設情況下，所有外部連結的物件都會被排除。</translation>
</message>
<message>
<location filename="../ViewProviderLink.cpp" line="2437"/>
<source>Please select which objects to copy when the configuration is changed</source>
<translation type="unfinished">Please select which objects to copy when the configuration is changed</translation>
<translation>請選擇在設定變更時要複製的物件</translation>
</message>
<message>
<location filename="../ViewProviderLink.cpp" line="2439"/>
@@ -9313,8 +9305,7 @@ underscore, and must not start with a digit.</translation>
<location filename="../ViewProviderLink.cpp" line="2440"/>
<source>Apply the setting to all links. Or, uncheck this
option to apply only to this link.</source>
<translation type="unfinished">Apply the setting to all links. Or, uncheck this
option to apply only to this link.</translation>
<translation>套用此設定至所有連結。或者，取消選中此選項僅將其套用於此連結。</translation>
</message>
<message>
<location filename="../ViewProviderLink.cpp" line="2485"/>
@@ -9329,7 +9320,7 @@ option to apply only to this link.</translation>
<message>
<location filename="../ViewProviderLink.cpp" line="2487"/>
<source>Enable auto copy of linked object when its configuration is changed</source>
<translation type="unfinished">Enable auto copy of linked object when its configuration is changed</translation>
<translation>當連結物件的設定更改時啟用自動複製連結物件</translation>
</message>
<message>
<location filename="../ViewProviderLink.cpp" line="2500"/>
@@ -9341,8 +9332,8 @@ option to apply only to this link.</translation>
<source>Copy the linked object when its configuration is changed.
Also auto redo the copy if the original linked object is changed.
</source>
<translation type="unfinished">Copy the linked object when its configuration is changed.
Also auto redo the copy if the original linked object is changed.
<translation>當連結物件的設定更改時，複製該連結物件。
如果原始連結物件發生更改，也自動重新執行複製。
</translation>
</message>
<message>
@@ -9361,9 +9352,7 @@ Also auto redo the copy if the original linked object is changed.
creating a new deep copy. Note that any changes made to
the current copy will be lost.
</source>
<translation type="unfinished">Synchronize the original configurable source object by
creating a new deep copy. Note that any changes made to
the current copy will be lost.
<translation>通過建立一個新的深度拷貝，將原始可配置的源物件進行同步。請注意，對目前拷貝所做的任何更改將會丟失。
</translation>
</message>
<message>
@@ -9374,7 +9363,7 @@ the current copy will be lost.
<message>
<location filename="../ViewProviderLink.cpp" line="2577"/>
<source>Change whether show each link array element as individual objects</source>
<translation type="unfinished">Change whether show each link array element as individual objects</translation>
<translation>更改是否將每個連結陣列元素顯示為個別的物件</translation>
</message>
<message>
<location filename="../ViewProviderLink.cpp" line="2595"/>
@@ -10789,13 +10778,13 @@ the current copy will be lost.
<message>
<location filename="../CommandFeat.cpp" line="130"/>
<source>&amp;Send to Python Console</source>
<translation>發送到 Python 控制台(&amp;S)</translation>
<translation>發送到 Python 主控台(&amp;S)</translation>
</message>
<message>
<location filename="../CommandFeat.cpp" line="131"/>
<location filename="../CommandFeat.cpp" line="133"/>
<source>Sends the selected object to the Python console</source>
<translation>將所選物體發送到 Python 控制台</translation>
<translation>將所選物件發送到 Python 主控台</translation>
</message>
</context>
<context>
@@ -10907,7 +10896,7 @@ the current copy will be lost.
<location filename="../CommandMacro.cpp" line="295"/>
<location filename="../CommandMacro.cpp" line="297"/>
<source>Add or remove a breakpoint at this position</source>
<translation type="unfinished">Add or remove a breakpoint at this position</translation>
<translation>在此位置增加或移除中斷點</translation>
</message>
</context>
<context>
@@ -11061,7 +11050,7 @@ the current copy will be lost.
<location filename="../CommandView.cpp" line="3073"/>
<location filename="../CommandView.cpp" line="3075"/>
<source>Select all instances of the current selected object</source>
<translation>選擇目前選定物體的全部實例</translation>
<translation>選擇目前選定物件的全部實例</translation>
</message>
</context>
<context>
@@ -11643,7 +11632,7 @@ the current copy will be lost.
<message>
<location filename="../CommandView.cpp" line="3475"/>
<source>Collapse/Expand</source>
<translation>收合摺疊/展開</translation>
<translation>折疊/展開</translation>
</message>
<message>
<location filename="../CommandView.cpp" line="3476"/>
@@ -11657,7 +11646,7 @@ the current copy will be lost.
<message>
<location filename="../CommandView.cpp" line="3604"/>
<source>Initiate dragging</source>
<translation>開始拖動</translation>
<translation>開始拖曳</translation>
</message>
<message>
<location filename="../CommandView.cpp" line="3605"/>
@@ -11743,7 +11732,7 @@ the current copy will be lost.
<message>
<location filename="../CommandView.cpp" line="3551"/>
<source>Auto adjust placement on drag and drop objects across coordinate systems</source>
<translation>自動調整跨坐標系統拖放物體的位置</translation>
<translation>在不同座標系統中拖放物件時自動調整位置</translation>
</message>
</context>
<context>
@@ -11867,7 +11856,7 @@ the current copy will be lost.
<location filename="../CommandView.cpp" line="2430"/>
<location filename="../CommandView.cpp" line="2432"/>
<source>Increase the zoom factor by a fixed amount</source>
<translation type="unfinished">Increase the zoom factor by a fixed amount</translation>
<translation>以固定數量來增加縮放比例</translation>
</message>
</context>
<context>
@@ -11881,7 +11870,7 @@ the current copy will be lost.
<location filename="../CommandView.cpp" line="2459"/>
<location filename="../CommandView.cpp" line="2461"/>
<source>Decrease the zoom factor by a fixed amount</source>
<translation type="unfinished">Decrease the zoom factor by a fixed amount</translation>
<translation>以固定數量來減少縮放比例</translation>
</message>
</context>
<context>
@@ -12602,7 +12591,7 @@ after FreeCAD launches</source>
<message>
<location filename="../DlgSettingsWorkbenchesImp.cpp" line="145"/>
<source>To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.</source>
<translation type="unfinished">To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.</translation>
<translation>為了保留資源，FreeCAD 在使用前不會載入工作台。載入工作台可能會提供對與其功能相關的其他偏好設定的存取。</translation>
</message>
</context>
<context>
src/Mod/Arch/Resources/translations/Arch_be.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_be.ts
+13 -1
View File
@@ -337,7 +337,19 @@ Leave blank to use all objects from the document</source>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Неабавязковы спіс фільтраў "Уласцівасць:Значэнне", якія падзелены кропкай з коскай (;).
Дадаць ! да назвы ўласцівасці, каб інвертаваць эфект фільтра (выключыць аб'екты, якія адпавядаюць фільтру).
Аб'екты, уласцівасць якіх змяшчае значэнне, будуць супастаўленыя.
Прыклады дапушчальных фільтраў (усе без уліку рэгістра):
Name:Wall - будуць улічвацца толькі аб'екты, у назве якіх ёсць 'сцяна' (унутранае імя);
!Name: Wall - будуць улічвацца толькі аб'екты, у назве якіх няма 'сцяны' (унутранае імя);
Description:Win - будуць разглядацца толькі аб'екты з словам 'акно' у іх апісанні;
!Label:Win - будуць улічвацца толькі аб'екты, у якіх у меткі няма слова 'акно';
IfcType:Wall - будуць улічвацца толькі аб'екты, тып Ifc якіх роўны 'Сцяна';
!Tag:Wall - будуць улічвацца толькі аб'екты, у якіх метка не з'яўляецца 'Сцяной'.
Калі вы пакінеце гэта поле пустым, фільтраванне не будзе ўжытае</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_es-AR.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_es-AR.ts
+1 -1
View File
@@ -334,7 +334,7 @@ Deje en blanco para usar todos los objetos del documento</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Una lista opcional de filtros propiedad:valor separados por punto y coma (;). Antepon ! al nombre de propiedad para invertir el efecto del filtro (excluir objetos que coinciden con el filtro). La coincidencia se producirá en aquellos objetos cuya propiedad contenga el valor. Algunos ejemplos de filtros válidos (no se distingue entre mayúsculas y minúsculas): Nombre:Muro - Solo se considerarán los objetos con "muro" en su nombre (nombre interno); !Nombre:Muro - Solo se considerarán los objetos que NO contengan "muro" en su nombre (nombre interno); Descripcion:Win - Solo se considerarán los objetos con 'win' en su descripción; !Etiqueta:Win - Solo se considerarán aquellos objetos que NO tengan "win" en su etiqueta; TipoIfc:Muro - Solo se considerarán aquellos objetos cuyo Tipo Ifc sea "Muro"; !Tag:Muro - Solo se considerarán aquellos objetos cuyo "tag" NO sea "Muro". Si deja este campo vacío, no se aplicará ningún filtro</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_es-ES.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_es-ES.ts
+1 -1
View File
@@ -334,7 +334,7 @@ Deje en blanco para usar todos los objetos del documento</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Una lista opcional de filtros propiedad:valor separados por punto y coma (;). Antepon ! al nombre de propiedad para invertir el efecto del filtro (excluir objetos que coinciden con el filtro). La coincidencia se producirá en aquellos objetos cuya propiedad contenga el valor. Algunos ejemplos de filtros válidos (no se distingue entre mayúsculas y minúsculas): Nombre:Muro - Solo se considerarán los objetos con "muro" en su nombre (nombre interno); !Nombre:Muro - Solo se considerarán los objetos que NO contengan "muro" en su nombre (nombre interno); Descripcion:Win - Solo se considerarán los objetos con 'win' en su descripción; !Etiqueta:Win - Solo se considerarán aquellos objetos que NO tengan "win" en su etiqueta; TipoIfc:Muro - Solo se considerarán aquellos objetos cuyo Tipo Ifc sea "Muro"; !Tag:Muro - Solo se considerarán aquellos objetos cuyo "tag" NO sea "Muro". Si deja este campo vacío, no se aplicará ningún filtro</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_eu.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_eu.ts
+1 -1
View File
@@ -334,7 +334,7 @@ Utzi hutsik dokumentuko objektu guztiak erabili daitezen.</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Propietatea:balioa iragazkien zerrenda bat, puntu eta komaz (;) bananduta. Jarri ! aurretik propietate-izen bati, iragazkiaren efektua indargabetu nahi izanez gero (iragazkiarekin bat datozen objektuak baztertzen dira). Balioa betetzen duen propietatea duten objektuek egingo dute bat iragazkiarekin. Baliozko iragazkien adibideak (maiuskulak/minuskulak kontuan hartu gabe beti): 'Name:Wall' - Izenean (barnekoan) 'wall' duten objektuak soilik kontsideratuko ditu; '!Name:Wall' - Izenean (barnekoan) 'wal' EZ duten objektuak soilik kontsideratuko ditu; 'Description:Win' - Deskribapenean 'win' duten objektuak soilik kontsideratuko ditu; '!Label:Win' - Etiketan 'win' EZ duten objektuak soilik kontsideratuko ditu; 'ifcType:Wall' - Ifc motan 'wall' duten objektuak soilik kontsideratuko ditu; '!Tag:Wall' - Etiketan 'wall' EZ duten objektuak soilik kontsideratuko ditu. Eremua hutsik uzten bada, ez da iragazkirik aplikatuko.</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_fr.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_fr.ts
+1 -1
View File
@@ -331,7 +331,7 @@ Leave blank to use all objects from the document</source>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Une liste facultative de filtres propriété/valeur séparés par des points-virgules ( ;). Ajouter ! au nom d'une propriété pour inverser l'effet du filtre (exclure les objets qui correspondent au filtre). Les objets dont la propriété contient la valeur seront pris en compte. Exemples de filtres valides (tout est insensible à la casse) : Name:Wall - Ne prendra en compte que les objets dont le nom (nom interne) contient "wall" ; !Name:Wall - Ne prendra en compte que les objets dont le nom (nom interne) ne contient pas "wall" ; Description:Win - Ne prendra en compte que les objets dont la description contient "win" ; !Label:Win - Ne prendra en compte que les objets dont le label ne contient pas "win" ; IfcType:Wall - Ne prendra en compte que les objets dont le type Ifc est "Wall" ; !Tag:Wall - Ne prendra en compte que les objets dont le tag n'est PAS "Wall". Si vous laissez ce champ vide, aucun filtrage n'est appliqué.</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_hu.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_hu.ts
+1 -1
View File
@@ -334,7 +334,7 @@ Hagyja üresen a dokumentum összes objektumának használatát</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>A tulajdonság:érték szűrők pontosvesszővel (;) elválasztott választható listája. A ! előtagot a tulajdonságnév elé helyezve megfordítja a szűrő hatását (kizárja azokat a tárgyakat, amelyek megfelelnek a szűrőnek). Azok a tárgyak, amelyek tulajdonsága tartalmazza az értéket, illeszkedni fognak. Példák az érvényes szűrőkre (minden esetben a nagy- és kisbetűket figyelmen kívül kell hagyni): Név:Fal - Csak olyan tárgyakat vesz figyelembe, amelyek nevében (belső nevében) szerepel a 'fal'; !Név:Fal - Csak olyan tárgyakat vesz figyelembe, amelyek nevében (belső nevében) NEM szerepel a 'fal'; Leírás:Win - Csak olyan tárgyakat vesz figyelembe, amelyek leírásában szerepel a 'win'; !Címke:Win - Csak olyan tárgyakat vesz figyelembe, amelyek címkéjében NEM szerepel a 'win'; IfcType:Wall - Csak olyan objektumokat vesz figyelembe, amelyek Ifc típusa 'Wall'; !Mező:Wall - Csak olyan tárgyakat vesz figyelembe, amelyek mezője NEM 'Wall'. Ha ezt a mezőt üresen hagyja, nem történik szűrés</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_ka.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_ka.ts
+1 -1
View File
@@ -333,7 +333,7 @@ Leave blank to use all objects from the document</source>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>არასავალდებულო წერტილმძიმით (;) გამოყოფილი თვისება:მნიშვნელობის ფილტრების სია. მიაწერეთ თავში ! ფილტრის ეფექტის ინვერსიისთვის (გამონაკლისია ობიექტები, რომლებიც ფილტრს ემთხვევა). გამოჩნდება ობიექტებ, რომლის თვისებაც მითითებულ მნიშვნელობას შეიცავს. სწორი ფილტრის მაგალითებია (რეგისტრს მნიშვნელობა არ აქვს): Name:Wall - გამოიტანს ობიექტებს, რომელიც მათ სახელში 'wall'-ს შეიცავს (შიდა სახელი); !Name:Wall გამოიტანს ობიექტებს, რომლებიც მათ სახელში 'wall'-ს *არ* სეიცევან (შიდა სახელი); Descriptiom:Win - გამოიტანს მხოლოდ იმ ობიექტებს, რომლებიც აღწერაში 'win'-ს შეიცავენ. !Label:Win გამოიტანს ობიექტებს, რომლებიც მათ ჭდეში 'wil'-ს *არ* შეიცავენ. IfcType:Wall გამოიტანს ობიექტებს, რომლის Ifc ტიპი 'wall'-ის ტოლია. !Tag:Wall - გამოიტანს მხოლოდ იმ ობიექტებს, რომლის ჭდეც 'wall' *არაა*. თუ ამ ველს ცარიელს დატოვებთ, ფილტრი გამოყენებული არ იქნება</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_pl.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_pl.ts
+1 -1
View File
@@ -335,7 +335,7 @@ Uwaga dotycząca eksportu CSV: W programie Libreoffice plik CSV można połączy
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Opcjonalna lista właściwości filtrów: wartości oddzielona średnikiem (;). Przedrostek ! do nazwy właściwości odwraca efekt filtru (wyklucza obiekty pasujące do filtru). Obiekty, których właściwość zawiera wartość, zostaną dopasowane. Przykłady prawidłowych filtrów (wielkość liter nie ma znaczenia): Name:Wall - Uwzględni tylko obiekty z "wall" w nazwie (nazwa wewnętrzna); !Name:Wall - Uwzględni tylko obiekty, które NIE mają "wall" w nazwie (nazwa wewnętrzna); Description:Win - Uwzględni tylko obiekty z "win" w opisie; !Label:Win - Uwzględni tylko obiekty, które NIE mają "win" w etykiecie; IfcType:Wall - Uwzględni tylko obiekty, których typ IFC to "Wall"; !Tag:Wall - Uwzględni tylko obiekty, których tag NIE jest "Wall". Jeśli pozostawisz to pole puste, filtrowanie nie zostanie zastosowane</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_pt-BR.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_pt-BR.ts
+92 -92
View File
@@ -254,7 +254,7 @@ Deixe em branco para usar todos os objetos do documento</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="71"/>
<source>The property to retrieve from each object.Can be 'Count' to count the objects, or property names like 'Length' or 'Shape.Volume' to retrieve a certain property.</source>
<translation type="unfinished">The property to retrieve from each object.Can be 'Count' to count the objects, or property names like 'Length' or 'Shape.Volume' to retrieve a certain property.</translation>
<translation>Propriedade a ser recuperada em cada objeto. Pode ser "Contar" para contar os objetos, ou propriedades como "Comprimento" ou "Forma.Volume" para recuperar uma certa propriedade.</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="108"/>
@@ -319,12 +319,12 @@ Deixe em branco para usar todos os objetos do documento</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="184"/>
<source>Put selected objects into the 'Objects' column of the selected row</source>
<translation type="unfinished">Put selected objects into the 'Objects' column of the selected row</translation>
<translation>Coloque os objetos selecionados na coluna "Objetos" da linha selecionada</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="208"/>
<source>This exports the results to a CSV or Markdown file. Note for CSV export: In Libreoffice, you can keep this CSV file linked by right-clicking the Sheets tab bar, New sheet, From file, Link (Note: as of LibreOffice v6.x the correct path now is: Sheet, Insert Sheet..., From file, Browse...)</source>
<translation type="unfinished">This exports the results to a CSV or Markdown file. Note for CSV export: In Libreoffice, you can keep this CSV file linked by right-clicking the Sheets tab bar, New sheet, From file, Link (Note: as of LibreOffice v6.x the correct path now is: Sheet, Insert Sheet..., From file, Browse...)</translation>
<translation>Isto exporta o resultado para um arquivo CSV ou Markdown. Nota para a exportação CSV: No Libreoffice, você pode manter este arquivo CSV linkado clicando com o botão direito na barra Planilhas - Nova Planilha - Do ficheiro - Link (Nota: A partir do LibreOffice v6.. mudou para: barra de nomes de folhas - Insert Planilha... - Do ficheiro - Procurar...)</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="187"/>
@@ -1738,7 +1738,7 @@ No entanto, alguns aplicativos BIM usarão este fator para escolher com qual uni
<message>
<location filename="../../ArchStructure.py" line="150"/>
<source>StructuralSystem</source>
<translation type="unfinished">StructuralSystem</translation>
<translation>Sistema Estrutural</translation>
</message>
<message>
<location filename="../../ArchStructure.py" line="205"/>
@@ -2032,7 +2032,7 @@ No entanto, alguns aplicativos BIM usarão este fator para escolher com qual uni
<location filename="../../ArchBuildingPart.py" line="221"/>
<location filename="../../ArchFloor.py" line="89"/>
<source>Floor</source>
<translation type="unfinished">Floor</translation>
<translation>Piso</translation>
</message>
<message>
<location filename="../../ArchBuildingPart.py" line="302"/>
@@ -2253,7 +2253,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchReference.py" line="64"/>
<source>External Reference</source>
<translation type="unfinished">External Reference</translation>
<translation>Referência externa</translation>
</message>
<message>
<location filename="../../ArchReference.py" line="498"/>
@@ -2308,32 +2308,32 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../importSHP.py" line="135"/>
<source>The shapefile python library was not found on your system. Would you like to download it now from &lt;a href="https://github.com/GeospatialPython/pyshp"&gt;https://github.com/GeospatialPython/pyshp&lt;/a&gt;? It will be placed in your macros folder.</source>
<translation type="unfinished">The shapefile python library was not found on your system. Would you like to download it now from &lt;a href="https://github.com/GeospatialPython/pyshp"&gt;https://github.com/GeospatialPython/pyshp&lt;/a&gt;? It will be placed in your macros folder.</translation>
<translation>A biblioteca python do shapefile não foi encontrada no seu sistema. Gostaria de baixá-la agora de &lt;a href="https://github.com/GeospatialPython/pyshp"&gt;https://github. om/GeospatialPython/pyshp&lt;/a&gt;? Ela será colocada na sua pasta de macros.</translation>
</message>
<message>
<location filename="../../importSHP.py" line="141"/>
<source>Error: Unable to download from:</source>
<translation type="unfinished">Error: Unable to download from:</translation>
<translation>Erro: Não foi possível baixar de:</translation>
</message>
<message>
<location filename="../../importSHP.py" line="153"/>
<source>Could not download shapefile module. Aborting.</source>
<translation type="unfinished">Could not download shapefile module. Aborting.</translation>
<translation>Não foi possível baixar o módulo shapefile. Cancelando operação.</translation>
</message>
<message>
<location filename="../../importSHP.py" line="156"/>
<source>Shapefile module not downloaded. Aborting.</source>
<translation type="unfinished">Shapefile module not downloaded. Aborting.</translation>
<translation>O módulo Shapefile não foi baixado. Cancelando operação.</translation>
</message>
<message>
<location filename="../../importSHP.py" line="159"/>
<source>Shapefile module not found. Aborting.</source>
<translation type="unfinished">Shapefile module not found. Aborting.</translation>
<translation>O módulo Shapefile não foi encontrado. Cancelando operação.</translation>
</message>
<message>
<location filename="../../importSHP.py" line="160"/>
<source>The shapefile library can be downloaded from the following URL and installed in your macros folder:</source>
<translation type="unfinished">The shapefile library can be downloaded from the following URL and installed in your macros folder:</translation>
<translation>A biblioteca de shapefile pode ser baixada da seguinte URL e instalada na sua pasta de macros:</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="88"/>
@@ -2350,7 +2350,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchWindow.py" line="246"/>
<source>Choose a face on an existing object or select a preset</source>
<translation type="unfinished">Choose a face on an existing object or select a preset</translation>
<translation>Selecione uma face em um objeto existente ou escolha uma predefinição</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="298"/>
@@ -2360,12 +2360,12 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchWindow.py" line="308"/>
<source>No Width and/or Height constraint in window sketch. Window not resized.</source>
<translation type="unfinished">No Width and/or Height constraint in window sketch. Window not resized.</translation>
<translation>Nenhuma restrição de largura e/ou altura no esboço da janela. A janela não será redimensionada.</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="311"/>
<source>No window found. Cannot continue.</source>
<translation type="unfinished">No window found. Cannot continue.</translation>
<translation>Nenhuma janela encontrada. Não é possível continuar.</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="367"/>
@@ -2375,44 +2375,44 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchWindow.py" line="371"/>
<source>Auto include in host object</source>
<translation type="unfinished">Auto include in host object</translation>
<translation>Incluir automaticamente um hospedeiro no objeto</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="377"/>
<source>Sill height</source>
<translation type="unfinished">Sill height</translation>
<translation>Altura do peitoril</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1321"/>
<source>This window has no defined opening</source>
<translation type="unfinished">This window has no defined opening</translation>
<translation>Essa janela não tem abertura definida</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1598"/>
<location filename="../../ArchWindow.py" line="1647"/>
<location filename="../../ArchWindow.py" line="1808"/>
<source>Get selected edge</source>
<translation type="unfinished">Get selected edge</translation>
<translation>Usar a aresta selecionada</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1747"/>
<source>Unable to create component</source>
<translation type="unfinished">Unable to create component</translation>
<translation>Não é possível criar componente</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1785"/>
<source>Window elements</source>
<translation type="unfinished">Window elements</translation>
<translation>Elementos da janela</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1786"/>
<source>Hole wire</source>
<translation type="unfinished">Hole wire</translation>
<translation>Arame para o furo</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1787"/>
<source>The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire</source>
<translation type="unfinished">The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire</translation>
<translation>O número do arame que define um furo no objeto hospedeiro. Um valor de zero selecionará automaticamente o maior arame</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1788"/>
@@ -2457,18 +2457,18 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchWindow.py" line="1792"/>
<source>Create/update component</source>
<translation type="unfinished">Create/update component</translation>
<translation>Criar/atualizar um componente</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1793"/>
<source>Base 2D object</source>
<translation type="unfinished">Base 2D object</translation>
<translation>Objeto base 2D</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1794"/>
<location filename="../../ArchWindow.py" line="1799"/>
<source>Wires</source>
<translation type="unfinished">Wires</translation>
<translation>Arames</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1795"/>
@@ -2512,39 +2512,39 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchWindow.py" line="1802"/>
<source>Hinge</source>
<translation type="unfinished">Hinge</translation>
<translation>Dobradiça</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1803"/>
<source>Opening mode</source>
<translation type="unfinished">Opening mode</translation>
<translation>Modo de abertura</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1804"/>
<location filename="../../ArchWindow.py" line="1806"/>
<source>+ default</source>
<translation type="unfinished">+ default</translation>
<translation>+ padrão</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1805"/>
<source>If this is checked, the default Frame value of this window will be added to the value entered here</source>
<translation type="unfinished">If this is checked, the default Frame value of this window will be added to the value entered here</translation>
<translation>Se isto estiver marcado, o valor padrão do quadro desta janela será adicionado ao valor inserido aqui</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1807"/>
<source>If this is checked, the default Offset value of this window will be added to the value entered here</source>
<translation type="unfinished">If this is checked, the default Offset value of this window will be added to the value entered here</translation>
<translation>Se isto estiver marcado, o valor de deslocamento padrão desta janela será adicionado ao valor inserido aqui</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1809"/>
<source>Press to retrieve the selected edge</source>
<translation type="unfinished">Press to retrieve the selected edge</translation>
<translation>Pressione para recuperar a aresta selecionada</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1251"/>
<location filename="../../ArchWindow.py" line="1810"/>
<source>Invert opening direction</source>
<translation type="unfinished">Invert opening direction</translation>
<translation>Inverter direção de abertura</translation>
</message>
<message>
<location filename="../../ArchWindow.py" line="1260"/>
@@ -2653,7 +2653,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchStairs.py" line="171"/>
<source>Railing</source>
<translation type="unfinished">Railing</translation>
<translation>Corrimão</translation>
</message>
<message>
<location filename="../../ArchStairs.py" line="219"/>
@@ -2663,12 +2663,12 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchStairs.py" line="428"/>
<source>removed properties 'OutlineWireLeft' and 'OutlineWireRight', and added properties 'RailingLeft' and 'RailingRight'</source>
<translation type="unfinished">removed properties 'OutlineWireLeft' and 'OutlineWireRight', and added properties 'RailingLeft' and 'RailingRight'</translation>
<translation>removidas propriedades 'OutlineWireLeft' e 'OutlineWireRight', e adicionadas propriedades 'RailingLeft' e 'RailingRight'</translation>
</message>
<message>
<location filename="../../ArchStairs.py" line="442"/>
<source>changed the type of properties 'RailingLeft' and 'RailingRight'</source>
<translation type="unfinished">changed the type of properties 'RailingLeft' and 'RailingRight'</translation>
<translation>alteradas os tipos de propriedades 'RailingLeft' e 'RailingRight'</translation>
</message>
<message>
<location filename="../../ArchMaterial.py" line="123"/>
@@ -2683,7 +2683,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchMaterial.py" line="214"/>
<source>Merge duplicates</source>
<translation type="unfinished">Merge duplicates</translation>
<translation>Mesclar duplicatas</translation>
</message>
<message>
<location filename="../../ArchMaterial.py" line="56"/>
@@ -2695,7 +2695,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchMaterial.py" line="88"/>
<source>MultiMaterial</source>
<translation type="unfinished">MultiMaterial</translation>
<translation>MultiMaterial</translation>
</message>
<message>
<location filename="../../ArchMaterial.py" line="920"/>
@@ -2797,12 +2797,12 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchGrid.py" line="430"/>
<source>Create span</source>
<translation type="unfinished">Create span</translation>
<translation>Criar intervalo</translation>
</message>
<message>
<location filename="../../ArchGrid.py" line="431"/>
<source>Remove span</source>
<translation type="unfinished">Remove span</translation>
<translation>Remover intervalo</translation>
</message>
<message>
<location filename="../../ArchGrid.py" line="432"/>
@@ -2832,17 +2832,17 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchPrecast.py" line="1007"/>
<source>Dent length</source>
<translation type="unfinished">Dent length</translation>
<translation>Comprimento do dente</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1008"/>
<source>Dent width</source>
<translation type="unfinished">Dent width</translation>
<translation>Largura do dente</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1009"/>
<source>Dent height</source>
<translation type="unfinished">Dent height</translation>
<translation>Altura do dente</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1010"/>
@@ -2872,32 +2872,32 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchPrecast.py" line="1015"/>
<source>Number of grooves</source>
<translation type="unfinished">Number of grooves</translation>
<translation>Número de sulcos</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1016"/>
<source>Depth of grooves</source>
<translation type="unfinished">Depth of grooves</translation>
<translation>Profundidade dos sulcos</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1017"/>
<source>Height of grooves</source>
<translation type="unfinished">Height of grooves</translation>
<translation>Altura dos sulcos</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1018"/>
<source>Spacing between grooves</source>
<translation type="unfinished">Spacing between grooves</translation>
<translation>Espaçamento entre os sulcos</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1019"/>
<source>Number of risers</source>
<translation type="unfinished">Number of risers</translation>
<translation>Número de elevadores</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1020"/>
<source>Length of down floor</source>
<translation type="unfinished">Length of down floor</translation>
<translation>Comprimento do patamar inferior</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1021"/>
@@ -2907,37 +2907,37 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchPrecast.py" line="1022"/>
<source>Depth of treads</source>
<translation type="unfinished">Depth of treads</translation>
<translation>Profundidade dos degraus</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1407"/>
<source>Precast options</source>
<translation type="unfinished">Precast options</translation>
<translation>Opções de pré-moldados</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1408"/>
<source>Dents list</source>
<translation type="unfinished">Dents list</translation>
<translation>Lista de amassados</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1409"/>
<source>Add dent</source>
<translation type="unfinished">Add dent</translation>
<translation>Adicionar amassado</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1410"/>
<source>Remove dent</source>
<translation type="unfinished">Remove dent</translation>
<translation>Remover amassado</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1414"/>
<source>Slant</source>
<translation type="unfinished">Slant</translation>
<translation>Inclinação</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1415"/>
<source>Level</source>
<translation type="unfinished">Level</translation>
<translation>Nível</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="1416"/>
@@ -2952,7 +2952,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per
<message>
<location filename="../../ArchPanel.py" line="105"/>
<source>View of</source>
<translation type="unfinished">View of</translation>
<translation>Vista de</translation>
</message>
<message>
<location filename="../../ArchPanel.py" line="120"/>
@@ -3241,27 +3241,27 @@ Floor creation aborted.</translation>
<location filename="../../importOBJ.py" line="87"/>
<location filename="../../importOBJ.py" line="98"/>
<source>Found a shape containing curves, triangulating</source>
<translation type="unfinished">Found a shape containing curves, triangulating</translation>
<translation>Uma forma contendo curvas foi encontrada e será triangulada</translation>
</message>
<message>
<location filename="../../importOBJ.py" line="359"/>
<source>Successfully imported</source>
<translation type="unfinished">Successfully imported</translation>
<translation>Importado com sucesso</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="928"/>
<source>Error computing the shape of this object</source>
<translation type="unfinished">Error computing the shape of this object</translation>
<translation>Não foi possível computar a forma do objeto</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="949"/>
<source>has no solid</source>
<translation type="unfinished">has no solid</translation>
<translation>não tem sólido</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="956"/>
<source>has an invalid shape</source>
<translation type="unfinished">has an invalid shape</translation>
<translation>tem uma forma inválida</translation>
</message>
<message>
<location filename="../../ArchPrecast.py" line="128"/>
@@ -3272,44 +3272,44 @@ Floor creation aborted.</translation>
<location filename="../../ArchPrecast.py" line="679"/>
<location filename="../../ArchComponent.py" line="958"/>
<source>has a null shape</source>
<translation type="unfinished">has a null shape</translation>
<translation>tem uma forma nula</translation>
</message>
<message>
<location filename="../../ArchSite.py" line="943"/>
<location filename="../../ArchComponent.py" line="1510"/>
<source>Toggle subcomponents</source>
<translation type="unfinished">Toggle subcomponents</translation>
<translation>Alternar subcomponentes</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1636"/>
<source>Closing Sketch edit</source>
<translation type="unfinished">Closing Sketch edit</translation>
<translation>Fechar edição do Esboço</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1944"/>
<location filename="../../ArchCommands.py" line="216"/>
<source>Component</source>
<translation type="unfinished">Component</translation>
<translation>Componente</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1947"/>
<source>Components of this object</source>
<translation type="unfinished">Components of this object</translation>
<translation>Componentes deste objeto</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1948"/>
<source>Base component</source>
<translation type="unfinished">Base component</translation>
<translation>Componente base</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1949"/>
<source>Additions</source>
<translation type="unfinished">Additions</translation>
<translation>Adições</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1950"/>
<source>Subtractions</source>
<translation type="unfinished">Subtractions</translation>
<translation>Subtrações</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1951"/>
@@ -3319,7 +3319,7 @@ Floor creation aborted.</translation>
<message>
<location filename="../../ArchComponent.py" line="1954"/>
<source>Fixtures</source>
<translation type="unfinished">Fixtures</translation>
<translation>Fixações</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1955"/>
@@ -3334,12 +3334,12 @@ Floor creation aborted.</translation>
<message>
<location filename="../../ArchComponent.py" line="1957"/>
<source>Edit IFC properties</source>
<translation type="unfinished">Edit IFC properties</translation>
<translation>Editar propriedades IFC</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="1958"/>
<source>Edit standard code</source>
<translation type="unfinished">Edit standard code</translation>
<translation>Editar código padrão</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="2007"/>
@@ -3349,12 +3349,12 @@ Floor creation aborted.</translation>
<message>
<location filename="../../ArchComponent.py" line="2012"/>
<source>Add property...</source>
<translation type="unfinished">Add property...</translation>
<translation>Adicionar propriedade...</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="2013"/>
<source>Add property set...</source>
<translation type="unfinished">Add property set...</translation>
<translation>Adicione conjunto de propriedades...</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="2014"/>
@@ -3364,12 +3364,12 @@ Floor creation aborted.</translation>
<message>
<location filename="../../ArchComponent.py" line="2152"/>
<source>New property</source>
<translation type="unfinished">New property</translation>
<translation>Propriedade nova</translation>
</message>
<message>
<location filename="../../ArchComponent.py" line="2187"/>
<source>New property set</source>
<translation type="unfinished">New property set</translation>
<translation>Novo conjunto de propriedades</translation>
</message>
<message>
<location filename="../../ArchRebar.py" line="64"/>
@@ -3380,12 +3380,12 @@ Floor creation aborted.</translation>
<location filename="../../ArchRebar.py" line="130"/>
<location filename="../../ArchRebar.py" line="151"/>
<source>Create Rebar</source>
<translation type="unfinished">Create Rebar</translation>
<translation>Criar Armação</translation>
</message>
<message>
<location filename="../../ArchRebar.py" line="158"/>
<source>Please select a base face on a structural object</source>
<translation type="unfinished">Please select a base face on a structural object</translation>
<translation>Por favor, selecione uma face de base em um objeto estrutural</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="68"/>
@@ -3395,22 +3395,22 @@ Floor creation aborted.</translation>
<message>
<location filename="../../ArchSectionPlane.py" line="839"/>
<source>Create Section Plane</source>
<translation type="unfinished">Create Section Plane</translation>
<translation>Criar um plano de corte</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="1192"/>
<source>Toggle Cutview</source>
<translation type="unfinished">Toggle Cutview</translation>
<translation>Alternar Vista de Corte</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="1369"/>
<source>Section plane settings</source>
<translation type="unfinished">Section plane settings</translation>
<translation>Configurações do plano de corte</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="1371"/>
<source>Remove highlighted objects from the list above</source>
<translation type="unfinished">Remove highlighted objects from the list above</translation>
<translation>Remover objetos destacados da lista acima</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="1372"/>
@@ -3420,12 +3420,12 @@ Floor creation aborted.</translation>
<message>
<location filename="../../ArchSectionPlane.py" line="1373"/>
<source>Add selected object(s) to the scope of this section plane</source>
<translation type="unfinished">Add selected object(s) to the scope of this section plane</translation>
<translation>Adicionar objeto(s) selecionado(s) ao escopo deste plano de secção</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="1374"/>
<source>Objects seen by this section plane:</source>
<translation type="unfinished">Objects seen by this section plane:</translation>
<translation>Objetos vistos por este plano de corte:</translation>
</message>
<message>
<location filename="../../ArchSectionPlane.py" line="1375"/>
@@ -6037,22 +6037,22 @@ Building creation aborted.</translation>
<message>
<location filename="../../InitGui.py" line="163"/>
<source>Draft creation tools</source>
<translation type="unfinished">Draft creation tools</translation>
<translation>Ferramentas de criação de esboço</translation>
</message>
<message>
<location filename="../../InitGui.py" line="166"/>
<source>Draft annotation tools</source>
<translation type="unfinished">Draft annotation tools</translation>
<translation>Ferramentas de anotação de esboço</translation>
</message>
<message>
<location filename="../../InitGui.py" line="169"/>
<source>Draft modification tools</source>
<translation type="unfinished">Draft modification tools</translation>
<translation>Ferramentas de modificação de esboço</translation>
</message>
<message>
<location filename="../../InitGui.py" line="172"/>
<source>Draft snap</source>
<translation type="unfinished">Draft snap</translation>
<translation>Referências a objetos de esboço</translation>
</message>
<message>
<location filename="../../InitGui.py" line="177"/>
@@ -6520,7 +6520,7 @@ Building creation aborted.</translation>
<message>
<location filename="../../ArchFloor.py" line="116"/>
<source>Level</source>
<translation type="unfinished">Level</translation>
<translation>Nível</translation>
</message>
<message>
<location filename="../../ArchFloor.py" line="120"/>
@@ -6750,7 +6750,7 @@ Building creation aborted.</translation>
<message>
<location filename="../../ArchCommands.py" line="1579"/>
<source>Component</source>
<translation type="unfinished">Component</translation>
<translation>Componente</translation>
</message>
<message>
<location filename="../../ArchCommands.py" line="1583"/>
@@ -6789,7 +6789,7 @@ Building creation aborted.</translation>
<message>
<location filename="../../ArchCommands.py" line="1680"/>
<source>Toggle subcomponents</source>
<translation type="unfinished">Toggle subcomponents</translation>
<translation>Alternar subcomponentes</translation>
</message>
<message>
<location filename="../../ArchCommands.py" line="1683"/>
src/Mod/Arch/Resources/translations/Arch_ru.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_ru.ts
+1 -1
View File
@@ -333,7 +333,7 @@ Leave blank to use all objects from the document</source>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Список фильтров по значению свойств, перечисленных через точку с запятой (;). Добавьте восклицательный знак (!) к имени свойства, чтобы инвертировать действие фильтра (исключить объекты, соответствующие фильтру). Объекты, чье свойство содержит значение, будут найдены. Примеры допустимых фильтров (все фильтры не чувствительны к регистру): Name:Wall - будут рассматриваться только объекты с 'wall' в их имени (внутреннее имя); !Name:Wall - будут рассматриваться только объекты, которые НЕ имеют 'wall' в их имени (внутреннее имя); Description:Win - будут рассматриваться только объекты с 'win' в их описании; !Label:Win - будут рассматриваться только объекты, которые НЕ имеют 'win' в их метке; IfcType:Wall - будут рассматриваться только объекты, Ifc Type которых 'Wall'; !Tag:Wall - будут рассматриваться только объекты, тег которых НЕ 'Wall'. Если оставить это поле пустым, фильтрация не будет применяться</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_sl.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_sl.ts
+1 -1
View File
@@ -334,7 +334,7 @@ Pustite prazno, če želite uporabiti vse predmete v dokumentu</translation>
<message>
<location filename="../ui/ArchSchedule.ui" line="98"/>
<source>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</source>
<translation type="unfinished">An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied</translation>
<translation>Možnosten, s podpičjem (;) ločen seznam lastnostnih:vrednostnih sit. Predpnite imenu lastnosti !, če želite obrniti učinek sita (izvzeti predmete, ki ustrezajo situ). Predmeti, katerih lastnost vsebuje vrednost, bodo izbrani. Primeri veljavnih sit (nikjer ni razlikovanja velikih in malih črk): Ime:Stena - zaznani bodo le predmeti z besedo "stena" v (zalednem) imenu; Opis:Okn - zaznani bodo le predmeti, ki imajo v opisu "okn"; !Oznaka:Okn - zaznani bodo le predmeti, ki v oznaki NIMAJO "okn"; IfcType:Wall - zaznani bodo le predmeti ki spada v Ifc vrsto "Wall" (stena); !Značka:Stena - zaznani bodo le predmeti, ki NIMAJO značke "Stena". Če to polje pustite prazno, se ne preseja</translation>
</message>
<message>
<location filename="../ui/ArchSchedule.ui" line="194"/>
src/Mod/Arch/Resources/translations/Arch_uk.qm
BIN
View File
Binary file not shown.
src/Mod/Arch/Resources/translations/Arch_uk.ts
+1 -1
View File
@@ -2252,7 +2252,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela
<message>
<location filename="../../ArchCutPlane.py" line="153"/>
<source>Cutting</source>
<translation>Перерізання</translation>
<translation>Переріз</translation>
</message>
<message>
<location filename="../../ArchCutPlane.py" line="187"/>
src/Mod/Arch/import3DS.py
+1 -1
View File
@@ -50,7 +50,7 @@ def open(filename):
"called when freecad wants to open a file"
if not check3DS():
return
docname = (os.path.splitext(os.path.basename(filename))[0]).encode("utf8")
docname = os.path.splitext(os.path.basename(filename))[0]
doc = FreeCAD.newDocument(docname)
doc.Label = docname
FreeCAD.ActiveDocument = doc
src/Mod/Arch/importDAE.py
+1 -1
View File
@@ -90,7 +90,7 @@ def open(filename):
if not checkCollada():
return
docname = (os.path.splitext(os.path.basename(filename))[0]).encode("utf8")
docname = os.path.splitext(os.path.basename(filename))[0]
doc = FreeCAD.newDocument(docname)
doc.Label = docname
FreeCAD.ActiveDocument = doc
src/Mod/Arch/importOBJ.py
+2 -2
View File
@@ -279,8 +279,8 @@ def export(exportList,filename,colors=None):
def open(filename):
"called when freecad wants to open a file"
docname = (os.path.splitext(os.path.basename(filename))[0])
doc = FreeCAD.newDocument(docname.encode("utf8"))
docname = os.path.splitext(os.path.basename(filename))[0]
doc = FreeCAD.newDocument(docname)
doc.Label = docname
return insert(filename,doc.Name)
src/Mod/Arch/importSH3D.py
+1 -1
View File
@@ -49,7 +49,7 @@ if open.__module__ in ['__builtin__','io']:
def open(filename):
"called when freecad wants to open a file"
docname = (os.path.splitext(os.path.basename(filename))[0]).encode("utf8")
docname = os.path.splitext(os.path.basename(filename))[0]
doc = FreeCAD.newDocument(docname)
doc.Label = docname
FreeCAD.ActiveDocument = doc
src/Mod/Draft/Resources/translations/Draft_ca.qm
BIN
View File
Binary file not shown.
src/Mod/Draft/Resources/translations/Draft_ca.ts
+74 -74
View File
@@ -3746,77 +3746,77 @@ Per habilitar FreeCAD a descarregar aquestes llibreries, respongui Si.</translat
<message>
<location filename="../../draftguitools/gui_edit.py" line="536"/>
<source>No edit point found for selected object</source>
<translation type="unfinished">No edit point found for selected object</translation>
<translation>No s`ha trobat cap punt d'edició per l'objecte seleccionat</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit.py" line="789"/>
<source>Too many objects selected, max number set to:</source>
<translation type="unfinished">Too many objects selected, max number set to:</translation>
<translation>S'han seleccionat massa objectes, el màxim està establert en:</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit.py" line="797"/>
<source>: this object is not editable</source>
<translation type="unfinished">: this object is not editable</translation>
<translation>: aquest objete no es editable</translation>
</message>
<message>
<location filename="../../draftguitools/gui_annotationstyleeditor.py" line="68"/>
<source>Annotation style editor</source>
<translation type="unfinished">Annotation style editor</translation>
<translation>Editor d'estils d'anotació</translation>
</message>
<message>
<location filename="../../draftguitools/gui_annotationstyleeditor.py" line="294"/>
<source>Open styles file</source>
<translation type="unfinished">Open styles file</translation>
<translation>Obre el fitxer d'estils</translation>
</message>
<message>
<location filename="../../draftguitools/gui_annotationstyleeditor.py" line="296"/>
<location filename="../../draftguitools/gui_annotationstyleeditor.py" line="316"/>
<source>JSON file (*.json)</source>
<translation type="unfinished">JSON file (*.json)</translation>
<translation>Fitxer JSON (*.json)</translation>
</message>
<message>
<location filename="../../draftguitools/gui_annotationstyleeditor.py" line="314"/>
<source>Save styles file</source>
<translation type="unfinished">Save styles file</translation>
<translation>Desa el fitxer d'estils</translation>
</message>
<message>
<location filename="../../draftguitools/gui_shape2dview.py" line="68"/>
<source>Select an object to project</source>
<translation type="unfinished">Select an object to project</translation>
<translation>Seleccioneu un objecte a projectar</translation>
</message>
<message>
<location filename="../../draftguitools/gui_points.py" line="134"/>
<location filename="../../draftguitools/gui_points.py" line="147"/>
<source>Create Point</source>
<translation type="unfinished">Create Point</translation>
<translation>Crear Punt</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="79"/>
<source>Select an object to rotate</source>
<translation type="unfinished">Select an object to rotate</translation>
<translation>Seleccioneu un objecte per girar</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="99"/>
<source>Pick rotation center</source>
<translation type="unfinished">Pick rotation center</translation>
<translation>Trieu el centre de rotació</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="193"/>
<location filename="../../draftguitools/gui_rotate.py" line="403"/>
<source>Base angle</source>
<translation type="unfinished">Base angle</translation>
<translation>Angle de base</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="194"/>
<location filename="../../draftguitools/gui_rotate.py" line="404"/>
<source>The base angle you wish to start the rotation from</source>
<translation type="unfinished">The base angle you wish to start the rotation from</translation>
<translation>L'angle de base d'on voleu iniciar la rotació</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="199"/>
<location filename="../../draftguitools/gui_rotate.py" line="407"/>
<source>Pick base angle</source>
<translation type="unfinished">Pick base angle</translation>
<translation>Trieu angle de base</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="205"/>
@@ -3829,29 +3829,29 @@ Per habilitar FreeCAD a descarregar aquestes llibreries, respongui Si.</translat
<location filename="../../draftguitools/gui_rotate.py" line="417"/>
<source>The amount of rotation you wish to perform.
The final angle will be the base angle plus this amount.</source>
<translation type="unfinished">The amount of rotation you wish to perform.
The final angle will be the base angle plus this amount.</translation>
<translation>La quantitat de rotació que voleu realitzar.
L'angle final serà l'angle de base més aquesta quantitat.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_rotate.py" line="213"/>
<location filename="../../draftguitools/gui_rotate.py" line="425"/>
<source>Pick rotation angle</source>
<translation type="unfinished">Pick rotation angle</translation>
<translation>Trieu angle de rotació</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="65"/>
<source>Add to group</source>
<translation type="unfinished">Add to group</translation>
<translation>Afegir a el grup</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="68"/>
<source>Ungroup</source>
<translation type="unfinished">Ungroup</translation>
<translation>Desagrupa</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="70"/>
<source>Add new group</source>
<translation type="unfinished">Add new group</translation>
<translation>Afegir un nou grup</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="159"/>
@@ -3861,7 +3861,7 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_groups.py" line="193"/>
<source>No new selection. You must select non-empty groups or objects inside groups.</source>
<translation type="unfinished">No new selection. You must select non-empty groups or objects inside groups.</translation>
<translation>Cap selecció nova. Heu de seleccionar grups no buits o objectes dins dels grups.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="203"/>
@@ -3871,27 +3871,27 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_groups.py" line="250"/>
<source>Add new Layer</source>
<translation type="unfinished">Add new Layer</translation>
<translation>Afegir una nova capa</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="304"/>
<source>Add to construction group</source>
<translation type="unfinished">Add to construction group</translation>
<translation>Afegir al grup de construcció</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="355"/>
<source>Add a new group with a given name</source>
<translation type="unfinished">Add a new group with a given name</translation>
<translation>Afegiu un grup nou amb un nom donat</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="383"/>
<source>Add group</source>
<translation type="unfinished">Add group</translation>
<translation>Afegir grup</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="385"/>
<source>Group name</source>
<translation type="unfinished">Group name</translation>
<translation>Nom del grup</translation>
</message>
<message>
<location filename="../../draftguitools/gui_groups.py" line="392"/>
@@ -3906,52 +3906,52 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_edit_sketcher_objects.py" line="63"/>
<source>Sketch is too complex to edit: it is suggested to use sketcher default editor</source>
<translation type="unfinished">Sketch is too complex to edit: it is suggested to use sketcher default editor</translation>
<translation>L'esbós és massa complex per editar-lo: es suggereix usar l'editor d'esbossos per defecte</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="76"/>
<source>Fillet radius</source>
<translation type="unfinished">Fillet radius</translation>
<translation>Radi d'arrodoniment</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="79"/>
<source>Radius of fillet</source>
<translation type="unfinished">Radius of fillet</translation>
<translation>Radi de l'arrodoniment</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="107"/>
<source>Enter radius.</source>
<translation type="unfinished">Enter radius.</translation>
<translation>Entreu un radi.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="126"/>
<source>Delete original objects:</source>
<translation type="unfinished">Delete original objects:</translation>
<translation>Esborra els objectes originals:</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="131"/>
<source>Chamfer mode:</source>
<translation type="unfinished">Chamfer mode:</translation>
<translation>Mode de xamfrà:</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="148"/>
<source>Two elements needed.</source>
<translation type="unfinished">Two elements needed.</translation>
<translation>Calen dos elements.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="155"/>
<source>Test object</source>
<translation type="unfinished">Test object</translation>
<translation>Objecte de prova</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="156"/>
<source>Test object removed</source>
<translation type="unfinished">Test object removed</translation>
<translation>S'ha esborrat l'objecte de prova</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="158"/>
<source>Fillet cannot be created</source>
<translation type="unfinished">Fillet cannot be created</translation>
<translation>No es pot crear l'arrodoniment</translation>
</message>
<message>
<location filename="../../draftguitools/gui_fillets.py" line="188"/>
@@ -3961,70 +3961,70 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_polygons.py" line="231"/>
<source>Create Polygon (Part)</source>
<translation type="unfinished">Create Polygon (Part)</translation>
<translation>Crea Polígon (Peça)</translation>
</message>
<message>
<location filename="../../draftguitools/gui_polygons.py" line="250"/>
<source>Create Polygon</source>
<translation type="unfinished">Create Polygon</translation>
<translation>Crea Polígon</translation>
</message>
<message>
<location filename="../../draftguitools/gui_split.py" line="64"/>
<source>Click anywhere on a line to split it.</source>
<translation type="unfinished">Click anywhere on a line to split it.</translation>
<translation>Cliqueu a aqualsevol punt d'una línia per a dividir-la.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_split.py" line="106"/>
<source>Split line</source>
<translation type="unfinished">Split line</translation>
<translation>Dividir línia</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="94"/>
<source>Select objects to trim or extend</source>
<translation type="unfinished">Select objects to trim or extend</translation>
<translation>Seleccioneu objecte(s) per a retallar o allargar</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="173"/>
<location filename="../../draftguitools/gui_offset.py" line="146"/>
<source>Pick distance</source>
<translation type="unfinished">Pick distance</translation>
<translation>Tria la distància</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="222"/>
<source>Offset angle</source>
<translation type="unfinished">Offset angle</translation>
<translation>Angle de Ofset</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="483"/>
<source>Unable to trim these objects, only Draft wires and arcs are supported.</source>
<translation type="unfinished">Unable to trim these objects, only Draft wires and arcs are supported.</translation>
<translation>No es poden retallar aquests objectes, només es permeten polilínies i arcs.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="488"/>
<source>Unable to trim these objects, too many wires</source>
<translation type="unfinished">Unable to trim these objects, too many wires</translation>
<translation>No es poden retallar aquests objectes, massa polilínies</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="505"/>
<source>These objects don't intersect.</source>
<translation type="unfinished">These objects don't intersect.</translation>
<translation>Aquests objectes no s'intersequen.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_trimex.py" line="508"/>
<source>Too many intersection points.</source>
<translation type="unfinished">Too many intersection points.</translation>
<translation>Massa punts d'intersecció.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_splines.py" line="120"/>
<source>Spline has been closed</source>
<translation type="unfinished">Spline has been closed</translation>
<translation>S'ha tancat la Spline</translation>
</message>
<message>
<location filename="../../draftguitools/gui_splines.py" line="131"/>
<location filename="../../draftguitools/gui_beziers.py" line="142"/>
<location filename="../../draftguitools/gui_beziers.py" line="381"/>
<source>Last point has been removed</source>
<translation type="unfinished">Last point has been removed</translation>
<translation>S'ha esborrat l'últim punt</translation>
</message>
<message>
<location filename="../../draftguitools/gui_splines.py" line="182"/>
@@ -4034,19 +4034,19 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_styles.py" line="75"/>
<source>Change Style</source>
<translation type="unfinished">Change Style</translation>
<translation>Canvia l'estil</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="92"/>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="601"/>
<source>This object does not support possible coincident points, please try again.</source>
<translation type="unfinished">This object does not support possible coincident points, please try again.</translation>
<translation>Aquest objecte no suporta punts coincidents possibles, si us plau, torneu a provar-ho.</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="109"/>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="618"/>
<source>Delete point</source>
<translation type="unfinished">Delete point</translation>
<translation>Suprimir punt</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="114"/>
@@ -4057,7 +4057,7 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="124"/>
<source>Open wire</source>
<translation type="unfinished">Open wire</translation>
<translation>Obrir polilínia</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="127"/>
@@ -4067,111 +4067,111 @@ The final angle will be the base angle plus this amount.</translation>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="132"/>
<source>Reverse wire</source>
<translation type="unfinished">Reverse wire</translation>
<translation>Invertir polilínia</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="177"/>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="840"/>
<source>Active object must have more than two points/nodes</source>
<translation type="unfinished">Active object must have more than two points/nodes</translation>
<translation>L'objecte actiu ha de tenir més de dos punts/nodes</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="200"/>
<source>Open spline</source>
<translation type="unfinished">Open spline</translation>
<translation>Obrir spline</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="203"/>
<source>Close spline</source>
<translation type="unfinished">Close spline</translation>
<translation>Tancar spline</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="206"/>
<source>Reverse spline</source>
<translation type="unfinished">Reverse spline</translation>
<translation>Invertir spline</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="371"/>
<source>Move arc</source>
<translation type="unfinished">Move arc</translation>
<translation>Moure arc</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="375"/>
<source>Set first angle</source>
<translation type="unfinished">Set first angle</translation>
<translation>Estableix el primer angle</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="379"/>
<source>Set last angle</source>
<translation type="unfinished">Set last angle</translation>
<translation>Estableix l'últim angle</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="383"/>
<source>Set radius</source>
<translation type="unfinished">Set radius</translation>
<translation>Establir radi</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="408"/>
<source>Invert arc</source>
<translation type="unfinished">Invert arc</translation>
<translation>Invertir arc</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="619"/>
<source>Make sharp</source>
<translation type="unfinished">Make sharp</translation>
<translation>Fer afilat</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="620"/>
<source>Make tangent</source>
<translation type="unfinished">Make tangent</translation>
<translation>Fer tangent</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="621"/>
<source>Make symmetric</source>
<translation type="unfinished">Make symmetric</translation>
<translation>Fer simètric</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="628"/>
<source>Reverse curve</source>
<translation type="unfinished">Reverse curve</translation>
<translation>Invertir corba</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="634"/>
<source>Open curve</source>
<translation type="unfinished">Open curve</translation>
<translation>Obrir corba</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="637"/>
<source>Close curve</source>
<translation type="unfinished">Close curve</translation>
<translation>Tancar corba</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="751"/>
<source>Selection is not a Knot</source>
<translation type="unfinished">Selection is not a Knot</translation>
<translation>La selecció no és un Nus</translation>
</message>
<message>
<location filename="../../draftguitools/gui_edit_draft_objects.py" line="778"/>
<source>Endpoint of BezCurve can't be smoothed</source>
<translation type="unfinished">Endpoint of BezCurve can't be smoothed</translation>
<translation>El punt final d'una corba Bézier no es pot suavitzar</translation>
</message>
<message>
<location filename="../../draftguitools/gui_beziers.py" line="134"/>
<location filename="../../draftguitools/gui_beziers.py" line="345"/>
<source>Bézier curve has been closed</source>
<translation type="unfinished">Bézier curve has been closed</translation>
<translation>S’ha tancat la corba Bézier</translation>
</message>
<message>
<location filename="../../draftguitools/gui_beziers.py" line="212"/>
<location filename="../../draftguitools/gui_beziers.py" line="466"/>
<source>Create BezCurve</source>
<translation type="unfinished">Create BezCurve</translation>
<translation>Crear corba Bézier</translation>
</message>
<message>
<location filename="../../draftguitools/gui_beziers.py" line="389"/>
<location filename="../../draftguitools/gui_beziers.py" line="393"/>
<source>Click and drag to define next knot</source>
<translation type="unfinished">Click and drag to define next knot</translation>
<translation>Feu clic i arrossegueu per definir el següent nus</translation>
</message>
<message>
<location filename="../../draftguitools/gui_ellipses.py" line="128"/>
src/Mod/Draft/Resources/translations/Draft_gl.qm
BIN
View File
Binary file not shown.
src/Mod/Draft/Resources/translations/Draft_gl.ts
+2 -2
View File
@@ -119,13 +119,13 @@
<message>
<location filename="../ui/dialog_AnnotationStyleEditor.ui" line="265"/>
<source>Show line</source>
<translation type="unfinished">Show line</translation>
<translation>Mostrar liña</translation>
</message>
<message>
<location filename="../ui/dialog_AnnotationStyleEditor.ui" line="288"/>
<location filename="../ui/dialog_AnnotationStyleEditor.ui" line="298"/>
<source>The width of the lines</source>
<translation type="unfinished">The width of the lines</translation>
<translation>A largura das liñas</translation>
</message>
<message>
<location filename="../ui/dialog_AnnotationStyleEditor.ui" line="301"/>
src/Mod/Draft/Resources/translations/Draft_nl.qm
BIN
View File
Binary file not shown.
src/Mod/Draft/Resources/translations/Draft_nl.ts
+1 -1
View File
@@ -5471,7 +5471,7 @@ from menu Tools -&gt; Addon Manager</translation>
<message>
<location filename="../../draftguitools/gui_setstyle.py" line="292"/>
<source>Warning</source>
<translation type="unfinished">Warning</translation>
<translation>Waarschuwing</translation>
</message>
<message>
<location filename="../../draftguitools/gui_setstyle.py" line="293"/>
src/Mod/Draft/Resources/translations/Draft_pt-BR.qm
BIN
View File
Binary file not shown.
src/Mod/Draft/Resources/translations/Draft_pt-BR.ts
+172 -174
View File
File diff suppressed because it is too large Load Diff
src/Mod/Draft/importDWG.py
+22 -18
View File
@@ -135,8 +135,8 @@ def export(objectslist, filename):
def get_libredwg_converter(typ):
"""Find the LibreDWG converter.
It searches the FreeCAD parameters database, then searches the OS search path
on Linux and Windows systems. There are no standard installation paths.
It searches the FreeCAD parameters database, then searches the OS search path.
There are no standard installation paths.
`typ` is required because LibreDWG uses two converters and we store only one.
@@ -161,14 +161,14 @@ def get_libredwg_converter(typ):
path = os.path.dirname(path) + "/" + typ + os.path.splitext(path)[1]
if os.path.exists(path) and os.path.isfile(path):
return path
elif platform.system() == "Linux":
for sub in os.getenv("PATH").split(":"):
path = sub + "/" + typ
elif platform.system() == "Windows":
for sub in os.getenv("PATH").split(os.pathsep):
path = sub.replace("\\", "/") + "/" + typ + ".exe"
if os.path.exists(path) and os.path.isfile(path):
return path
elif platform.system() == "Windows":
for sub in os.getenv("PATH").split(";"):
path = sub.replace("\\", "/") + "/" + typ + ".exe"
else: # for Linux and macOS
for sub in os.getenv("PATH").split(os.pathsep):
path = sub + "/" + typ
if os.path.exists(path) and os.path.isfile(path):
return path
@@ -178,8 +178,7 @@ def get_libredwg_converter(typ):
def get_oda_converter():
"""Find the ODA converter.
It searches the FreeCAD parameters database, then searches for common
paths on Linux and Windows systems.
It searches the FreeCAD parameters database, then searches for common paths.
Parameters
----------
@@ -199,10 +198,6 @@ def get_oda_converter():
if "ODAFileConverter" in path: # path set manually
if os.path.exists(path) and os.path.isfile(path):
return path
elif platform.system() == "Linux":
path = "/usr/bin/ODAFileConverter"
if os.path.exists(path) and os.path.isfile(path):
return path
elif platform.system() == "Windows":
odadir = os.path.expandvars("%ProgramFiles%\\ODA").replace("\\", "/")
if os.path.exists(odadir):
@@ -210,6 +205,14 @@ def get_oda_converter():
path = odadir + "/" + sub + "/" + "ODAFileConverter.exe"
if os.path.exists(path) and os.path.isfile(path):
return path
elif platform.system() == "Linux":
path = "/usr/bin/ODAFileConverter"
if os.path.exists(path) and os.path.isfile(path):
return path
else: # for macOS
path = "/Applications/ODAFileConverter.app/Contents/MacOS/ODAFileConverter"
if os.path.exists(path) and os.path.isfile(path):
return path
return None
@@ -217,8 +220,7 @@ def get_oda_converter():
def get_qcad_converter():
"""Find the QCAD converter.
It searches the FreeCAD parameters database, then searches for common
paths on Linux and Windows systems.
It searches the FreeCAD parameters database, then searches for common paths.
Parameters
----------
@@ -237,6 +239,8 @@ def get_qcad_converter():
if "dwg2dwg" in path: # path set manually
pass
elif platform.system() == "Windows":
path = os.path.expandvars("%ProgramFiles%\\QCAD\\dwg2dwg.bat").replace("\\", "/")
elif platform.system() == "Linux":
# /home/$USER/opt/qcad-3.28.1-trial-linux-qt5.14-x86_64/dwg2dwg
path = os.path.expandvars("/home/$USER/opt")
@@ -244,8 +248,8 @@ def get_qcad_converter():
if "qcad" in sub:
path = path + "/" + sub + "/" + "dwg2dwg"
break
elif platform.system() == "Windows":
path = os.path.expandvars("%ProgramFiles%\\QCAD\\dwg2dwg.bat").replace("\\", "/")
else: # for macOS
path = "/Applications/QCAD.app/Contents/Resources/dwg2dwg"
if os.path.exists(path) and os.path.isfile(path):
return path
src/Mod/Fem/CMakeLists.txt
-15
View File
@@ -96,8 +96,6 @@ SET(FemExamples_SRCS
femexamples/square_pipe_end_twisted_edgeforces.py
femexamples/square_pipe_end_twisted_nodeforces.py
femexamples/thermomech_bimetall.py
femexamples/thermomech_flow1d.py
femexamples/thermomech_spine.py
femexamples/truss_3d_cs_circle_ele_seg2.py
femexamples/truss_3d_cs_circle_ele_seg3.py
)
@@ -135,8 +133,6 @@ SET(FemExampleMeshes_SRCS
femexamples/meshes/mesh_selfweight_cantilever_tetra10.py
femexamples/meshes/mesh_square_pipe_end_twisted_tria6.py
femexamples/meshes/mesh_thermomech_bimetall_tetra10.py
femexamples/meshes/mesh_thermomech_flow1d_seg3.py
femexamples/meshes/mesh_thermomech_spine_tetra10.py
femexamples/meshes/mesh_transform_beam_hinged_tetra10.py
femexamples/meshes/mesh_transform_torque_tetra10.py
femexamples/meshes/mesh_truss_crane_seg2.py
@@ -381,17 +377,6 @@ SET(FemTestsCcx_SRCS
femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp
femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp
femtest/data/calculix/thermomech_bimetall.inp
femtest/data/calculix/thermomech_flow1D.inp
femtest/data/calculix/thermomech_flow1D.dat
femtest/data/calculix/thermomech_flow1D.frd
femtest/data/calculix/thermomech_flow1D_expected_values
femtest/data/calculix/thermomech_flow1D_inout_nodes.txt
femtest/data/calculix/thermomech_flow1D.FCStd
femtest/data/calculix/thermomech_spine.inp
femtest/data/calculix/thermomech_spine.dat
femtest/data/calculix/thermomech_spine.frd
femtest/data/calculix/thermomech_spine_expected_values
femtest/data/calculix/thermomech_spine.FCStd
)
SET(FemTestsElmer_SRCS
src/Mod/Fem/Gui/Resources/translations/Fem_be.ts
+2 -2
View File
@@ -5368,12 +5368,12 @@ used for the Elmer solver</source>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Электрамагнітныя абмежаванні</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Электрамагнітныя абмежаванні</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_de.ts
+2 -2
View File
@@ -5369,12 +5369,12 @@ für den Löser Elmer verwendet werden</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Elektromagnetische Randbedingungen</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Elektromagnetische Randbedingungen</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_es-AR.ts
+2 -2
View File
@@ -5393,12 +5393,12 @@ usada por el solver Elmer</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Restricciones electromagnéticas</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>Restricciones &amp;electromagnéticas</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_es-ES.ts
+2 -2
View File
@@ -5393,12 +5393,12 @@ usada por el solver Elmer</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Restricciones electromagnéticas</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>Restricciones &amp;electromagnéticas</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_eu.ts
+2 -2
View File
@@ -5395,12 +5395,12 @@ Elmer ebazlean</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Murrizketa elektromagnetikoak</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Murrizketa elektromagnetikoak</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_fr.ts
+2 -2
View File
@@ -5389,12 +5389,12 @@ used for the Elmer solver</source>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Contraintes électromagnétiques</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>Contraintes &amp;électromagnétiques</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_hu.ts
+2 -2
View File
@@ -5380,12 +5380,12 @@ az Elmer megoldóhoz</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Elektromágneses kényszerítések</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Elektromágneses kényszerítések</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_ka.ts
+2 -2
View File
@@ -5384,12 +5384,12 @@ used for the Elmer solver</source>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>ელექტრომაგნიტური შეზღუდვები</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;ელექტრომაგნიტური შეზღუდვები</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_nl.ts
+2 -2
View File
@@ -5394,12 +5394,12 @@ used for the Elmer solver</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Elektromagnetische beperkingen</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Elektromagnetische beperkingen</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_pl.ts
+2 -2
View File
@@ -5384,12 +5384,12 @@ użyta przez solver Elmer</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Wiązania elektromagnetyczne</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Wiązania elektromagnetyczne</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts
+2 -2
View File
@@ -5382,12 +5382,12 @@ used for the Elmer solver</source>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Электромагнитные граничные условия</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Электромагнитные граничные условия</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_sl.ts
+4 -4
View File
@@ -3244,12 +3244,12 @@ Opomba: nima učinka, če je izbrano telo</translation>
<message>
<location filename="../ui/ElectrostaticPotential.ui" line="544"/>
<source>Whether the constraint defines a farfield potential</source>
<translation type="unfinished">Whether the constraint defines a farfield potential</translation>
<translation>Ali omejilo določa daljnopoljni potencial</translation>
</message>
<message>
<location filename="../ui/ElectrostaticPotential.ui" line="547"/>
<source>Farfield / Electric infinity</source>
<translation type="unfinished">Farfield / Electric infinity</translation>
<translation>Daljno polje / Električna neskončnost</translation>
</message>
<message>
<location filename="../ui/ElectrostaticPotential.ui" line="554"/>
@@ -5394,12 +5394,12 @@ used for the Elmer solver</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Elektromagnetna omejila</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Elektromagnetna omejila</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_sr-CS.ts
+2 -2
View File
@@ -5392,12 +5392,12 @@ used for the Elmer solver</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Elektromagnetna ograničenja</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Elektromagnetna ograničenja</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_sr.ts
+2 -2
View File
@@ -5392,12 +5392,12 @@ used for the Elmer solver</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Електромагнетна ограничења</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Електромагнетна ограничења</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/translations/Fem_uk.ts
+2 -2
View File
@@ -5395,12 +5395,12 @@ used for the Elmer solver</translation>
<message>
<location filename="../../Workbench.cpp" line="53"/>
<source>Electromagnetic Constraints</source>
<translation type="unfinished">Electromagnetic Constraints</translation>
<translation>Електромагнітні обмеження</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="54"/>
<source>&amp;Electromagnetic Constraints</source>
<translation type="unfinished">&amp;Electromagnetic Constraints</translation>
<translation>&amp;Електромагнітні обмеження</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="55"/>
src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui
+2 -2
View File
@@ -51,7 +51,7 @@
<item row="3" column="1">
<widget class="Gui::InputField" name="if_max">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -95,7 +95,7 @@
<item row="4" column="1">
<widget class="Gui::InputField" name="if_min">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
src/Mod/Fem/femexamples/manager.py
-4
View File
@@ -87,8 +87,6 @@ def run_all():
run_example("square_pipe_end_twisted_edgeforces", run_solver=True)
run_example("square_pipe_end_twisted_nodeforces", run_solver=True)
run_example("thermomech_bimetall", run_solver=True)
run_example("thermomech_flow1d", run_solver=True)
run_example("thermomech_spine", run_solver=True)
def setup_all():
@@ -127,8 +125,6 @@ def setup_all():
run_example("square_pipe_end_twisted_edgeforces")
run_example("square_pipe_end_twisted_nodeforces")
run_example("thermomech_bimetall")
run_example("thermomech_flow1d")
run_example("thermomech_spine")
def run_analysis(doc, base_name, filepath="", run_solver=False):
src/Mod/Fem/femexamples/thermomech_flow1d.py
-271
View File
@@ -1,271 +0,0 @@
# ***************************************************************************
# * Copyright (c) 2019 Bernd Hahnebach <[email protected]> *
# * Copyright (c) 2020 Sudhanshu Dubey <[email protected] *
# * *
# * This file is part of the FreeCAD CAx development system. *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU Lesser General Public License (LGPL) *
# * as published by the Free Software Foundation; either version 2 of *
# * the License, or (at your option) any later version. *
# * for detail see the LICENCE text file. *
# * *
# * This program is distributed in the hope that it will be useful, *
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
# * GNU Library General Public License for more details. *
# * *
# * You should have received a copy of the GNU Library General Public *
# * License along with this program; if not, write to the Free Software *
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
# * USA *
# * *
# ***************************************************************************
import FreeCAD
from FreeCAD import Vector as vec
from Draft import makeWire
import Fem
import ObjectsFem
from . import manager
from .manager import get_meshname
from .manager import init_doc
def get_information():
return {
"name": "Thermomech Flow 1D",
"meshtype": "edge",
"meshelement": "Seg3",
"constraints": ["self weight"],
"solvers": ["calculix", "ccxtools"],
"material": "fluid",
"equations": ["thermomechanical"]
}
def get_explanation(header=""):
return header + """
To run the example from Python console use:
from femexamples.thermomech_flow1d import setup
setup()
See forum topic post:
https://forum.freecad.org/viewtopic.php?f=18&t=20076
"""
def setup(doc=None, solvertype="ccxtools"):
# init FreeCAD document
if doc is None:
doc = init_doc()
# explanation object
# just keep the following line and change text string in get_explanation method
manager.add_explanation_obj(doc, get_explanation(manager.get_header(get_information())))
# geometric objects
p1 = vec(0, 0, 50)
p2 = vec(0, 0, -50)
p3 = vec(0, 0, -4300)
p4 = vec(4950, 0, -4300)
p5 = vec(5000, 0, -4300)
p6 = vec(8535.53, 0, -7835.53)
p7 = vec(8569.88, 0, -7870.88)
p8 = vec(12105.41, 0, -11406.41)
p9 = vec(12140.76, 0, -11441.76)
p10 = vec(13908.53, 0, -13209.53)
p11 = vec(13943.88, 0, -13244.88)
p12 = vec(15046.97, 0, -14347.97)
p13 = vec(15046.97, 0, -7947.97)
p14 = vec(15046.97, 0, -7847.97)
p15 = vec(0, 0, 0)
p16 = vec(0, 0, -2175)
p17 = vec(2475, 0, -4300)
p18 = vec(4975, 0, -4300)
p19 = vec(6767.765, 0, -6067.765)
p20 = vec(8552.705, 0, -7853.205)
p21 = vec(10337.645, 0, -9638.645)
p22 = vec(12123.085, 0, -11424.085)
p23 = vec(13024.645, 0, -12325.645)
p24 = vec(13926.205, 0, -13227.205)
p25 = vec(14495.425, 0, -13796.425)
p26 = vec(15046.97, 0, -11147.97)
p27 = vec(15046.97, 0, -7897.97)
points = [
p1, p2, p3, p4, p5, p6, p7, p8, p9, p10,
p11, p12, p13, p14, p15, p16, p17, p18, p19, p20,
p21, p22, p23, p24, p25, p26, p27
]
geom_obj = makeWire(
points,
closed=False,
face=False,
support=None
)
doc.recompute()
if FreeCAD.GuiUp:
geom_obj.ViewObject.Document.activeView().viewAxonometric()
geom_obj.ViewObject.Document.activeView().fitAll()
# analysis
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = analysis.addObject(
ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
)[0]
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "thermomech"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = True
solver_obj.MatrixSolverType = "default"
solver_obj.IterationsThermoMechMaximum = 2000
solver_obj.IterationsControlParameterTimeUse = False
analysis.addObject(solver_obj)
# material
material_obj = ObjectsFem.makeMaterialFluid(doc, "FluidMaterial")
mat = material_obj.Material
mat["Name"] = "Water"
mat["Density"] = "998 kg/m^3"
mat["SpecificHeat"] = "4182 J/kg/K"
mat["DynamicViscosity"] = "1.003e-3 kg/m/s"
mat["ThermalExpansionCoefficient"] = "2.07e-4 m/m/K"
mat["ThermalConductivity"] = "0.591 W/m/K"
material_obj.Material = mat
analysis.addObject(material_obj)
inlet = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
inlet.SectionType = "Liquid"
inlet.LiquidSectionType = "PIPE INLET"
inlet.InletPressure = 0.1
inlet.References = [(geom_obj, "Edge1")]
analysis.addObject(inlet)
entrance = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
entrance.SectionType = "Liquid"
entrance.LiquidSectionType = "PIPE ENTRANCE"
entrance.EntrancePipeArea = 31416.00
entrance.EntranceArea = 25133.00
entrance.References = [(geom_obj, "Edge2")]
analysis.addObject(entrance)
manning1 = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
manning1.SectionType = "Liquid"
manning1.LiquidSectionType = "PIPE MANNING"
manning1.ManningArea = 31416
manning1.ManningRadius = 50
manning1.ManningCoefficient = 0.002
manning1.References = [(geom_obj, "Edge3"), (geom_obj, "Edge5")]
analysis.addObject(manning1)
bend = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
bend.SectionType = "Liquid"
bend.LiquidSectionType = "PIPE BEND"
bend.BendPipeArea = 31416
bend.BendRadiusDiameter = 1.5
bend.BendAngle = 45
bend.BendLossCoefficient = 0.4
bend.References = [(geom_obj, "Edge4")]
analysis.addObject(bend)
enlargement1 = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
enlargement1.SectionType = "Liquid"
enlargement1.LiquidSectionType = "PIPE ENLARGEMENT"
enlargement1.EnlargeArea1 = 31416.00
enlargement1.EnlargeArea2 = 70686.00
enlargement1.References = [(geom_obj, "Edge6")]
analysis.addObject(enlargement1)
manning2 = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
manning2.SectionType = "Liquid"
manning2.LiquidSectionType = "PIPE MANNING"
manning2.ManningArea = 70686.00
manning2.ManningRadius = 75
manning2.ManningCoefficient = 0.002
manning2.References = [(geom_obj, "Edge7")]
analysis.addObject(manning2)
contraction = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
contraction.SectionType = "Liquid"
contraction.LiquidSectionType = "PIPE CONTRACTION"
contraction.ContractArea1 = 70686
contraction.ContractArea2 = 17671
contraction.References = [(geom_obj, "Edge8")]
analysis.addObject(contraction)
manning3 = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
manning3.SectionType = "Liquid"
manning3.LiquidSectionType = "PIPE MANNING"
manning3.ManningArea = 17671.00
manning3.ManningRadius = 37.5
manning3.ManningCoefficient = 0.002
manning3.References = [(geom_obj, "Edge11"), (geom_obj, "Edge9")]
analysis.addObject(manning3)
gate_valve = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
gate_valve.SectionType = "Liquid"
gate_valve.LiquidSectionType = "PIPE GATE VALVE"
gate_valve.GateValvePipeArea = 17671
gate_valve.GateValveClosingCoeff = 0.5
gate_valve.References = [(geom_obj, "Edge10")]
analysis.addObject(gate_valve)
enlargement2 = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
enlargement2.SectionType = "Liquid"
enlargement2.LiquidSectionType = "PIPE ENLARGEMENT"
enlargement2.EnlargeArea1 = 17671
enlargement2.EnlargeArea2 = 1e12
enlargement2.References = [(geom_obj, "Edge12")]
analysis.addObject(enlargement2)
outlet = ObjectsFem.makeElementFluid1D(doc, "ElementFluid1D")
outlet.SectionType = "Liquid"
outlet.LiquidSectionType = "PIPE OUTLET"
outlet.OutletPressure = 0.1
outlet.References = [(geom_obj, "Edge13")]
analysis.addObject(outlet)
# self_weight_constraint
self_weight = ObjectsFem.makeConstraintSelfWeight(doc, "ConstraintSelfWeight")
self_weight.Gravity_x = 0.0
self_weight.Gravity_y = 0.0
self_weight.Gravity_z = -1.0
analysis.addObject(self_weight)
# mesh
from .meshes.mesh_thermomech_flow1d_seg3 import create_nodes, create_elements
fem_mesh = Fem.FemMesh()
control = create_nodes(fem_mesh)
if not control:
FreeCAD.Console.PrintError("Error on creating nodes.\n")
control = create_elements(fem_mesh)
if not control:
FreeCAD.Console.PrintError("Error on creating elements.\n")
femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0]
femmesh_obj.FemMesh = fem_mesh
femmesh_obj.Part = geom_obj
femmesh_obj.SecondOrderLinear = False
doc.recompute()
return doc
src/Mod/Fem/femexamples/thermomech_spine.py
-166
View File
@@ -1,166 +0,0 @@
# ***************************************************************************
# * Copyright (c) 2019 Bernd Hahnebach <[email protected]> *
# * Copyright (c) 2020 Sudhanshu Dubey <[email protected] *
# * *
# * This file is part of the FreeCAD CAx development system. *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU Lesser General Public License (LGPL) *
# * as published by the Free Software Foundation; either version 2 of *
# * the License, or (at your option) any later version. *
# * for detail see the LICENCE text file. *
# * *
# * This program is distributed in the hope that it will be useful, *
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
# * GNU Library General Public License for more details. *
# * *
# * You should have received a copy of the GNU Library General Public *
# * License along with this program; if not, write to the Free Software *
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
# * USA *
# * *
# ***************************************************************************
import FreeCAD
import Fem
import ObjectsFem
from . import manager
from .manager import get_meshname
from .manager import init_doc
def get_information():
return {
"name": "Thermomech Spine",
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "initial temperature", "temperature", "heatflux"],
"solvers": ["calculix", "ccxtools"],
"material": "solid",
"equations": ["thermomechanical"]
}
def get_explanation(header=""):
return header + """
To run the example from Python console use:
from femexamples.thermomech_spine import setup
setup()
See forum topic post:
...
"""
def setup(doc=None, solvertype="ccxtools"):
# init FreeCAD document
if doc is None:
doc = init_doc()
# explanation object
# just keep the following line and change text string in get_explanation method
manager.add_explanation_obj(doc, get_explanation(manager.get_header(get_information())))
# geometric object
geom_obj = doc.addObject("Part::Box", "Box")
geom_obj.Height = 25.4
geom_obj.Width = 25.4
geom_obj.Length = 203.2
doc.recompute()
if FreeCAD.GuiUp:
geom_obj.ViewObject.Document.activeView().viewAxonometric()
geom_obj.ViewObject.Document.activeView().fitAll()
# analysis
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
solver_obj.WorkingDir = u""
# should be possible with elmer too
# elif solvertype == "elmer":
# analysis.addObject(ObjectsFem.makeSolverElmer(doc, "SolverElmer"))
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "thermomech"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = True
solver_obj.MatrixSolverType = "default"
solver_obj.IterationsThermoMechMaximum = 2000
solver_obj.IterationsControlParameterTimeUse = True
analysis.addObject(solver_obj)
# material
material_obj = ObjectsFem.makeMaterialSolid(doc, "MechanicalMaterial")
mat = material_obj.Material
mat["Name"] = "Steel-Generic"
mat["YoungsModulus"] = "200000 MPa"
mat["PoissonRatio"] = "0.30"
mat["Density"] = "7900 kg/m^3"
mat["ThermalConductivity"] = "43.27 W/m/K" # SvdW: Change to Ansys model values
mat["ThermalExpansionCoefficient"] = "12 um/m/K"
mat["SpecificHeat"] = "500 J/kg/K" # SvdW: Change to Ansys model values
material_obj.Material = mat
analysis.addObject(material_obj)
# constraint fixed
con_fixed = ObjectsFem.makeConstraintFixed(doc, "FemConstraintFixed")
con_fixed.References = [(geom_obj, "Face1")]
analysis.addObject(con_fixed)
# constraint initialtemperature
name_inittemp = "FemConstraintInitialTemperature"
con_inittemp = ObjectsFem.makeConstraintInitialTemperature(doc, name_inittemp)
con_inittemp.initialTemperature = 300.0
analysis.addObject(con_inittemp)
# constraint temperature
con_temp = ObjectsFem.makeConstraintTemperature(doc, "FemConstraintTemperature")
con_temp.References = [(geom_obj, "Face1")]
con_temp.Temperature = 310.93
analysis.addObject(con_temp)
# constraint heatflux
con_heatflux = ObjectsFem.makeConstraintHeatflux(doc, "FemConstraintHeatflux")
con_heatflux.References = [
(geom_obj, "Face3"),
(geom_obj, "Face4"),
(geom_obj, "Face5"),
(geom_obj, "Face6")
]
con_heatflux.AmbientTemp = 255.3722
con_heatflux.FilmCoef = 5.678
analysis.addObject(con_heatflux)
# mesh
from .meshes.mesh_thermomech_spine_tetra10 import create_nodes, create_elements
fem_mesh = Fem.FemMesh()
control = create_nodes(fem_mesh)
if not control:
FreeCAD.Console.PrintError("Error on creating nodes.\n")
control = create_elements(fem_mesh)
if not control:
FreeCAD.Console.PrintError("Error on creating elements.\n")
femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0]
femmesh_obj.FemMesh = fem_mesh
femmesh_obj.Part = geom_obj
femmesh_obj.SecondOrderLinear = False
doc.recompute()
return doc
src/Mod/Fem/femmesh/gmshtools.py
-1
View File
@@ -869,7 +869,6 @@ class GmshTools():
# save mesh
geo.write("// save\n")
geo.write("Mesh.Format = 2;\n") # unv
if self.group_elements and self.group_nodes_export:
geo.write("// For each group save not only the elements but the nodes too.;\n")
geo.write("Mesh.SaveGroupsOfNodes = 1;\n")
src/Mod/Fem/femtest/app/test_ccxtools.py
-136
View File
@@ -135,62 +135,6 @@ class TestCcxTools(unittest.TestCase):
res_obj_name=res_obj_name,
)
# ********************************************************************************************
def test_thermomech_flow1D(
self
):
# set up
from femexamples.thermomech_flow1d import setup
setup(self.document, "ccxtools")
base_name = get_namefromdef("test_")
res_obj_name = "CCX_Time_1_0_Results"
analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
# test input file writing
fea = self.input_file_writing_test(
None,
base_name,
analysis_dir=analysis_dir,
test_end=True,
)
# test result reading
self.result_reading_test(
None,
base_name,
analysis_dir=analysis_dir,
fea=fea,
res_obj_name=res_obj_name,
)
# ********************************************************************************************
def test_thermomech_spine(
self
):
# set up
from femexamples.thermomech_spine import setup
setup(self.document, "ccxtools")
base_name = get_namefromdef("test_")
res_obj_name = "CCX_Results"
analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
# test input file writing
fea = self.input_file_writing_test(
None,
base_name,
analysis_dir=analysis_dir,
test_end=True,
)
# test result reading
self.result_reading_test(
None,
base_name,
analysis_dir=analysis_dir,
fea=fea,
res_obj_name=res_obj_name,
)
# ********************************************************************************************
def input_file_writing_test(
self,
@@ -434,86 +378,6 @@ def create_test_results():
shutil.copyfile(dat_result_file, dat_frequency_test_result_file)
print("Results copied to the appropriate FEM test dirs in: " + temp_dir)
# ****************************************************************************
# thermomech
print("create thermomech result files")
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
test_class + ".test_thermomech_spine_analysis")
)
thermomech_analysis_dir = join(temp_dir, "FEM_ccx_thermomech")
doc_thermomech = FreeCAD.open(join(thermomech_analysis_dir, "spine_thermomech.FCStd"))
FemGui.setActiveAnalysis(doc_thermomech.Analysis)
fea = ccxtools.FemToolsCcx()
fea.reset_all()
fea.run()
fea.load_results()
stats_thermomech = []
res_obj_thermo = doc_thermomech.getObject("CCX_Results001") # two time step results after run
for s in stat_types:
statval = resulttools.get_stats(res_obj_thermo, s)
stats_thermomech.append(
"{0}: ({1:.14g}, {2:.14g})\n"
.format(s, statval[0], statval[1])
)
thermomech_expected_values_file = join(
thermomech_analysis_dir,
"spine_thermomech_expected_values"
)
f = open(thermomech_expected_values_file, "w")
for s in stats_thermomech:
f.write(s)
f.close()
frd_result_file = os.path.splitext(fea.inp_file_name)[0] + ".frd"
dat_result_file = os.path.splitext(fea.inp_file_name)[0] + ".dat"
frd_thermomech_test_result_file = join(thermomech_analysis_dir, "spine_thermomech.frd")
dat_thermomech_test_result_file = join(thermomech_analysis_dir, "spine_thermomech.dat")
shutil.copyfile(frd_result_file, frd_thermomech_test_result_file)
shutil.copyfile(dat_result_file, dat_thermomech_test_result_file)
print("Results copied to the appropriate FEM test dirs in: " + temp_dir)
# ****************************************************************************
# Flow1D
print("create Flow1D result files")
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
test_class + ".test_thermomech_flow1D_analysis")
)
Flow1D_thermomech_analysis_dir = join(temp_dir, "FEM_ccx_Flow1D_thermomech")
doc_flow1d = FreeCAD.open(join(Flow1D_thermomech_analysis_dir, "Flow1D_thermomech.FCStd"))
FemGui.setActiveAnalysis(doc_flow1d.Analysis)
fea = ccxtools.FemToolsCcx()
fea.reset_all()
fea.run()
fea.load_results()
stats_flow1D = []
res_obj_flow1d = doc_flow1d.getObject("CCX_Time1_0_Results001")
for s in stat_types:
statval = resulttools.get_stats(res_obj_flow1d, s)
stats_flow1D.append(
"{0}: ({1:.14g}, {2:.14g})\n"
.format(s, statval[0], statval[1])
)
Flow1D_thermomech_expected_values_file = join(
Flow1D_thermomech_analysis_dir,
"Flow1D_thermomech_expected_values"
)
f = open(Flow1D_thermomech_expected_values_file, "w")
for s in stats_flow1D:
f.write(s)
f.close()
frd_result_file = os.path.splitext(fea.inp_file_name)[0] + ".frd"
dat_result_file = os.path.splitext(fea.inp_file_name)[0] + ".dat"
frd_Flow1D_thermomech_test_result_file = join(
Flow1D_thermomech_analysis_dir,
"Flow1D_thermomech.frd"
)
dat_Flow1D_thermomech_test_result_file = join(
Flow1D_thermomech_analysis_dir,
"Flow1D_thermomech.dat"
)
shutil.copyfile(frd_result_file, frd_Flow1D_thermomech_test_result_file)
shutil.copyfile(dat_result_file, dat_Flow1D_thermomech_test_result_file)
print("Flow1D thermomech results copied to the appropriate FEM test dirs in: " + temp_dir)
"""
update the results of FEM ccxtools unit tests:
src/Mod/Fem/femtest/app/test_result.py
-221
View File
@@ -65,227 +65,6 @@ class TestResult(unittest.TestCase):
64 * "*"
))
# ********************************************************************************************
def test_read_frd_massflow_networkpressure(
self
):
# read data from frd file
frd_file = join(
testtools.get_fem_test_home_dir(),
"calculix",
"thermomech_flow1D.frd"
)
from feminout.importCcxFrdResults import read_frd_result as read_frd
frd_content = read_frd(frd_file)
# do something with the read data
frd_content_len = []
for key in sorted(frd_content.keys()):
frd_content_len.append(len(frd_content[key]))
# print("read data")
# print(frd_content_len)
# print(sorted(frd_content.keys()))
# # print(frd_content)
read_mflow = frd_content["Results"][12]["mflow"]
read_npressure = frd_content["Results"][12]["npressure"]
res_len = [
len(read_mflow),
len(read_npressure)
]
# print(res_len)
# print(read_mflow)
# print(read_npressure)
# create the expected data
# print("\nexpected data")
efc = {} # expected frd content
efc["Nodes"] = {
2: FreeCAD.Vector(0.0, 0.0, -50.0),
3: FreeCAD.Vector(0.0, 0.0, -4300.0),
4: FreeCAD.Vector(4950.0, 0.0, -4300.0),
5: FreeCAD.Vector(5000.0, 0.0, -4300.0),
6: FreeCAD.Vector(8535.53, 0.0, -7835.53),
7: FreeCAD.Vector(8569.88, 0.0, -7870.88),
8: FreeCAD.Vector(12105.4, 0.0, -11406.4),
9: FreeCAD.Vector(12140.8, 0.0, -11441.8),
10: FreeCAD.Vector(13908.5, 0.0, -13209.5),
11: FreeCAD.Vector(13943.9, 0.0, -13244.9),
12: FreeCAD.Vector(15047.0, 0.0, -14348.0),
13: FreeCAD.Vector(15047.0, 0.0, -7947.97),
15: FreeCAD.Vector(0.0, 0.0, 0.0),
16: FreeCAD.Vector(0.0, 0.0, -2175.0),
17: FreeCAD.Vector(2475.0, 0.0, -4300.0),
18: FreeCAD.Vector(4975.0, 0.0, -4300.0),
19: FreeCAD.Vector(6767.77, 0.0, -6067.77),
20: FreeCAD.Vector(8552.71, 0.0, -7853.21),
21: FreeCAD.Vector(10337.6, 0.0, -9638.64),
22: FreeCAD.Vector(12123.1, 0.0, -11424.1),
23: FreeCAD.Vector(13024.6, 0.0, -12325.6),
24: FreeCAD.Vector(13926.2, 0.0, -13227.2),
25: FreeCAD.Vector(14495.4, 0.0, -13796.4),
26: FreeCAD.Vector(15047.0, 0.0, -11148.0),
27: FreeCAD.Vector(15047.0, 0.0, -7897.97)
}
efc["Seg2Elem"] = {
1: (15, 2),
13: (13, 27)
}
efc["Seg3Elem"] = {}
""" deleted during reading because of the inout file
efc["Seg3Elem"] = {
2: (2, 16, 3),
3: (3, 17, 4),
4: (4, 18, 5),
5: (5, 19, 6),
6: (6, 20, 7),
7: (7, 21, 8),
8: (8, 22, 9),
9: (9, 23, 10),
10: (10, 24, 11),
11: (11, 25, 12),
12: (12, 26, 13)
}
"""
# faces
efc["Tria3Elem"] = efc["Tria6Elem"] = {}
efc["Quad4Elem"] = efc["Quad8Elem"] = {}
# volumes
efc["Tetra4Elem"] = efc["Tetra10Elem"] = {}
efc["Hexa8Elem"] = efc["Hexa20Elem"] = {}
efc["Penta6Elem"] = efc["Penta15Elem"] = {}
efc["Results"] = [
{"time": 0.00390625},
{"time": 0.0078125},
{"time": 0.0136719},
{"time": 0.0224609},
{"time": 0.0356445},
{"time": 0.0554199},
{"time": 0.085083},
{"time": 0.129578},
{"time": 0.19632},
{"time": 0.296432},
{"time": 0.446602},
{"time": 0.671856},
{
"number": 0,
"time": 1.0,
"mflow": {
1: 78.3918, # added during reading because of the inout file
2: 78.3918,
3: 78.3918,
4: 78.3918,
5: 78.3918,
6: 78.3918,
7: 78.3918,
8: 78.3918,
9: 78.3918,
10: 78.3918,
11: 78.3918,
12: 78.3918,
13: 78.3918,
15: 78.3918,
16: 78.3918,
17: 78.3918,
18: 78.3918,
19: 78.3918,
20: 78.3918,
21: 78.3918,
22: 78.3918,
23: 78.3918,
24: 78.3918,
25: 78.3918,
26: 78.3918,
27: 78.3918,
28: 78.3918 # added during reading because of the inout file
},
"npressure": {
1: 0.1, # added during reading because of the inout file
2: 0.1,
3: 0.134840,
4: 0.128261,
5: 0.127949,
6: 0.155918,
7: 0.157797,
8: 0.191647,
9: 0.178953,
10: 0.180849,
11: 0.161476,
12: 0.162658,
13: 0.1,
15: 0.1,
16: 0.117420,
17: 0.131551,
18: 0.128105,
19: 0.141934,
20: 0.156857,
21: 0.174722,
22: 0.185300,
23: 0.179901,
24: 0.171162,
25: 0.162067,
26: 0.131329,
27: 0.1,
28: 0.1 # added during reading because of the inout file
}
}
]
expected_frd_content = efc
# do something with the expected data
expected_frd_content_len = []
for key in sorted(expected_frd_content.keys()):
expected_frd_content_len.append(len(expected_frd_content[key]))
# print(expected_frd_content_len)
# print(sorted(expected_frd_content.keys()))
# expected results
expected_mflow = expected_frd_content["Results"][12]["mflow"]
expected_npressure = expected_frd_content["Results"][12]["npressure"]
expected_res_len = [
len(expected_mflow),
len(expected_npressure)
]
# print(expected_res_len)
# print(expected_mflow)
# print(expected_npressure)
# tests
self.assertEqual(
frd_content_len,
expected_frd_content_len,
"Length's of read frd data values are unexpected"
)
self.assertEqual(
frd_content["Nodes"],
expected_frd_content["Nodes"],
"Values of read node data are unexpected"
)
self.assertEqual(
frd_content["Seg2Elem"],
expected_frd_content["Seg2Elem"],
"Values of read Seg2 data are unexpected"
)
self.assertEqual(
frd_content["Seg3Elem"],
expected_frd_content["Seg3Elem"],
"Values of read Seg3 data are unexpected"
)
self.assertEqual(
res_len,
expected_res_len,
"Length's of read result data values are unexpected"
)
self.assertEqual(
read_mflow,
expected_mflow,
"Values of read mflow result data are unexpected"
)
self.assertEqual(
read_npressure,
expected_npressure,
"Values of read npressure result data are unexpected"
)
# ********************************************************************************************
def get_stress_values(
self
src/Mod/Fem/femtest/app/test_solver_calculix.py
-16
View File
@@ -341,22 +341,6 @@ class TestSolverCalculix(unittest.TestCase):
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_thermomech_flow1D(
self
):
from femexamples.thermomech_flow1d import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_thermomech_spine(
self
):
from femexamples.thermomech_spine import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def input_file_writing_test(
self,
src/Mod/Fem/femtest/data/calculix/box.FCStd
BIN
View File
Binary file not shown.
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D.FCStd
BIN
View File
Binary file not shown.
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D.dat
View File
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D.frd
-847
View File
@@ -1,847 +0,0 @@
1C
1UUSER
1UDATE 07.february.2018
1UTIME 13:19:13
1UHOST
1UPGM CalculiX
1UVERSION Version 2.11
1UCOMPILETIME So 31. Jul 13:26:31 CEST 2016
1UDIR
1UDBN
1UMAT 1FLUIDMATERIAL
2C 25 1
-1 2 0.00000E+00 0.00000E+00-5.00000E+01
-1 3 0.00000E+00 0.00000E+00-4.30000E+03
-1 4 4.95000E+03 0.00000E+00-4.30000E+03
-1 5 5.00000E+03 0.00000E+00-4.30000E+03
-1 6 8.53553E+03 0.00000E+00-7.83553E+03
-1 7 8.56988E+03 0.00000E+00-7.87088E+03
-1 8 1.21054E+04 0.00000E+00-1.14064E+04
-1 9 1.21408E+04 0.00000E+00-1.14418E+04
-1 10 1.39085E+04 0.00000E+00-1.32095E+04
-1 11 1.39439E+04 0.00000E+00-1.32449E+04
-1 12 1.50470E+04 0.00000E+00-1.43480E+04
-1 13 1.50470E+04 0.00000E+00-7.94797E+03
-1 15 0.00000E+00 0.00000E+00 0.00000E+00
-1 16 0.00000E+00 0.00000E+00-2.17500E+03
-1 17 2.47500E+03 0.00000E+00-4.30000E+03
-1 18 4.97500E+03 0.00000E+00-4.30000E+03
-1 19 6.76777E+03 0.00000E+00-6.06777E+03
-1 20 8.55271E+03 0.00000E+00-7.85321E+03
-1 21 1.03376E+04 0.00000E+00-9.63864E+03
-1 22 1.21231E+04 0.00000E+00-1.14241E+04
-1 23 1.30246E+04 0.00000E+00-1.23256E+04
-1 24 1.39262E+04 0.00000E+00-1.32272E+04
-1 25 1.44954E+04 0.00000E+00-1.37964E+04
-1 26 1.50470E+04 0.00000E+00-1.11480E+04
-1 27 1.50470E+04 0.00000E+00-7.89797E+03
-3
3C 13 1
-1 1 11 0 1
-2 15 2
-1 2 12 0 1
-2 2 3 16
-1 3 12 0 1
-2 3 4 17
-1 4 12 0 1
-2 4 5 18
-1 5 12 0 1
-2 5 6 19
-1 6 12 0 1
-2 6 7 20
-1 7 12 0 1
-2 7 8 21
-1 8 12 0 1
-2 8 9 22
-1 9 12 0 1
-2 9 10 23
-1 10 12 0 1
-2 10 11 24
-1 11 12 0 1
-2 11 12 25
-1 12 12 0 1
-2 12 13 26
-1 13 11 0 1
-2 13 27
-3
1PSTEP 1 1 1
100CL 101 3.90625E-03 25 0 1 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 6.94717E-03
-1 3 6.94717E-03
-1 4 6.94717E-03
-1 5 6.94717E-03
-1 6 6.94717E-03
-1 7 6.94717E-03
-1 8 6.94717E-03
-1 9 6.94717E-03
-1 10 6.94717E-03
-1 11 6.94717E-03
-1 12 6.94717E-03
-1 13 6.94717E-03
-1 15 6.94717E-03
-1 16 6.94717E-03
-1 17 6.94717E-03
-1 18 6.94717E-03
-1 19 6.94717E-03
-1 20 6.94717E-03
-1 21 6.94717E-03
-1 22 6.94717E-03
-1 23 6.94717E-03
-1 24 6.94717E-03
-1 25 6.94717E-03
-1 26 6.94717E-03
-1 27 6.94717E-03
-3
1PSTEP 2 1 1
100CL 101 3.90625E-03 25 0 1 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 3.90625E-04
-1 3 4.99998E-04
-1 4 4.99796E-04
-1 5 4.97346E-04
-1 6 6.32354E-04
-1 7 6.45744E-04
-1 8 7.80932E-04
-1 9 6.79877E-04
-1 10 7.47010E-04
-1 11 5.93493E-04
-1 12 6.35385E-04
-1 13 3.90625E-04
-1 15 3.90625E-04
-1 16 4.45311E-04
-1 17 4.99897E-04
-1 18 4.98571E-04
-1 19 5.64850E-04
-1 20 6.39049E-04
-1 21 7.13338E-04
-1 22 7.30404E-04
-1 23 7.13443E-04
-1 24 6.70252E-04
-1 25 6.14439E-04
-1 26 5.13005E-04
-1 27 3.90625E-04
-3
1PSTEP 3 2 1
100CL 102 7.81250E-03 25 0 2 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 9.80537E-03
-1 3 9.80537E-03
-1 4 9.80537E-03
-1 5 9.80537E-03
-1 6 9.80537E-03
-1 7 9.80537E-03
-1 8 9.80537E-03
-1 9 9.80537E-03
-1 10 9.80537E-03
-1 11 9.80537E-03
-1 12 9.80537E-03
-1 13 9.80537E-03
-1 15 9.80537E-03
-1 16 9.80537E-03
-1 17 9.80537E-03
-1 18 9.80537E-03
-1 19 9.80537E-03
-1 20 9.80537E-03
-1 21 9.80537E-03
-1 22 9.80537E-03
-1 23 9.80537E-03
-1 24 9.80537E-03
-1 25 9.80537E-03
-1 26 9.80537E-03
-1 27 9.80537E-03
-3
1PSTEP 4 2 1
100CL 102 7.81250E-03 25 0 2 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 7.81250E-04
-1 3 1.00042E-03
-1 4 9.99611E-04
-1 5 9.94731E-04
-1 6 1.26434E-03
-1 7 1.29103E-03
-1 8 1.56136E-03
-1 9 1.36005E-03
-1 10 1.49338E-03
-1 11 1.18757E-03
-1 12 1.27077E-03
-1 13 7.81250E-04
-1 15 7.81250E-04
-1 16 8.90833E-04
-1 17 1.00001E-03
-1 18 9.97171E-04
-1 19 1.12954E-03
-1 20 1.27768E-03
-1 21 1.42619E-03
-1 22 1.46071E-03
-1 23 1.42672E-03
-1 24 1.34048E-03
-1 25 1.22917E-03
-1 26 1.02601E-03
-1 27 7.81250E-04
-3
1PSTEP 5 3 1
100CL 103 1.36719E-02 25 0 3 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 1.29331E-02
-1 3 1.29331E-02
-1 4 1.29331E-02
-1 5 1.29331E-02
-1 6 1.29331E-02
-1 7 1.29331E-02
-1 8 1.29331E-02
-1 9 1.29331E-02
-1 10 1.29331E-02
-1 11 1.29331E-02
-1 12 1.29331E-02
-1 13 1.29331E-02
-1 15 1.29331E-02
-1 16 1.29331E-02
-1 17 1.29331E-02
-1 18 1.29331E-02
-1 19 1.29331E-02
-1 20 1.29331E-02
-1 21 1.29331E-02
-1 22 1.29331E-02
-1 23 1.29331E-02
-1 24 1.29331E-02
-1 25 1.29331E-02
-1 26 1.29331E-02
-1 27 1.29331E-02
-3
1PSTEP 6 3 1
100CL 103 1.36719E-02 25 0 3 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 1.36719E-03
-1 3 1.75182E-03
-1 4 1.74937E-03
-1 5 1.74088E-03
-1 6 2.21165E-03
-1 7 2.25810E-03
-1 8 2.73105E-03
-1 9 2.38088E-03
-1 10 2.61176E-03
-1 11 2.07977E-03
-1 12 2.22385E-03
-1 13 1.36719E-03
-1 15 1.36719E-03
-1 16 1.55950E-03
-1 17 1.75059E-03
-1 18 1.74512E-03
-1 19 1.97626E-03
-1 20 2.23487E-03
-1 21 2.49458E-03
-1 22 2.55597E-03
-1 23 2.49632E-03
-1 24 2.34577E-03
-1 25 2.15181E-03
-1 26 1.79552E-03
-1 27 1.36719E-03
-3
1PSTEP 7 4 1
100CL 104 2.24609E-02 25 0 4 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 1.65041E-02
-1 3 1.65041E-02
-1 4 1.65041E-02
-1 5 1.65041E-02
-1 6 1.65041E-02
-1 7 1.65041E-02
-1 8 1.65041E-02
-1 9 1.65041E-02
-1 10 1.65041E-02
-1 11 1.65041E-02
-1 12 1.65041E-02
-1 13 1.65041E-02
-1 15 1.65041E-02
-1 16 1.65041E-02
-1 17 1.65041E-02
-1 18 1.65041E-02
-1 19 1.65041E-02
-1 20 1.65041E-02
-1 21 1.65041E-02
-1 22 1.65041E-02
-1 23 1.65041E-02
-1 24 1.65041E-02
-1 25 1.65041E-02
-1 26 1.65041E-02
-1 27 1.65041E-02
-3
1PSTEP 8 4 1
100CL 104 2.24609E-02 25 0 4 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 2.24609E-03
-1 3 2.88064E-03
-1 4 2.87409E-03
-1 5 2.86026E-03
-1 6 3.63111E-03
-1 7 3.70682E-03
-1 8 4.48353E-03
-1 9 3.91334E-03
-1 10 4.28673E-03
-1 11 3.42046E-03
-1 12 3.65346E-03
-1 13 2.24609E-03
-1 15 2.24609E-03
-1 16 2.56336E-03
-1 17 2.87736E-03
-1 18 2.86717E-03
-1 19 3.24568E-03
-1 20 3.66897E-03
-1 21 4.09518E-03
-1 22 4.19843E-03
-1 23 4.10004E-03
-1 24 3.85360E-03
-1 25 3.53696E-03
-1 26 2.94978E-03
-1 27 2.24609E-03
-3
1PSTEP 9 5 1
100CL 105 3.56445E-02 25 0 5 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 2.06558E-02
-1 3 2.06558E-02
-1 4 2.06558E-02
-1 5 2.06558E-02
-1 6 2.06558E-02
-1 7 2.06558E-02
-1 8 2.06558E-02
-1 9 2.06558E-02
-1 10 2.06558E-02
-1 11 2.06558E-02
-1 12 2.06558E-02
-1 13 2.06558E-02
-1 15 2.06558E-02
-1 16 2.06558E-02
-1 17 2.06558E-02
-1 18 2.06558E-02
-1 19 2.06558E-02
-1 20 2.06558E-02
-1 21 2.06558E-02
-1 22 2.06558E-02
-1 23 2.06558E-02
-1 24 2.06558E-02
-1 25 2.06558E-02
-1 26 2.06558E-02
-1 27 2.06558E-02
-3
1PSTEP 10 5 1
100CL 105 3.56445E-02 25 0 5 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 3.56445E-03
-1 3 4.57761E-03
-1 4 4.56133E-03
-1 5 4.53967E-03
-1 6 5.75703E-03
-1 7 5.87579E-03
-1 8 7.10770E-03
-1 9 6.21472E-03
-1 10 6.79349E-03
-1 11 5.43673E-03
-1 12 5.79788E-03
-1 13 3.56445E-03
-1 15 3.56445E-03
-1 16 4.07103E-03
-1 17 4.56947E-03
-1 18 4.55050E-03
-1 19 5.14835E-03
-1 20 5.81641E-03
-1 21 6.49175E-03
-1 22 6.66121E-03
-1 23 6.50411E-03
-1 24 6.11511E-03
-1 25 5.61731E-03
-1 26 4.68117E-03
-1 27 3.56445E-03
-3
1PSTEP 11 6 1
100CL 106 5.54199E-02 25 0 6 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 2.55093E-02
-1 3 2.55093E-02
-1 4 2.55093E-02
-1 5 2.55093E-02
-1 6 2.55093E-02
-1 7 2.55093E-02
-1 8 2.55093E-02
-1 9 2.55093E-02
-1 10 2.55093E-02
-1 11 2.55093E-02
-1 12 2.55093E-02
-1 13 2.55093E-02
-1 15 2.55093E-02
-1 16 2.55093E-02
-1 17 2.55093E-02
-1 18 2.55093E-02
-1 19 2.55093E-02
-1 20 2.55093E-02
-1 21 2.55093E-02
-1 22 2.55093E-02
-1 23 2.55093E-02
-1 24 2.55093E-02
-1 25 2.55093E-02
-1 26 2.55093E-02
-1 27 2.55093E-02
-3
1PSTEP 12 6 1
100CL 106 5.54199E-02 25 0 6 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 5.54199E-03
-1 3 7.13118E-03
-1 4 7.09257E-03
-1 5 7.05954E-03
-1 6 8.93886E-03
-1 7 9.12034E-03
-1 8 1.10342E-02
-1 9 9.67261E-03
-1 10 1.05413E-02
-1 11 8.47244E-03
-1 12 9.01452E-03
-1 13 5.54199E-03
-1 15 5.54199E-03
-1 16 6.33659E-03
-1 17 7.11188E-03
-1 18 7.07606E-03
-1 19 7.99920E-03
-1 20 9.02960E-03
-1 21 1.00773E-02
-1 22 1.03534E-02
-1 23 1.01070E-02
-1 24 9.50688E-03
-1 25 8.74348E-03
-1 26 7.27825E-03
-1 27 5.54199E-03
-3
1PSTEP 13 7 1
100CL 107 8.50830E-02 25 0 7 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 3.11648E-02
-1 3 3.11648E-02
-1 4 3.11648E-02
-1 5 3.11648E-02
-1 6 3.11648E-02
-1 7 3.11648E-02
-1 8 3.11648E-02
-1 9 3.11648E-02
-1 10 3.11648E-02
-1 11 3.11648E-02
-1 12 3.11648E-02
-1 13 3.11648E-02
-1 15 3.11648E-02
-1 16 3.11648E-02
-1 17 3.11648E-02
-1 18 3.11648E-02
-1 19 3.11648E-02
-1 20 3.11648E-02
-1 21 3.11648E-02
-1 22 3.11648E-02
-1 23 3.11648E-02
-1 24 3.11648E-02
-1 25 3.11648E-02
-1 26 3.11648E-02
-1 27 3.11648E-02
-3
1PSTEP 14 7 1
100CL 107 8.50830E-02 25 0 7 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 8.50830E-03
-1 3 1.09787E-02
-1 4 1.08902E-02
-1 5 1.08409E-02
-1 6 1.36966E-02
-1 7 1.39683E-02
-1 8 1.69031E-02
-1 9 1.48717E-02
-1 10 1.61370E-02
-1 11 1.30499E-02
-1 12 1.38395E-02
-1 13 8.50830E-03
-1 15 8.50830E-03
-1 16 9.74349E-03
-1 17 1.09345E-02
-1 18 1.08656E-02
-1 19 1.22688E-02
-1 20 1.38325E-02
-1 21 1.54357E-02
-1 22 1.58874E-02
-1 23 1.55044E-02
-1 24 1.45935E-02
-1 25 1.34447E-02
-1 26 1.11739E-02
-1 27 8.50830E-03
-3
1PSTEP 15 8 1
100CL 108 1.29578E-01 25 0 8 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 3.76821E-02
-1 3 3.76821E-02
-1 4 3.76821E-02
-1 5 3.76821E-02
-1 6 3.76821E-02
-1 7 3.76821E-02
-1 8 3.76821E-02
-1 9 3.76821E-02
-1 10 3.76821E-02
-1 11 3.76821E-02
-1 12 3.76821E-02
-1 13 3.76821E-02
-1 15 3.76821E-02
-1 16 3.76821E-02
-1 17 3.76821E-02
-1 18 3.76821E-02
-1 19 3.76821E-02
-1 20 3.76821E-02
-1 21 3.76821E-02
-1 22 3.76821E-02
-1 23 3.76821E-02
-1 24 3.76821E-02
-1 25 3.76821E-02
-1 26 3.76821E-02
-1 27 3.76821E-02
-3
1PSTEP 16 8 1
100CL 108 1.29578E-01 25 0 8 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 1.29578E-02
-1 3 1.67853E-02
-1 4 1.65883E-02
-1 5 1.65162E-02
-1 6 2.08025E-02
-1 7 2.12015E-02
-1 8 2.56638E-02
-1 9 2.26958E-02
-1 10 2.44770E-02
-1 11 1.99654E-02
-1 12 2.10769E-02
-1 13 1.29578E-02
-1 15 1.29578E-02
-1 16 1.48715E-02
-1 17 1.66868E-02
-1 18 1.65523E-02
-1 19 1.86594E-02
-1 20 2.10020E-02
-1 21 2.34327E-02
-1 22 2.41798E-02
-1 23 2.35864E-02
-1 24 2.22212E-02
-1 25 2.05212E-02
-1 26 1.70173E-02
-1 27 1.29578E-02
-3
1PSTEP 17 9 1
100CL 109 1.96320E-01 25 0 9 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 4.50493E-02
-1 3 4.50493E-02
-1 4 4.50493E-02
-1 5 4.50493E-02
-1 6 4.50493E-02
-1 7 4.50493E-02
-1 8 4.50493E-02
-1 9 4.50493E-02
-1 10 4.50493E-02
-1 11 4.50493E-02
-1 12 4.50493E-02
-1 13 4.50493E-02
-1 15 4.50493E-02
-1 16 4.50493E-02
-1 17 4.50493E-02
-1 18 4.50493E-02
-1 19 4.50493E-02
-1 20 4.50493E-02
-1 21 4.50493E-02
-1 22 4.50493E-02
-1 23 4.50493E-02
-1 24 4.50493E-02
-1 25 4.50493E-02
-1 26 4.50493E-02
-1 27 4.50493E-02
-3
1PSTEP 18 9 1
100CL 109 1.96320E-01 25 0 9 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 1.96320E-02
-1 3 2.55652E-02
-1 4 2.51386E-02
-1 5 2.50356E-02
-1 6 3.14002E-02
-1 7 3.19744E-02
-1 8 3.87202E-02
-1 9 3.44820E-02
-1 10 3.68805E-02
-1 11 3.04363E-02
-1 12 3.19330E-02
-1 13 1.96320E-02
-1 15 1.96320E-02
-1 16 2.25986E-02
-1 17 2.53519E-02
-1 18 2.50871E-02
-1 19 2.82179E-02
-1 20 3.16873E-02
-1 21 3.53473E-02
-1 22 3.66011E-02
-1 23 3.56813E-02
-1 24 3.36584E-02
-1 25 3.11847E-02
-1 26 2.57825E-02
-1 27 1.96320E-02
-3
1PSTEP 19 10 1
100CL 110 2.96432E-01 25 0 10 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 5.31446E-02
-1 3 5.31446E-02
-1 4 5.31446E-02
-1 5 5.31446E-02
-1 6 5.31446E-02
-1 7 5.31446E-02
-1 8 5.31446E-02
-1 9 5.31446E-02
-1 10 5.31446E-02
-1 11 5.31446E-02
-1 12 5.31446E-02
-1 13 5.31446E-02
-1 15 5.31446E-02
-1 16 5.31446E-02
-1 17 5.31446E-02
-1 18 5.31446E-02
-1 19 5.31446E-02
-1 20 5.31446E-02
-1 21 5.31446E-02
-1 22 5.31446E-02
-1 23 5.31446E-02
-1 24 5.31446E-02
-1 25 5.31446E-02
-1 26 5.31446E-02
-1 27 5.31446E-02
-3
1PSTEP 20 10 1
100CL 110 2.96432E-01 25 0 10 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 2.96432E-02
-1 3 3.88665E-02
-1 4 3.79702E-02
-1 5 3.78268E-02
-1 6 4.71822E-02
-1 7 4.79893E-02
-1 8 5.81459E-02
-1 9 5.22556E-02
-1 10 5.52863E-02
-1 11 4.63261E-02
-1 12 4.82172E-02
-1 13 2.96432E-02
-1 15 2.96432E-02
-1 16 3.42549E-02
-1 17 3.84183E-02
-1 18 3.78985E-02
-1 19 4.25045E-02
-1 20 4.75857E-02
-1 21 5.30676E-02
-1 22 5.52008E-02
-1 23 5.37710E-02
-1 24 5.08062E-02
-1 25 4.72717E-02
-1 26 3.89302E-02
-1 27 2.96432E-02
-3
1PSTEP 21 11 1
100CL 111 4.46602E-01 25 0 11 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 6.17072E-02
-1 3 6.17072E-02
-1 4 6.17072E-02
-1 5 6.17072E-02
-1 6 6.17072E-02
-1 7 6.17072E-02
-1 8 6.17072E-02
-1 9 6.17072E-02
-1 10 6.17072E-02
-1 11 6.17072E-02
-1 12 6.17072E-02
-1 13 6.17072E-02
-1 15 6.17072E-02
-1 16 6.17072E-02
-1 17 6.17072E-02
-1 18 6.17072E-02
-1 19 6.17072E-02
-1 20 6.17072E-02
-1 21 6.17072E-02
-1 22 6.17072E-02
-1 23 6.17072E-02
-1 24 6.17072E-02
-1 25 6.17072E-02
-1 26 6.17072E-02
-1 27 6.17072E-02
-3
1PSTEP 22 11 1
100CL 111 4.46602E-01 25 0 11 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 4.46602E-02
-1 3 5.90485E-02
-1 4 5.72280E-02
-1 5 5.70347E-02
-1 6 7.06545E-02
-1 7 7.17589E-02
-1 8 8.70061E-02
-1 9 7.90811E-02
-1 10 8.25456E-02
-1 11 7.04817E-02
-1 12 7.26436E-02
-1 13 4.46602E-02
-1 15 4.46602E-02
-1 16 5.18544E-02
-1 17 5.81383E-02
-1 18 5.71314E-02
-1 19 6.38446E-02
-1 20 7.12067E-02
-1 21 7.93825E-02
-1 22 8.30436E-02
-1 23 8.08134E-02
-1 24 7.65137E-02
-1 25 7.15626E-02
-1 26 5.86519E-02
-1 27 4.46602E-02
-3
1PSTEP 23 12 1
100CL 112 6.71856E-01 25 0 12 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 7.03423E-02
-1 3 7.03423E-02
-1 4 7.03423E-02
-1 5 7.03423E-02
-1 6 7.03423E-02
-1 7 7.03423E-02
-1 8 7.03423E-02
-1 9 7.03423E-02
-1 10 7.03423E-02
-1 11 7.03423E-02
-1 12 7.03423E-02
-1 13 7.03423E-02
-1 15 7.03423E-02
-1 16 7.03423E-02
-1 17 7.03423E-02
-1 18 7.03423E-02
-1 19 7.03423E-02
-1 20 7.03423E-02
-1 21 7.03423E-02
-1 22 7.03423E-02
-1 23 7.03423E-02
-1 24 7.03423E-02
-1 25 7.03423E-02
-1 26 7.03423E-02
-1 27 7.03423E-02
-3
1PSTEP 24 12 1
100CL 112 6.71856E-01 25 0 12 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 6.71856E-02
-1 3 8.96906E-02
-1 4 8.61317E-02
-1 5 8.58805E-02
-1 6 1.05541E-01
-1 7 1.07008E-01
-1 8 1.29850E-01
-1 9 1.19584E-01
-1 10 1.22875E-01
-1 11 1.07230E-01
-1 12 1.09283E-01
-1 13 6.71856E-02
-1 15 6.71856E-02
-1 16 7.84381E-02
-1 17 8.79111E-02
-1 18 8.60061E-02
-1 19 9.57109E-02
-1 20 1.06275E-01
-1 21 1.18429E-01
-1 22 1.24717E-01
-1 23 1.21229E-01
-1 24 1.15052E-01
-1 25 1.08256E-01
-1 26 8.82343E-02
-1 27 6.71856E-02
-3
1PSTEP 25 13 1
100CL 113 1.000000000 25 0 13 1
-4 MAFLOW 1 1
-5 MF 1 1 0 0
-1 2 7.83918E-02
-1 3 7.83918E-02
-1 4 7.83918E-02
-1 5 7.83918E-02
-1 6 7.83918E-02
-1 7 7.83918E-02
-1 8 7.83918E-02
-1 9 7.83918E-02
-1 10 7.83918E-02
-1 11 7.83918E-02
-1 12 7.83918E-02
-1 13 7.83918E-02
-1 15 7.83918E-02
-1 16 7.83918E-02
-1 17 7.83918E-02
-1 18 7.83918E-02
-1 19 7.83918E-02
-1 20 7.83918E-02
-1 21 7.83918E-02
-1 22 7.83918E-02
-1 23 7.83918E-02
-1 24 7.83918E-02
-1 25 7.83918E-02
-1 26 7.83918E-02
-1 27 7.83918E-02
-3
1PSTEP 26 13 1
100CL 113 1.000000000 25 0 13 1
-4 STPRES 1 1
-5 PS 1 1 0 0
-1 2 1.00000E-01
-1 3 1.34840E-01
-1 4 1.28261E-01
-1 5 1.27949E-01
-1 6 1.55918E-01
-1 7 1.57797E-01
-1 8 1.91647E-01
-1 9 1.78953E-01
-1 10 1.80849E-01
-1 11 1.61476E-01
-1 12 1.62658E-01
-1 13 1.00000E-01
-1 15 1.00000E-01
-1 16 1.17420E-01
-1 17 1.31551E-01
-1 18 1.28105E-01
-1 19 1.41934E-01
-1 20 1.56857E-01
-1 21 1.74722E-01
-1 22 1.85300E-01
-1 23 1.79901E-01
-1 24 1.71162E-01
-1 25 1.62067E-01
-1 26 1.31329E-01
-1 27 1.00000E-01
-3
9999
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D.inp
-190
View File
@@ -1,190 +0,0 @@
** written by FreeCAD inp file writer for CalculiX,Abaqus meshes
** highest dimension mesh elements only.
** Nodes
*Node, NSET=Nall
1, 0, 0, 50
2, 0, 0, -50
3, 0, 0, -4300
4, 4950, 0, -4300
5, 5000, 0, -4300
6, 8535.53, 0, -7835.53
7, 8569.88, 0, -7870.88
8, 12105.41, 0, -11406.41
9, 12140.76, 0, -11441.76
10, 13908.53, 0, -13209.53
11, 13943.88, 0, -13244.88
12, 15046.97, 0, -14347.97
13, 15046.97, 0, -7947.97
14, 15046.97, 0, -7847.97
15, 0, 0, 0
16, 0, 0, -2175
17, 2475, 0, -4300
18, 4975, 0, -4300
19, 6767.765, 0, -6067.765
20, 8552.705, 0, -7853.205
21, 10337.645, 0, -9638.645
22, 12123.085, 0, -11424.085
23, 13024.645, 0, -12325.645
24, 13926.205, 0, -13227.205
25, 14495.425, 0, -13796.425
26, 15046.97, 0, -11147.97
27, 15046.97, 0, -7897.97
28, 15046.97, 0, -7897.97
** Edge elements
*Element, TYPE=D, ELSET=Eedges
1, 0, 15, 2
2, 2, 16, 3
3, 3, 17, 4
4, 4, 18, 5
5, 5, 19, 6
6, 6, 20, 7
7, 7, 21, 8
8, 8, 22, 9
9, 9, 23, 10
10, 10, 24, 11
11, 11, 25, 12
12, 12, 26, 13
13, 13, 27, 0
** Define element set Eall
*ELSET, ELSET=Eall
Eedges
***********************************************************
** Element sets for materials and FEM element type (solid, shell, beam, fluid)
*ELSET,ELSET=M0F0
1,
*ELSET,ELSET=M0F1
2,
*ELSET,ELSET=M0F2
3,
5,
*ELSET,ELSET=M0F3
4,
*ELSET,ELSET=M0F4
6,
*ELSET,ELSET=M0F5
7,
*ELSET,ELSET=M0F6
8,
*ELSET,ELSET=M0F7
9,
11,
*ELSET,ELSET=M0F8
10,
*ELSET,ELSET=M0F9
12,
*ELSET,ELSET=M0F10
13,
***********************************************************
** Materials
** see information about units at file end
** FreeCAD material name: Water
** FluidMaterial
*MATERIAL, NAME=FluidMaterial
*DENSITY
9.98E-10
*FLUID CONSTANTS
4182000000,1.003E-09
***********************************************************
** Sections
*FLUID SECTION, ELSET=M0F0, TYPE=PIPE INOUT, MATERIAL=FluidMaterial
*FLUID SECTION, ELSET=M0F1, TYPE=PIPE ENTRANCE, MATERIAL=FluidMaterial
31416,25133
*FLUID SECTION, ELSET=M0F2, TYPE=PIPE MANNING, MATERIAL=FluidMaterial
31416,50,0.002
*FLUID SECTION, ELSET=M0F3, TYPE=PIPE BEND, MATERIAL=FluidMaterial
31416,1.5,45,0.4
*FLUID SECTION, ELSET=M0F4, TYPE=PIPE ENLARGEMENT, MATERIAL=FluidMaterial
31416,70686
*FLUID SECTION, ELSET=M0F5, TYPE=PIPE MANNING, MATERIAL=FluidMaterial
70686,75,0.002
*FLUID SECTION, ELSET=M0F6, TYPE=PIPE CONTRACTION, MATERIAL=FluidMaterial
70686,17671
*FLUID SECTION, ELSET=M0F7, TYPE=PIPE MANNING, MATERIAL=FluidMaterial
17671,37.5,0.002
*FLUID SECTION, ELSET=M0F8, TYPE=PIPE GATE VALVE, MATERIAL=FluidMaterial
17671,0.5
*FLUID SECTION, ELSET=M0F9, TYPE=PIPE ENLARGEMENT, MATERIAL=FluidMaterial
17671,1000000000000
*FLUID SECTION, ELSET=M0F10, TYPE=PIPE INOUT, MATERIAL=FluidMaterial
***********************************************************
** At least one step is needed to run an CalculiX analysis of FreeCAD
*STEP, INC=2000
*COUPLED TEMPERATURE-DISPLACEMENT, STEADY STATE
1.0,1.0
***********************************************************
** Self weight Constraint
** ConstraintSelfWeight
*DLOAD
Eall,GRAV,9806,0,0,-1
***********************************************************
** FluidSection constraints
** ElementFluid1D
**Fluid Section Inlet
*BOUNDARY
2,2,2,0.1
** ElementFluid1D001
** ElementFluid1D002
** ElementFluid1D003
** ElementFluid1D004
** ElementFluid1D005
** ElementFluid1D006
** ElementFluid1D007
** ElementFluid1D008
** ElementFluid1D009
** ElementFluid1D010
**Fluid Section Outlet
*BOUNDARY
13,2,2,0.1
***********************************************************
** Outputs --> frd file
*NODE FILE, OUTPUT=2d
MF, PS
***********************************************************
*END STEP
***********************************************************
** CalculiX Input file
** written by --> FreeCAD 0.17.11265 (Git)
** written on --> Fri Jun 9 11:49:27 2017
** file name --> Resevoir_rev1.fcstd
** analysis name --> Analysis
**
**
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
** Since Length and Mass are connected by Force, if Length is mm the Mass is in t to get N
** The following units are used to write to inp file:
**
** Length: mm (this includes the mesh geometry)
** Mass: t
** TimeSpan: s
** Temperature: K
**
** This leads to:
** Force: N
** Pressure: N/mm^2 == MPa (Young's Modulus has unit Pressure)
** Density: t/mm^3
** Gravity: mm/s^2
** Thermal conductivity: t*mm/K/s^3 == as W/m/K == kW/mm/K
** Specific Heat: mm^2/s^2/K = J/kg/K == kJ/t/K
**
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D_expected_values
-13
View File
@@ -1,13 +0,0 @@
U1: (0.0000000000, 0.0000000000)
U2: (0.0000000000, 0.0000000000)
U3: (0.0000000000, 0.0000000000)
Uabs: (0.0000000000, 0.0000000000)
Sabs: (0.0000000000, 0.0000000000)
MaxPrin: (0.0000000000, 0.0000000000)
MidPrin: (0.0000000000, 0.0000000000)
MinPrin: (0.0000000000, 0.0000000000)
MaxShear: (0.0000000000, 0.0000000000)
Peeq: (0.0000000000, 0.0000000000)
Temp: (0.0000000000, 0.0000000000)
MFlow: (78.3918000000, 78.3918000000)
NPress: (0.1000000000, 0.1916470000)
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D_inout_nodes.txt
-2
View File
@@ -1,2 +0,0 @@
2,15,1,PIPE INLET
13,27,28,PIPE OUTLET
src/Mod/Fem/femtest/data/calculix/thermomech_spine.FCStd
BIN
View File
Binary file not shown.
src/Mod/Fem/femtest/data/calculix/thermomech_spine.dat
-99
View File
@@ -1,99 +0,0 @@
displacements (vx,vy,vz) for set NALL and time 0.1000000E+01
1 -3.528920E-04 -1.607265E-03 2.909952E-04
2 2.414060E-04 -1.633822E-03 -1.853288E-03
3 -9.424549E-04 4.428105E-04 2.771396E-04
4 -3.226398E-04 4.979279E-04 -1.772741E-03
5 0.000000E+00 0.000000E+00 0.000000E+00
6 0.000000E+00 0.000000E+00 0.000000E+00
7 0.000000E+00 0.000000E+00 0.000000E+00
8 0.000000E+00 0.000000E+00 0.000000E+00
9 6.497743E-03 1.465271E-03 1.423301E-03
10 5.973524E-03 2.188986E-03 1.226248E-03
11 6.107115E-03 1.379316E-03 2.142315E-03
12 5.278299E-03 2.223176E-03 2.206754E-03
13 0.000000E+00 0.000000E+00 0.000000E+00
14 5.374170E-03 1.530415E-03 1.627616E-03
15 4.172156E-03 -1.279326E-04 -2.888770E-04
16 -6.402534E-05 -5.734986E-04 -1.805846E-03
17 6.273579E-03 1.015862E-03 1.881209E-03
18 3.442920E-03 1.444228E-03 -3.140252E-04
19 0.000000E+00 0.000000E+00 0.000000E+00
20 6.151863E-03 1.868375E-03 9.987790E-04
21 3.545820E-03 -1.573950E-04 1.314125E-03
22 -6.669789E-04 -5.836042E-04 2.690565E-04
23 7.298184E-03 4.600588E-04 4.370063E-04
24 2.781094E-03 1.422367E-03 1.325989E-03
25 -8.075035E-05 -1.614211E-03 -7.858403E-04
26 0.000000E+00 0.000000E+00 0.000000E+00
27 -6.520539E-04 4.563826E-04 -7.493165E-04
28 0.000000E+00 0.000000E+00 0.000000E+00
29 0.000000E+00 0.000000E+00 0.000000E+00
30 5.968876E-03 1.136728E-03 1.715788E-03
31 6.208296E-03 1.828309E-03 1.351549E-03
32 3.705176E-03 6.476975E-04 -3.319447E-04
33 6.674510E-03 1.336536E-03 6.867144E-04
34 5.648514E-03 1.774858E-03 2.144001E-03
35 3.054681E-03 5.940299E-04 1.312598E-03
36 -3.825444E-04 -5.764131E-04 -7.639972E-04
37 5.854479E-03 1.664649E-03 1.156343E-03
38 3.819112E-03 -1.351665E-04 5.335788E-04
39 6.253031E-03 1.452062E-03 1.806114E-03
40 6.662732E-03 6.703750E-04 1.318915E-03
41 3.069055E-03 1.443477E-03 4.976009E-04
42 5.567794E-03 2.180294E-03 1.715833E-03
43 6.251519E-03 1.175361E-03 1.200113E-03
44 5.885002E-03 1.835643E-03 1.790733E-03
45 3.338236E-03 6.205920E-04 4.915932E-04
stresses (elem, integ.pnt.,sxx,syy,szz,sxy,sxz,syz) for set EALL and time 0.1000000E+01
1 1 3.404960E+00 -1.223741E+00 -1.146617E+01 -1.014816E+00 5.721404E-01 1.914876E+00
1 2 1.400224E+00 -2.953124E+00 -1.263874E+01 -6.892873E-01 7.925952E-01 2.418160E-02
1 3 -1.932021E-02 4.145572E+00 1.075800E+01 1.341622E-01 -1.077867E+00 -8.810057E-01
1 4 8.558867E-01 2.410724E+00 5.031899E+00 -4.538675E-01 -8.363957E-01 -8.545765E-01
2 1 -2.390976E-01 -6.281387E-01 -3.372011E-01 -4.253012E-01 -4.313375E-01 -3.639082E-02
2 2 -7.078629E-01 -1.051329E+00 9.460542E-02 3.391396E-02 6.619598E-02 -1.109819E-01
2 3 -4.586067E-01 -6.902739E-01 2.326885E-01 4.933190E-02 -3.895851E-01 2.906021E-01
2 4 8.177110E-01 6.474442E-01 1.691349E-01 -5.346077E-02 3.495037E-01 1.078309E-01
3 1 -3.738220E-01 5.244382E-02 5.043071E-02 -4.322174E-02 -5.119367E-02 -6.329539E-02
3 2 -4.870176E-01 -1.365642E-01 -3.659017E-02 -8.585698E-02 -1.108073E-01 5.250735E-02
3 3 -4.940118E-01 -4.307143E-02 -1.464103E-01 -1.050280E-01 -7.625476E-02 6.477853E-02
3 4 8.967718E-01 1.138003E-01 1.116798E-01 1.910842E-01 1.655394E-01 -5.121702E-02
4 1 4.012653E-01 3.057826E-02 5.455659E-01 1.235586E-01 -1.238112E-01 6.349248E-02
4 2 -8.194046E-04 -3.368150E-01 -6.142789E-01 2.034512E-01 3.075178E-01 -1.461547E-01
4 3 2.066455E-01 2.004212E-01 -5.374576E-02 2.225878E-01 2.561197E-01 1.619756E-01
4 4 4.741484E-01 1.602642E-01 5.137134E-01 2.176972E-01 -5.926745E-03 -2.173092E-02
5 1 -7.946980E-01 -4.942827E-01 -5.447915E-01 -1.912366E-01 -1.683255E-01 -2.154803E-01
5 2 1.223945E+00 7.271678E-01 7.742165E-01 1.161181E-01 9.021013E-02 2.591346E-01
5 3 -6.114285E-01 -1.081211E-01 -5.044171E-01 -1.959176E-01 -1.243099E-01 -8.182985E-03
5 4 -6.040667E-01 -4.628108E-01 -1.156609E-01 -1.356655E-01 -1.859799E-01 -1.577666E-02
6 1 -2.158509E-01 -5.325126E-01 -4.515843E-01 -3.866704E-01 -4.162330E-01 -4.108670E-02
6 2 -6.757261E-01 -4.613765E-02 -8.915881E-01 2.110811E-01 -5.724646E-02 -1.256511E-01
6 3 8.281455E-01 2.923749E-01 6.409637E-01 3.355626E-01 1.417774E-02 2.255109E-02
6 4 -4.816843E-01 -1.251024E-01 -7.976278E-01 -1.806942E-01 6.804089E-02 3.420348E-01
7 1 3.148795E-01 4.842984E-01 -1.212845E-01 -1.396304E-01 1.576929E-01 5.180396E-02
7 2 1.572111E-01 -5.768416E-01 -1.511784E-01 3.266388E-01 8.790621E-02 -1.028829E-01
7 3 4.376864E-01 4.768444E-01 1.206219E-01 -1.718879E-02 2.159821E-01 -1.329976E-02
7 4 3.287772E-01 -3.254589E-02 1.220524E-01 2.782618E-01 2.770364E-01 1.119853E-01
8 1 5.701030E-01 2.661561E-01 2.350779E-01 2.473974E-01 1.920553E-01 -8.597329E-02
8 2 -5.767263E+00 -1.361109E+00 -2.493103E+00 1.062399E+00 1.121190E+00 -7.464096E-02
8 3 -2.791280E+00 -2.396505E-01 -1.198247E+00 8.020567E-01 4.148892E-01 2.533118E-01
8 4 4.664713E+00 1.415554E+00 2.781100E+00 -1.310904E+00 -5.274516E-01 -6.913113E-01
9 1 6.199650E-01 3.396960E-01 1.887766E-01 2.972053E-01 1.410676E-01 -8.629576E-02
9 2 -5.726302E+00 -2.197206E+00 -1.667618E+00 9.736955E-01 1.208750E+00 -6.498466E-02
9 3 4.686756E+00 2.719609E+00 1.615152E+00 -6.160644E-01 -1.223586E+00 -7.749438E-01
9 4 -2.704298E+00 -1.154649E+00 -6.016097E-01 4.111997E-01 8.008334E-01 3.444956E-01
10 1 -5.437203E+00 -2.644227E+01 -2.765793E+01 8.276053E-01 9.432501E-01 1.482137E-01
10 2 -4.193540E-01 -2.423150E+01 -2.544716E+01 -1.315881E-01 -8.004705E-02 1.482137E-01
10 3 -3.379018E+00 -2.551852E+01 -2.673417E+01 1.043734E+00 2.548021E-01 1.482137E-01
10 4 6.954096E+00 1.762891E+01 1.247931E+01 -1.762986E+00 -5.844363E-01 6.278434E-01
11 1 -3.459645E+00 -2.680162E+01 -2.553961E+01 2.300758E-01 1.008848E+00 1.532041E-01
11 2 -4.441059E-01 -2.549031E+01 -2.422831E+01 -5.195025E-02 -1.737574E-01 1.532041E-01
11 3 -5.461955E+00 -2.770109E+01 -2.643908E+01 9.072431E-01 8.495398E-01 1.532041E-01
11 4 6.904522E+00 1.232019E+01 1.766614E+01 -5.323384E-01 -1.829156E+00 6.489831E-01
12 1 1.094742E-01 1.057881E+01 3.957891E+00 -1.038625E+00 4.987185E-01 -7.917258E-01
12 2 8.440135E-01 5.019593E+00 2.575092E+00 -9.132367E-01 -2.821124E-01 -7.648862E-01
12 3 1.344229E+00 -1.260257E+01 -2.845529E+00 6.886793E-01 -8.322797E-01 -1.251042E-01
12 4 3.283453E+00 -1.148053E+01 -1.218374E+00 5.266032E-01 -1.187474E+00 1.955865E+00
src/Mod/Fem/femtest/data/calculix/thermomech_spine.frd
-298
View File
@@ -1,298 +0,0 @@
1C
1UUSER
1UDATE 07.february.2018
1UTIME 13:19:12
1UHOST
1UPGM CalculiX
1UVERSION Version 2.11
1UCOMPILETIME So 31. Jul 13:26:31 CEST 2016
1UDIR
1UDBN
1UMAT 1MECHANICALMATERIAL
2C 45 1
-1 1 2.03200E+02 2.54000E+01 0.00000E+00
-1 2 2.03200E+02 2.54000E+01 2.54000E+01
-1 3 2.03200E+02 0.00000E+00 0.00000E+00
-1 4 2.03200E+02 0.00000E+00 2.54000E+01
-1 5 0.00000E+00 2.54000E+01 0.00000E+00
-1 6 0.00000E+00 2.54000E+01 2.54000E+01
-1 7 0.00000E+00 0.00000E+00 0.00000E+00
-1 8 0.00000E+00 0.00000E+00 2.54000E+01
-1 9 9.83488E+01 2.54000E+01 2.54000E+01
-1 10 1.02616E+02 0.00000E+00 2.54000E+01
-1 11 9.83488E+01 2.54000E+01 0.00000E+00
-1 12 1.02616E+02 0.00000E+00 0.00000E+00
-1 13 0.00000E+00 1.27000E+01 2.54000E+01
-1 14 4.91744E+01 2.54000E+01 2.54000E+01
-1 15 1.50774E+02 2.54000E+01 2.54000E+01
-1 16 2.03200E+02 1.27000E+01 2.54000E+01
-1 17 5.13080E+01 0.00000E+00 2.54000E+01
-1 18 1.52908E+02 0.00000E+00 2.54000E+01
-1 19 0.00000E+00 1.27000E+01 0.00000E+00
-1 20 4.91744E+01 2.54000E+01 0.00000E+00
-1 21 1.50774E+02 2.54000E+01 0.00000E+00
-1 22 2.03200E+02 1.27000E+01 0.00000E+00
-1 23 5.13080E+01 0.00000E+00 0.00000E+00
-1 24 1.52908E+02 0.00000E+00 0.00000E+00
-1 25 2.03200E+02 2.54000E+01 1.27000E+01
-1 26 0.00000E+00 2.54000E+01 1.27000E+01
-1 27 2.03200E+02 0.00000E+00 1.27000E+01
-1 28 0.00000E+00 0.00000E+00 1.27000E+01
-1 29 0.00000E+00 1.27000E+01 1.27000E+01
-1 30 5.13080E+01 1.27000E+01 2.54000E+01
-1 31 1.00482E+02 1.27000E+01 2.54000E+01
-1 32 1.52908E+02 1.27000E+01 2.54000E+01
-1 33 5.13080E+01 1.27000E+01 0.00000E+00
-1 34 1.00482E+02 1.27000E+01 0.00000E+00
-1 35 1.52908E+02 1.27000E+01 0.00000E+00
-1 36 2.03200E+02 1.27000E+01 1.27000E+01
-1 37 4.91744E+01 2.54000E+01 1.27000E+01
-1 38 1.50774E+02 2.54000E+01 1.27000E+01
-1 39 9.83488E+01 2.54000E+01 1.27000E+01
-1 40 5.13080E+01 0.00000E+00 1.27000E+01
-1 41 1.52908E+02 0.00000E+00 1.27000E+01
-1 42 1.02616E+02 0.00000E+00 1.27000E+01
-1 43 5.13080E+01 1.27000E+01 1.27000E+01
-1 44 1.00482E+02 1.27000E+01 1.27000E+01
-1 45 1.52908E+02 1.27000E+01 1.27000E+01
-3
3C 12 1
-1 1 6 0 1
-2 5 6 12 11 26 43 33 20 37 34
-1 2 6 0 1
-2 9 12 11 2 44 34 39 15 45 38
-1 3 6 0 1
-2 3 4 1 12 27 36 22 24 41 35
-1 4 6 0 1
-2 2 12 11 1 45 34 38 25 35 21
-1 5 6 0 1
-2 2 12 1 4 45 35 25 16 41 36
-1 6 6 0 1
-2 9 12 2 10 44 45 15 31 42 32
-1 7 6 0 1
-2 2 12 4 10 45 41 16 32 42 18
-1 8 6 0 1
-2 9 12 10 6 44 42 31 14 43 30
-1 9 6 0 1
-2 9 12 6 11 44 43 14 39 34 37
-1 10 6 0 1
-2 6 7 5 12 29 19 26 43 23 33
-1 11 6 0 1
-2 8 7 6 12 28 29 13 40 23 43
-1 12 6 0 1
-2 12 10 6 8 42 30 43 40 17 13
-3
1PSTEP 1 1 1
100CL 101 1.000000000 45 0 1 1
-4 DISP 4 1
-5 D1 1 2 1 0
-5 D2 1 2 2 0
-5 D3 1 2 3 0
-5 ALL 1 2 0 0 1ALL
-1 1-3.52892E-04-1.60726E-03 2.90995E-04
-1 2 2.41406E-04-1.63382E-03-1.85329E-03
-1 3-9.42455E-04 4.42810E-04 2.77140E-04
-1 4-3.22640E-04 4.97928E-04-1.77274E-03
-1 5 0.00000E+00 0.00000E+00 0.00000E+00
-1 6 0.00000E+00 0.00000E+00 0.00000E+00
-1 7 0.00000E+00 0.00000E+00 0.00000E+00
-1 8 0.00000E+00 0.00000E+00 0.00000E+00
-1 9 6.49774E-03 1.46527E-03 1.42330E-03
-1 10 5.97352E-03 2.18899E-03 1.22625E-03
-1 11 6.10712E-03 1.37932E-03 2.14231E-03
-1 12 5.27830E-03 2.22318E-03 2.20675E-03
-1 13 0.00000E+00 0.00000E+00 0.00000E+00
-1 14 5.37417E-03 1.53042E-03 1.62762E-03
-1 15 4.17216E-03-1.27933E-04-2.88877E-04
-1 16-6.40253E-05-5.73499E-04-1.80585E-03
-1 17 6.27358E-03 1.01586E-03 1.88121E-03
-1 18 3.44292E-03 1.44423E-03-3.14025E-04
-1 19 0.00000E+00 0.00000E+00 0.00000E+00
-1 20 6.15186E-03 1.86837E-03 9.98779E-04
-1 21 3.54582E-03-1.57395E-04 1.31413E-03
-1 22-6.66979E-04-5.83604E-04 2.69057E-04
-1 23 7.29818E-03 4.60059E-04 4.37006E-04
-1 24 2.78109E-03 1.42237E-03 1.32599E-03
-1 25-8.07503E-05-1.61421E-03-7.85840E-04
-1 26 0.00000E+00 0.00000E+00 0.00000E+00
-1 27-6.52054E-04 4.56383E-04-7.49317E-04
-1 28 0.00000E+00 0.00000E+00 0.00000E+00
-1 29 0.00000E+00 0.00000E+00 0.00000E+00
-1 30 5.96888E-03 1.13673E-03 1.71579E-03
-1 31 6.20830E-03 1.82831E-03 1.35155E-03
-1 32 3.70518E-03 6.47697E-04-3.31945E-04
-1 33 6.67451E-03 1.33654E-03 6.86714E-04
-1 34 5.64851E-03 1.77486E-03 2.14400E-03
-1 35 3.05468E-03 5.94030E-04 1.31260E-03
-1 36-3.82544E-04-5.76413E-04-7.63997E-04
-1 37 5.85448E-03 1.66465E-03 1.15634E-03
-1 38 3.81911E-03-1.35167E-04 5.33579E-04
-1 39 6.25303E-03 1.45206E-03 1.80611E-03
-1 40 6.66273E-03 6.70375E-04 1.31891E-03
-1 41 3.06906E-03 1.44348E-03 4.97601E-04
-1 42 5.56779E-03 2.18029E-03 1.71583E-03
-1 43 6.25152E-03 1.17536E-03 1.20011E-03
-1 44 5.88500E-03 1.83564E-03 1.79073E-03
-1 45 3.33824E-03 6.20592E-04 4.91593E-04
-3
1PSTEP 2 1 1
100CL 101 1.000000000 45 0 1 1
-4 NDTEMP 1 1
-5 T 1 1 0 0
-1 1 2.93448E+02
-1 2 2.93450E+02
-1 3 2.93447E+02
-1 4 2.93448E+02
-1 5 3.10930E+02
-1 6 3.10930E+02
-1 7 3.10930E+02
-1 8 3.10930E+02
-1 9 2.97847E+02
-1 10 2.97499E+02
-1 11 2.97850E+02
-1 12 2.97500E+02
-1 13 3.10930E+02
-1 14 3.03172E+02
-1 15 2.94529E+02
-1 16 2.93481E+02
-1 17 3.02885E+02
-1 18 2.94442E+02
-1 19 3.10930E+02
-1 20 3.03166E+02
-1 21 2.94529E+02
-1 22 2.93479E+02
-1 23 3.02896E+02
-1 24 2.94443E+02
-1 25 2.93481E+02
-1 26 3.10930E+02
-1 27 2.93479E+02
-1 28 3.10930E+02
-1 29 3.10930E+02
-1 30 3.02924E+02
-1 31 2.97706E+02
-1 32 2.94475E+02
-1 33 3.02918E+02
-1 34 2.97708E+02
-1 35 2.94475E+02
-1 36 2.93511E+02
-1 37 3.03205E+02
-1 38 2.94563E+02
-1 39 2.97884E+02
-1 40 3.02918E+02
-1 41 2.94475E+02
-1 42 2.97534E+02
-1 43 3.02967E+02
-1 44 2.97741E+02
-1 45 2.94507E+02
-3
1PSTEP 3 1 1
100CL 101 1.000000000 45 0 1 1
-4 STRESS 6 1
-5 SXX 1 4 1 1
-5 SYY 1 4 2 2
-5 SZZ 1 4 3 3
-5 SXY 1 4 1 2
-5 SYZ 1 4 2 3
-5 SZX 1 4 3 1
-1 1-4.53738E-01 3.73536E-02-1.00109E-01-9.47617E-02 1.77408E-02-1.51106E-01
-1 2 6.76163E-01 5.57167E-01 3.93053E-01 9.19447E-03-2.19576E-02 1.03283E-01
-1 3-6.94336E-01 1.21406E-01 1.19222E-01-8.33520E-02-1.42390E-01-9.20018E-02
-1 4-4.86420E-01-9.13616E-02 2.18851E-02-1.77756E-01 1.02462E-02-8.88126E-02
-1 5-4.90191E-01-2.12178E+01-3.10168E+01 3.48621E-01 2.10946E+00 9.27016E-01
-1 6 4.44326E-01-1.76073E+01-1.74489E+01-5.30985E-02-5.47862E-01-7.68178E-03
-1 7-2.32590E-01-3.60860E+01-3.60860E+01-2.87061E-01-2.98564E-06-3.43873E-01
-1 8-6.79057E-01-3.10337E+01-2.12527E+01 8.74354E-01 2.14436E+00 1.01225E-01
-1 9 9.96582E-01-1.28958E-01-1.23270E-02-2.61541E-01-8.31058E-02-3.90432E-01
-1 10-1.40200E+00 3.23778E+00 3.71605E-01-4.55981E-02-2.60699E-02 2.86837E-01
-1 11-1.40678E+00 3.95959E-01 3.21244E+00 1.73427E-01-2.67676E-02-1.25872E-01
-1 12 6.24639E-01 1.09103E+01 1.09159E+01-1.48036E-02-2.04464E-01-2.53413E-03
-1 13-2.88244E+00-3.21637E+01-2.26651E+01 1.34351E+00 9.81067E-01 2.10729E-01
-1 14 6.88912E+00 2.68300E+00 2.87074E+00-1.06123E+00-7.33589E-01-1.12140E+00
-1 15 8.40794E-01 2.06225E-01 2.19052E-01-2.31894E-01-3.97863E-02-1.47438E-01
-1 16-4.31122E-01 1.45477E-04-3.04612E-01-2.76802E-01-1.18151E-01-4.32834E-02
-1 17 2.88996E+00-4.60161E+00 7.53864E-01-2.04652E-01 1.24684E+00-1.08584E+00
-1 18 4.74195E-01 3.88042E-01 2.80524E-01 1.53423E-01 9.56225E-02 3.22964E-01
-1 19-3.54169E+00-3.75250E+01-3.75250E+01 1.02699E+00-2.93621E-06 3.04988E-02
-1 20 3.02036E+00 5.91797E-01-4.62424E+00-1.01664E+00 1.12257E+00-1.25632E-01
-1 21 4.27027E-01 3.86433E-01 3.93354E-01 2.55145E-01 1.39004E-01 1.45641E-01
-1 22-8.28713E-01 1.46169E-02-1.00853E-01-1.52454E-01 8.01147E-04-1.20021E-01
-1 23 7.99731E+00 8.45146E+00 8.53531E+00-1.46759E+00 5.45268E-01-1.55123E+00
-1 24 7.26232E-01 1.90005E-01 1.87701E-01 1.78610E-01-1.28886E-01 1.50313E-01
-1 25-3.42257E-01-1.86251E-01 5.53673E-03-8.13733E-02-1.13626E-01-2.43143E-01
-1 26-2.76144E+00-2.27010E+01-3.21887E+01 4.09777E-01 1.05253E+00 1.43511E+00
-1 27-8.20893E-01-8.99112E-02 2.19296E-02-1.31020E-01-1.29185E-02-1.58652E-01
-1 28-3.60397E+00-3.75520E+01-3.75520E+01 2.82532E-02-3.03507E-06 9.78322E-01
-1 29-5.84272E+00-3.85577E+01-3.85577E+01 7.85351E-01-2.98564E-06 8.00209E-01
-1 30 1.92175E+00-2.28320E+00 4.56487E-01-4.19932E-01-6.92236E-01-5.92802E-01
-1 31-1.03384E+00-3.01747E-01-9.00699E-01 1.48943E-01 3.23703E-01 1.95833E-02
-1 32 4.46350E-01 3.55258E-01 1.49194E-01 9.80401E-02 2.57446E-01 2.35313E-01
-1 33 3.37197E+00 5.90391E+00 3.32794E+00-5.78086E-01 8.14633E-01-4.64516E-01
-1 34-2.62374E+00 3.38381E-01 4.31970E+00 4.85350E-01-3.46979E-01 6.24124E-02
-1 35 5.71570E-01 2.21860E-01 5.22163E-02 1.26573E-01 2.77652E-02 1.35767E-01
-1 36-1.03563E+00-3.65280E-01-3.85347E-01-2.22582E-01 4.86994E-02-2.06781E-01
-1 37 1.98040E+00 2.49185E-01-2.32912E+00-6.05581E-01-6.46390E-01-3.19145E-01
-1 38 4.64346E-01 3.62889E-01 4.14507E-01 1.33750E-01 3.01083E-01 4.71257E-02
-1 39-9.81707E-01-8.81275E-01-2.41914E-01 8.22353E-02 3.37538E-01-1.30008E-02
-1 40 3.34038E+00 3.16765E+00 5.79368E+00-4.26839E-01 8.85563E-01-5.42658E-01
-1 41 6.06022E-01 5.27371E-02 3.07486E-01 1.47426E-01 4.06582E-02 6.93748E-02
-1 42-2.54132E+00 4.34811E+00 2.93553E-01 1.15149E-01-3.16017E-01 6.14621E-01
-1 43 6.78824E-01 2.27117E+00 2.28173E+00-2.34027E-01-4.11792E-01-1.31573E-01
-1 44-2.80817E+00-1.27522E+00-1.29605E+00 4.50775E-01-1.18467E-01 4.07101E-01
-1 45 3.24976E-01 5.53110E-02 6.26034E-02 1.91749E-01-7.93652E-02 1.62616E-01
-3
1PSTEP 4 1 1
100CL 101 1.000000000 45 0 1 1
-4 TOSTRAIN 6 1
-5 EXX 1 4 1 1
-5 EYY 1 4 2 2
-5 EZZ 1 4 3 3
-5 EXY 1 4 1 2
-5 EYZ 1 4 2 3
-5 EZX 1 4 3 1
-1 1-8.63983E-05-8.32062E-05-8.40997E-05-6.15951E-07 1.15315E-07-9.82187E-07
-1 2-8.83097E-05-8.90832E-05-9.01499E-05 5.97641E-08-1.42724E-07 6.71339E-07
-1 3-8.62301E-05-8.09278E-05-8.09420E-05-5.41788E-07-9.25535E-07-5.98012E-07
-1 4-8.64126E-05-8.38447E-05-8.31086E-05-1.15541E-06 6.66005E-08-5.77282E-07
-1 5 1.98423E-04 6.36931E-05-2.55315E-10 2.26603E-06 1.37115E-05 6.02561E-06
-1 6 1.73330E-04 5.59946E-05 5.70242E-05-3.45141E-07-3.56110E-06-4.99315E-08
-1 7 2.33047E-04-2.97804E-10-3.00789E-10-1.86590E-06-1.94066E-11-2.23518E-06
-1 8 1.97305E-04-2.43777E-10 6.35761E-05 5.68330E-06 1.39384E-05 6.57961E-07
-1 9-2.47109E-05-3.20269E-05-3.12688E-05-1.70002E-06-5.40187E-07-2.53781E-06
-1 10-5.00257E-05-1.98671E-05-3.84972E-05-2.96388E-07-1.69454E-07 1.86444E-06
-1 11-4.57651E-05-3.40473E-05-1.57402E-05 1.12727E-06-1.73989E-07-8.18165E-07
-1 12-7.09259E-05-4.06895E-06-4.03246E-06-9.62237E-08-1.32902E-06-1.64719E-08
-1 13 1.90328E-04-2.43777E-10 6.17407E-05 8.73279E-06 6.37693E-06 1.36974E-06
-1 14 6.60688E-05 3.87290E-05 3.99492E-05-6.89802E-06-4.76833E-06-7.28908E-06
-1 15-5.96681E-05-6.37928E-05-6.37094E-05-1.50731E-06-2.58611E-07-9.58345E-07
-1 16-8.67297E-05-8.39265E-05-8.59074E-05-1.79921E-06-7.67981E-07-2.81342E-07
-1 17 5.82119E-05 9.51671E-06 4.43273E-05-1.33024E-06 8.10445E-06-7.05796E-06
-1 18-6.25954E-05-6.31554E-05-6.38543E-05 9.97247E-07 6.21546E-07 2.09927E-06
-1 19 2.20891E-04-3.77887E-10-2.21348E-10 6.67544E-06-1.90853E-11 1.98242E-07
-1 20 6.20962E-05 4.63105E-05 1.24063E-05-6.60817E-06 7.29673E-06-8.16607E-07
-1 21-6.16104E-05-6.18743E-05-6.18293E-05 1.65844E-06 9.03528E-07 9.46665E-07
-1 22-8.61925E-05-8.07109E-05-8.14614E-05-9.90948E-07 5.20745E-09-7.80137E-07
-1 23 5.14361E-05 5.43881E-05 5.49331E-05-9.53931E-06 3.54424E-06-1.00830E-05
-1 24-6.18456E-05-6.53311E-05-6.53461E-05 1.16097E-06-8.37759E-07 9.77037E-07
-1 25-8.66806E-05-8.56666E-05-8.44199E-05-5.28926E-07-7.38571E-07-1.58043E-06
-1 26 1.91277E-04 6.16699E-05-2.55315E-10 2.66355E-06 6.84142E-06 9.32821E-06
-1 27-8.61816E-05-8.14302E-05-8.07032E-05-8.51628E-07-8.39700E-08-1.03124E-06
-1 28 2.20662E-04-2.17721E-10-3.80229E-10 1.83646E-07-1.97279E-11 6.35909E-06
-1 29 2.12647E-04-2.97804E-10-3.00789E-10 5.10478E-06-1.94066E-11 5.20136E-06
-1 30 5.01809E-05 2.28487E-05 4.06567E-05-2.72956E-06-4.49954E-06-3.85321E-06
-1 31-3.53939E-05-3.06353E-05-3.45285E-05 9.68133E-07 2.10407E-06 1.27292E-07
-1 32-6.28608E-05-6.34529E-05-6.47923E-05 6.37260E-07 1.67340E-06 1.52953E-06
-1 33 4.07110E-05 5.71687E-05 4.04249E-05-3.75756E-06 5.29511E-06-3.01935E-06
-1 34-5.53363E-05-3.60826E-05-1.02040E-05 3.15478E-06-2.25537E-06 4.05681E-07
-1 35-6.19227E-05-6.41958E-05-6.52985E-05 8.22722E-07 1.80474E-07 8.82484E-07
-1 36-8.60403E-05-8.16830E-05-8.18135E-05-1.44678E-06 3.16546E-07-1.34407E-06
-1 37 5.36867E-05 4.24338E-05 2.56748E-05-3.93628E-06-4.20153E-06-2.07444E-06
-1 38-6.16835E-05-6.23429E-05-6.20074E-05 8.69377E-07 1.95704E-06 3.06317E-07
-1 39-3.31161E-05-3.24633E-05-2.83074E-05 5.34530E-07 2.19400E-06-8.45054E-08
-1 40 4.08853E-05 3.97625E-05 5.68317E-05-2.77445E-06 5.75616E-06-3.52728E-06
-1 41-6.18352E-05-6.54315E-05-6.37756E-05 9.58266E-07 2.64278E-07 4.50936E-07
-1 42-5.70291E-05-1.22478E-05-3.86025E-05 7.48468E-07-2.05411E-06 3.99504E-06
-1 43 3.44133E-05 4.47636E-05 4.48322E-05-1.52118E-06-2.67664E-06-8.55224E-07
-1 44-4.19714E-05-3.20072E-05-3.21426E-05 2.93004E-06-7.70035E-07 2.64615E-06
-1 45-6.28176E-05-6.45704E-05-6.45230E-05 1.24637E-06-5.15874E-07 1.05700E-06
-3
9999
src/Mod/Fem/femtest/data/calculix/thermomech_spine.inp
-227
View File
@@ -1,227 +0,0 @@
** written by FreeCAD inp file writer for CalculiX,Abaqus meshes
** highest dimension mesh elements only.
** Nodes
*Node, NSET=Nall
1, 203.2, 25.4, 0
2, 203.2, 25.4, 25.4
3, 203.2, 0, 0
4, 203.2, 0, 25.4
5, 0, 25.4, 0
6, 0, 25.4, 25.4
7, 0, 0, 0
8, 0, 0, 25.4
9, 98.3488, 25.4, 25.4
10, 102.616, 0, 25.4
11, 98.3488, 25.4, 0
12, 102.616, 0, 0
13, 0, 12.7, 25.4
14, 49.1744, 25.4, 25.4
15, 150.774, 25.4, 25.4
16, 203.2, 12.7, 25.4
17, 51.308, 0, 25.4
18, 152.908, 0, 25.4
19, 0, 12.7, 0
20, 49.1744, 25.4, 0
21, 150.774, 25.4, 0
22, 203.2, 12.7, 0
23, 51.308, 0, 0
24, 152.908, 0, 0
25, 203.2, 25.4, 12.7
26, 0, 25.4, 12.7
27, 203.2, 0, 12.7
28, 0, 0, 12.7
29, 0, 12.7, 12.7
30, 51.308, 12.7, 25.4
31, 100.482, 12.7, 25.4
32, 152.908, 12.7, 25.4
33, 51.308, 12.7, 0
34, 100.482, 12.7, 0
35, 152.908, 12.7, 0
36, 203.2, 12.7, 12.7
37, 49.1744, 25.4, 12.7
38, 150.774, 25.4, 12.7
39, 98.3488, 25.4, 12.7
40, 51.308, 0, 12.7
41, 152.908, 0, 12.7
42, 102.616, 0, 12.7
43, 51.308, 12.7, 12.7
44, 100.482, 12.7, 12.7
45, 152.908, 12.7, 12.7
** Volume elements
*Element, TYPE=C3D10, ELSET=Evolumes
1, 5, 6, 12, 11, 26, 43, 33, 20, 37, 34
2, 9, 12, 11, 2, 44, 34, 39, 15, 45, 38
3, 3, 4, 1, 12, 27, 36, 22, 24, 41, 35
4, 2, 12, 11, 1, 45, 34, 38, 25, 35, 21
5, 2, 12, 1, 4, 45, 35, 25, 16, 41, 36
6, 9, 12, 2, 10, 44, 45, 15, 31, 42, 32
7, 2, 12, 4, 10, 45, 41, 16, 32, 42, 18
8, 9, 12, 10, 6, 44, 42, 31, 14, 43, 30
9, 9, 12, 6, 11, 44, 43, 14, 39, 34, 37
10, 6, 7, 5, 12, 29, 19, 26, 43, 23, 33
11, 8, 7, 6, 12, 28, 29, 13, 40, 23, 43
12, 12, 10, 6, 8, 42, 30, 43, 40, 17, 13
** Define element set Eall
*ELSET, ELSET=Eall
Evolumes
***********************************************************
** Element sets for materials and FEM element type (solid, shell, beam, fluid)
*ELSET,ELSET=MechanicalMaterialSolid
Evolumes
***********************************************************
** constraints fixed node sets
** FemConstraintFixed
*NSET,NSET=FemConstraintFixed
5,
6,
7,
8,
13,
19,
26,
28,
29,
***********************************************************
** constraints temperature node sets
** FemConstraintTemperature
*NSET,NSET=FemConstraintTemperature
5,
6,
7,
8,
13,
19,
26,
28,
29,
***********************************************************
** Materials
** see information about units at file end
** FreeCAD material name: Steel-Generic
** MechanicalMaterial
*MATERIAL, NAME=MechanicalMaterial
*ELASTIC
200000,0.3
*CONDUCTIVITY
43.27
*EXPANSION
1.2E-05
*SPECIFIC HEAT
500000000
***********************************************************
** Initial temperature constraint
*INITIAL CONDITIONS,TYPE=TEMPERATURE
** FemConstraintInitialTemperature
Nall,300.0
***********************************************************
** Sections
*SOLID SECTION, ELSET=MechanicalMaterialSolid, MATERIAL=MechanicalMaterial
***********************************************************
** At least one step is needed to run an CalculiX analysis of FreeCAD
*STEP, INC=2000
*CONTROLS, PARAMETERS=TIME INCREMENTATION
4,8,9,200,10,400,,200,,
0.25,0.5,0.75,0.85,,,1.5,
*COUPLED TEMPERATURE-DISPLACEMENT, STEADY STATE
1.0,1.0
***********************************************************
** Fixed Constraints
** FemConstraintFixed
*BOUNDARY
FemConstraintFixed,1
FemConstraintFixed,2
FemConstraintFixed,3
***********************************************************
** Fixed temperature constraint applied
** FemConstraintTemperature
*BOUNDARY
FemConstraintTemperature,11,11,310.93
***********************************************************
** constraints heatflux element face heatflux
** FemConstraintHeatflux
*FILM
** Heat flux on face Box:Face3
3,F2,255.3722,0.005678
7,F3,255.3722,0.005678
11,F2,255.3722,0.005678
12,F2,255.3722,0.005678
** Heat flux on face Box:Face4
1,F2,255.3722,0.005678
2,F4,255.3722,0.005678
4,F4,255.3722,0.005678
9,F4,255.3722,0.005678
** Heat flux on face Box:Face5
1,F4,255.3722,0.005678
3,F4,255.3722,0.005678
4,F3,255.3722,0.005678
10,F3,255.3722,0.005678
** Heat flux on face Box:Face6
6,F4,255.3722,0.005678
7,F4,255.3722,0.005678
8,F4,255.3722,0.005678
12,F3,255.3722,0.005678
***********************************************************
** Outputs --> frd file
*NODE FILE
U, NT
*EL FILE
S, E
** outputs --> dat file
** reaction forces for Constraint fixed
*NODE PRINT, NSET=FemConstraintFixed, TOTALS=ONLY
RF
***********************************************************
*END STEP
***********************************************************
** CalculiX Input file
** written by --> FreeCAD 0.17.9749 (Git)
** written on --> Sun Jan 22 14:33:57 2017
** file name -->
** analysis name --> Analysis
**
**
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
** Since Length and Mass are connected by Force, if Length is mm the Mass is in t to get N
** The following units are used to write to inp file:
**
** Length: mm (this includes the mesh geometry)
** Mass: t
** TimeSpan: s
** Temperature: K
**
** This leads to:
** Force: N
** Pressure: N/mm^2 == MPa (Young's Modulus has unit Pressure)
** Density: t/mm^3
** Gravity: mm/s^2
** Thermal conductivity: t*mm/K/s^3 == as W/m/K == kW/mm/K
** Specific Heat: mm^2/s^2/K = J/kg/K == kJ/t/K
**
src/Mod/Fem/femtest/data/calculix/thermomech_spine_expected_values
-13
View File
@@ -1,13 +0,0 @@
U1: (-0.0009424550, 0.0072981800)
U2: (-0.0016338200, 0.0022231800)
U3: (-0.0018532900, 0.0022067500)
Uabs: (0.0000000000, 0.0073257122)
Sabs: (0.3071229725, 35.8618037277)
MaxPrin: (-5.8043388849, 11.1175902063)
MidPrin: (-38.5576970149, 10.7086318773)
MinPrin: (-38.5960841002, 6.3205092526)
MaxShear: (0.1766446029, 17.9323020685)
Peeq: (0.0000000000, 0.0000000000)
Temp: (293.4470000000, 310.9300000000)
MFlow: (0.0000000000, 0.0000000000)
NPress: (0.0000000000, 0.0000000000)
src/Mod/Fem/femtest/data/elmer/group_mesh.geo
-1
View File
@@ -41,7 +41,6 @@ Mesh 3;
Coherence Mesh; // Remove duplicate vertices
// save
Mesh.Format = 2;
// Ignore Physical definitions and save all elements;
Mesh.SaveAll = 1;
Save "/tmp/tmpjVhNNb.unv";
src/Mod/Fem/femtest/test_commands.sh
-24
View File
@@ -49,8 +49,6 @@ make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_z88.TestSolverZ88
# methods
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_box_frequency
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_box_static
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_thermomech_flow1D
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_common.TestFemCommon.test_adding_refshaps
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_common.TestFemCommon.test_pyimport_all_FEM_modules
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_femimport.TestFemImport.test_import_fem
@@ -112,8 +110,6 @@ make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalc
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_square_pipe_end_twisted_edgeforces
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_square_pipe_end_twisted_nodeforces
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_bimetall
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_flow1D
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_spine
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_elmer.TestSolverElmer.test_box_static_0_mm
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_elmer.TestSolverElmer.test_ccxcantilever_faceload_0_mm
make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_elmer.TestSolverElmer.test_ccxcantilever_faceload_1_si
@@ -143,16 +139,6 @@ unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_ccxtools.TestCcxTools.test_box_static'
))
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_ccxtools.TestCcxTools.test_thermomech_flow1D'
))
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine'
))
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_common.TestFemCommon.test_adding_refshaps'
@@ -458,16 +444,6 @@ unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_bimetall'
))
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_flow1D'
))
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_spine'
))
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(
'femtest.app.test_solver_elmer.TestSolverElmer.test_box_static_0_mm'
src/Mod/Mesh/Gui/Resources/translations/Mesh_ja.ts
+3 -3
View File
@@ -1323,7 +1323,7 @@
<message>
<location filename="../../DlgSettingsImportExport.ui" line="31"/>
<source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-weight:600;"&gt;Tessellation&lt;/span&gt;&lt;/p&gt;&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;span style=" font-weight:400;"&gt;Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-weight:600;"&gt;Tessellation&lt;/span&gt;&lt;/p&gt;&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;span style=" font-weight:400;"&gt;Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-weight:600;"&gt;テッセレーション&lt;/span&gt;&lt;/p&gt;&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;span style=" font-weight:400;"&gt;サーフェイスに対してテッセレーションしたメッシュの最大偏差を定義します。小さな値にするほどレンダリング速度が遅くなりますが、細密さ/解像度の向上した結果となります。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../../DlgSettingsImportExport.ui" line="34"/>
@@ -1460,12 +1460,12 @@ to a smoother appearance.
<message>
<location filename="../../DlgSettingsMeshView.ui" line="356"/>
<source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;This is the smallest angle between two faces where normals get calculated to do flat shading.&lt;/p&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;If the angle between the normals of two neighbouring faces is less than the crease angle, the faces will be smoothshaded around their common edge.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;This is the smallest angle between two faces where normals get calculated to do flat shading.&lt;/p&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;If the angle between the normals of two neighbouring faces is less than the crease angle, the faces will be smoothshaded around their common edge.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;フラットシェーディングを行うための法線を計算する2面間の最小角度です&lt;/p&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;隣り合う2面の法線のなす角が折り目の角より小さい場合、それらの面は共有するエッジの周りでスムースシェーディングされます。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../../DlgSettingsMeshView.ui" line="404"/>
<source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;&lt;span style=" font-weight:600;"&gt;Hint&lt;/span&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;Defining the normals per vertex is also called &lt;span style=" font-style:italic;"&gt;Phong shading&lt;/span&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-style:italic;"&gt;&lt;span style=" font-style:normal;"&gt;while defining the normals per face is called &lt;/span&gt;Flat shading&lt;span style=" font-style:normal;"&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;&lt;span style=" font-weight:600;"&gt;Hint&lt;/span&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;Defining the normals per vertex is also called &lt;span style=" font-style:italic;"&gt;Phong shading&lt;/span&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-style:italic;"&gt;&lt;span style=" font-style:normal;"&gt;while defining the normals per face is called &lt;/span&gt;Flat shading&lt;span style=" font-style:normal;"&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt; &lt;span style=" font-weight:600;"&gt;ヒント&lt;/span&gt; &lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;頂点ごとに法線を定義する方法は&lt;span style=" font-style:italic;"&gt;フォンシェーディング&lt;/span&gt;と呼ばれています&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-style:italic;"&gt; &lt;span style=" font-style:normal;"&gt;また、面ごとの法線を定義する方法は&lt;/span&gt;フラットシェーディング&lt;span style=" font-style:normal;"&gt;と呼ばれています。&lt;/span&gt; &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../../DlgSettingsMeshView.ui" line="359"/>
src/Mod/Mesh/Gui/Resources/translations/Mesh_uk.ts
+1 -1
View File
@@ -2345,7 +2345,7 @@ Please visit http://www.openscad.org/index.html to install it.</source>
<message>
<location filename="../../Workbench.cpp" line="46"/>
<source>Cutting</source>
<translation>Перерізання</translation>
<translation>Переріз</translation>
</message>
<message>
<location filename="../../Workbench.cpp" line="47"/>
src/Mod/MeshPart/Gui/Resources/translations/MeshPart_ca.ts
+4 -4
View File
@@ -574,12 +574,12 @@ Seleccioneu una forma diferent, si us plau.</translation>
<message>
<location filename="../../MeshFlatteningCommand.py" line="47"/>
<source>Unwrap Mesh</source>
<translation type="unfinished">Unwrap Mesh</translation>
<translation>Desembolica la malla</translation>
</message>
<message>
<location filename="../../MeshFlatteningCommand.py" line="50"/>
<source>Find a flat representation of a mesh.</source>
<translation type="unfinished">Find a flat representation of a mesh.</translation>
<translation>Trobeu una representació plana d'una malla.</translation>
</message>
</context>
<context>
@@ -587,12 +587,12 @@ Seleccioneu una forma diferent, si us plau.</translation>
<message>
<location filename="../../MeshFlatteningCommand.py" line="79"/>
<source>Unwrap Face</source>
<translation type="unfinished">Unwrap Face</translation>
<translation>Desembolica la cara</translation>
</message>
<message>
<location filename="../../MeshFlatteningCommand.py" line="82"/>
<source>Find a flat representation of a face.</source>
<translation type="unfinished">Find a flat representation of a face.</translation>
<translation>Trobeu una representació plana d'una malla.</translation>
</message>
</context>
</TS>
src/Mod/MeshPart/Gui/Resources/translations/MeshPart_ja.ts
+4 -4
View File
@@ -579,12 +579,12 @@ Select a different shape, please.</source>
<message>
<location filename="../../MeshFlatteningCommand.py" line="47"/>
<source>Unwrap Mesh</source>
<translation type="unfinished">Unwrap Mesh</translation>
<translation>メッシュを展開</translation>
</message>
<message>
<location filename="../../MeshFlatteningCommand.py" line="50"/>
<source>Find a flat representation of a mesh.</source>
<translation type="unfinished">Find a flat representation of a mesh.</translation>
<translation>メッシュの平面表現を作成</translation>
</message>
</context>
<context>
@@ -592,12 +592,12 @@ Select a different shape, please.</source>
<message>
<location filename="../../MeshFlatteningCommand.py" line="79"/>
<source>Unwrap Face</source>
<translation type="unfinished">Unwrap Face</translation>
<translation>面を展開</translation>
</message>
<message>
<location filename="../../MeshFlatteningCommand.py" line="82"/>
<source>Find a flat representation of a face.</source>
<translation type="unfinished">Find a flat representation of a face.</translation>
<translation>面の平面表現を作成</translation>
</message>
</context>
</TS>

Some files were not shown because too many files have changed in this diff Show More